Update of /cvsroot/fink/web/pdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19175
Modified Files:
package.php releases.inc
Log Message:
switch $releases values to be a keyed map instead of ordered array
switch to a priority code instead of just order for dist row coloring
Index: package.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/package.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- package.php 19 May 2006 19:19:27 -0000 1.41
+++ package.php 25 May 2006 16:46:40 -0000 1.42
@@ -73,34 +73,32 @@
print '<th width="100" align="center">unstable</th>';
print "</tr>\n";
- $rel_row=0;
foreach( $releases as $os=>$dists ) {
- $rel_row++;
- if($rel_row==1) {
+ if($dists["pri"]==1) {
$row_color='bgcolor="#e3caff"';
- } else if ($rel_row==2) {
+ } else if ($dists["pri"]==2) {
$row_color='bgcolor="#f1e2ff"';
} else {
$row_color='bgcolor="#f6ecff"';
}
- // massage if only single dist listed as a simple string
- if(!is_array($dists[0]))
- $dists[0]=array($dists[0]);
// used in System and CVS/rsync entries to leave enough space for bindists
- if (sizeof($dists[0])>1)
- $bindist_rowspan='rowspan='.sizeof($dists[0]);
- else
- $bindist_rowspan='';
+ $bindist_rowspan='';
+ if (is_array($dists["bin"])) {
+ if (sizeof($dists["bin"])>1)
+ $bindist_rowspan='rowspan='.sizeof($dists["bin"]);
+ $bindists_lbl=array_keys($dists["bin"]);
+ $bindists_sql=array_values($dists["bin"]);
+ } else {
+ $bindists_lbl=array();
+ $bindists_sql=array();
+ }
// System
print "<tr $row_color>";
avail_td($os,$bindist_rowspan);
- $bindists_lbl=array_keys($dists[0]);
- $bindists_sql=array_values($dists[0]);
-
// first bindist
if(strlen($bindists_sql[0])) {
$vers = $rmap[$bindists_sql[0]];
@@ -110,17 +108,17 @@
}
// CVS/rsync dist
- if(strlen($dists[1]) || strlen($dists[2])) {
- $vers_st = $rmap[$dists[1]];
- $vers_un = $rmap[$dists[2]];
+ if(strlen($dists["sta"]) || strlen($dists["uns"])) {
+ $vers_st = $rmap[$dists["sta"]];
+ $vers_un = $rmap[$dists["uns"]];
avail_td(
strlen($vers_st)
- ? '<!-- a
href="../packagedetails.php?tree='.$dists[1]."&pkg=$package&version=$vers_st\"
-->".$vers_st #."</a>"
+ ? '<!-- a
href="../packagedetails.php?tree='.$dists["sta"]."&pkg=$package&version=$vers_st\"
-->".$vers_st #."</a>"
: '<i>not present</i>'
, $bindist_rowspan);
avail_td(
strlen($vers_un)
- ? '<!-- a
href="../packagedetails.php?tree='.$dists[2]."&pkg=$package&version=$vers_un\"
-->".$vers_un #."</a>"
+ ? '<!-- a
href="../packagedetails.php?tree='.$dists["uns"]."&pkg=$package&version=$vers_un\"
-->".$vers_un #."</a>"
: '<i>not present</i>'
, $bindist_rowspan);
} else {
Index: releases.inc
===================================================================
RCS file: /cvsroot/fink/web/pdb/releases.inc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- releases.inc 27 Mar 2006 22:43:30 -0000 1.24
+++ releases.inc 25 May 2006 16:46:40 -0000 1.25
@@ -1,24 +1,45 @@
<?
+
+# $releases:ordered map of $os=>$os_distro_data
+# $os: displayed label
+# $os_distro_data: map of information about packages in $os
+# "bin"=>$bindists
+# $bindists: ordered map of $bindist=>$bin_sql
+# $bindist: displayed label
+# $bin_sql: "release" SQL value for $bindist binary (apt) distro
+# "sta"=>$sta_sql
+# $sta_sql: "release" SQL value for stable source distro
+# "uns"=>$uns_sql
+# $uns_sql: "release" SQL value for unstable source distro
+# "pri"=>$priority
+# $priority: integer priority code used for organizing the display
+# (lower positive number==higher priority)
+#
+# $releases must be an array with at least one entry
+# $os_distro_data must be an array, but each entry in it is optional
+
$releases = array(
"10.4<br>(transitional)" => array(
- array("bindist 0.8.0"=>"0.8.0-stable"),
- "current-10.4-transitional-stable",
- "current-10.4-transitional-unstable"
+ "bin"=>array("bindist 0.8.0"=>"0.8.0-stable"),
+ "sta"=>"current-10.4-transitional-stable",
+ "uns"=>"current-10.4-transitional-unstable",
+ "pri"=>2,
),
"10.3" => array(
- array("bindist 0.7.2"=>"0.7.2-stable"),
- "current-10.3-stable",
- "current-10.3-unstable"
+ "bin"=>array("bindist 0.7.2"=>"0.7.2-stable"),
+ "sta"=>"current-10.3-stable",
+ "uns"=>"current-10.3-unstable",
+ "pri"=>3,
),
"10.2<br>(gcc3.3 only)" => array(
- array("bindist 0.6.4"=>"0.6.4-stable"),
- "current-10.2-gcc3.3-stable",
- "current-10.2-gcc3.3-unstable"
+ "bin"=>array("bindist 0.6.4"=>"0.6.4-stable"),
+ "sta"=>"current-10.2-gcc3.3-stable",
+ "uns"=>"current-10.2-gcc3.3-unstable",
+ "pri"=>3,
),
"10.1" => array(
- array("bindist 0.4.1"=>"0.4.1-stable"),
- "",
- ""
+ "bin"=>array("bindist 0.4.1"=>"0.4.1-stable"),
+ "pri"=>3,
)
);
?>
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits