Update of /cvsroot/fink/web/pdb
In directory sc8-pr-cvs17:/tmp/cvs-serv29777
Modified Files:
Tag: redesign_pdb
package.php
Log Message:
Distinguish between package not available (shown with a dash) and release
not available (as it has been the case before the redesign)
Index: package.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/package.php,v
retrieving revision 1.43.2.28
retrieving revision 1.43.2.29
diff -u -d -r1.43.2.28 -r1.43.2.29
--- package.php 22 Sep 2007 15:45:26 -0000 1.43.2.28
+++ package.php 24 Sep 2007 15:55:58 -0000 1.43.2.29
@@ -198,12 +198,27 @@
}
$last_identifier = $dist_row['identifier'];
- // Now query all releases (typically: stable, unstable, bindist) for the
given distribution.
- $q = "SELECT p.*, r.type, r.version AS rel_version FROM `package` p,
`release` r WHERE p.name = '$package' AND p.rel_id = r.rel_id AND r.dist_id='"
. $dist_row['dist_id'] . "' AND active='1' ORDER BY r.priority ASC";
+ // Query all releases (typically: stable, unstable, bindist) for the given
distribution.
+ $q = "SELECT r.type FROM `release` r WHERE r.dist_id='" .
$dist_row['dist_id'] . "' AND r.active='1' ORDER BY r.priority ASC";
$qrel = mysql_query($q, $dbh);
if (!$qrel) {
die('<p class="attention"><b>Error during db query (Releases):</b>
'.mysql_error().'</p>');
}
+ $has_bindist = false;
+ $has_cvs_rsync = false;
+ while ($rel_row = mysql_fetch_array($qrel)) {
+ if ($rel_row['type'] == 'bindist')
+ $has_bindist = true;
+ elseif ($rel_row['type'] == 'unstable' || $rel_row['type'] == 'stable')
+ $has_cvs_rsync = true;
+ }
+
+ // Now query all pkginfo per release (typically: stable, unstable, bindist)
for the given distribution.
+ $q = "SELECT p.*, r.type, r.version AS rel_version FROM `package` p,
`release` r WHERE p.name = '$package' AND p.rel_id = r.rel_id AND r.dist_id='"
. $dist_row['dist_id'] . "' AND active='1' ORDER BY r.priority ASC";
+ $qrel = mysql_query($q, $dbh);
+ if (!$qrel) {
+ die('<p class="attention"><b>Error during db query (Package per
releases):</b> '.mysql_error().'</p>');
+ }
$pkg_release = array();
@@ -222,33 +237,34 @@
print "<tr $row_color>";
avail_td(nl2br($dist_row['description']),'');
- // first bindist
- if(isset($pkg_release["bindist"])) {
+ // bindist
+ if ($has_bindist) {
$vers = $pkg_release["bindist"]["version"];
list($open_tag, $close_tag) =
version_tags($package, $vers, $pkg_release["bindist"]["rel_id"],
$fullversion, $pkg2disp["rel_id"]);
avail_td(
strlen($vers) && !$pkg_release["bindist"]["restrictive"]
? $open_tag . $vers . $close_tag . ' (bindist
'.$pkg_release["bindist"]["rel_version"].')'
- : '<i>not present</i>'
+ : '—'
+ , $bindist_rowspan
);
// need to use specific tag for info file in fink cvs?
if (strlen($vers) && !$pkg_release["bindist"]["restrictive"])
if ($vers == $fullversion && $pkg_release["bindist"]["rel_id"] ==
$pkg2disp["rel_id"])
$pkg2disp['bindist'] = $pkg_release["bindist"]["rel_version"];
} else {
- avail_td('<i>no bindists available</i>',$bindist_rowspan);
+ avail_td('<i>no binary distribution</i>',$bindist_rowspan);
}
// CVS/rsync dist
- if(isset($pkg_release["stable"]) || isset($pkg_release["unstable"])) {
+ if ($has_cvs_rsync) {
$vers = $pkg_release["stable"]["version"];
list($open_tag, $close_tag) =
version_tags($package, $vers, $pkg_release["stable"]["rel_id"],
$fullversion, $pkg2disp["rel_id"]);
avail_td(
strlen($vers)
? $open_tag . $vers . $close_tag
- : '<i>not present</i>'
+ : '—'
, $bindist_rowspan
);
$vers = $pkg_release["unstable"]["version"];
@@ -257,7 +273,7 @@
avail_td(
strlen($vers)
? $open_tag . $vers . $close_tag
- : '<i>not present</i>'
+ : '—'
, $bindist_rowspan
);
} else {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
