Update of /cvsroot/fink/web/pdb
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7671

Modified Files:
        package.php releases.inc 
Log Message:
some display fixes for showall=on/off

Index: package.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/package.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- package.php 8 Sep 2009 03:48:33 -0000       1.70
+++ package.php 8 Sep 2009 16:37:55 -0000       1.71
@@ -33,9 +33,6 @@
 $basicQuery->setRows(1);
 
 $basicQuery->addQuery("name_e:\"$package\"", true);
-if (!$showall) {
-       $basicQuery->addQuery("dist_visible:true", true);
-}
 
 $fullQuery = clone $basicQuery;
 
@@ -174,7 +171,7 @@
        print "</tr>\n";
 
        $color_count = 0;
-       $last_dist_name = '';
+       $last_dist_id = '';
        $has_unsupported_dists = false;
 
        global $distributions;
@@ -182,11 +179,11 @@
        global $dists_to_releases;
 
        // make a gradient out of the colors for the display
-       $dist_names = array();
+       $dist_ids = array();
        foreach ($distributions as $dist) {
-               $dist_names[$dist->getName()]++;
+               $dist_ids[$dist->getId()]++;
        }
-       $color_last = count($dist_names) - 1;
+       $color_last = count($dist_ids);
        #$dark  = array(227, 202, 255);
        $dark  = array(174, 160, 198);
        $light = array(246, 236, 255);
@@ -204,18 +201,18 @@
        }
 
        foreach (array_reverse($distributions) as $dist) {
-               $dist_name = $dist->getName();
+               $dist_id = $dist->getId();
 
-               if ($last_dist_name != $dist_name) {
+               if ($last_dist_id != $dist_id) {
                        $color_count++;
-                       if ($dist->isVisible()) {
+                       if ($dist->isVisible() == TRUE) {
                                $row_color='bgcolor="#' . 
dechex($colors[$color_count][0]) . dechex($colors[$color_count][1]) . 
dechex($colors[$color_count][2]) . '"';
                        } else {
                                $row_color='bgcolor="#ddbdbd"';
                        }
                }
 
-               if (!$showall && !$dist->isVisible())
+               if (!$showall && $dist->isVisible() == FALSE)
                        continue;
 
                print "<tr $row_color>";
@@ -253,7 +250,7 @@
                        avail_td($pkginfo);
                }
 
-               $last_dist_name = $dist_name;
+               $last_dist_id = $dist_id;
        }
        
        print "</table>\n";

Index: releases.inc
===================================================================
RCS file: /cvsroot/fink/web/pdb/releases.inc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- releases.inc        8 Sep 2009 11:29:05 -0000       1.39
+++ releases.inc        8 Sep 2009 16:37:55 -0000       1.40
@@ -7,49 +7,49 @@
 $dists_to_releases = array();
 
 foreach(array(
-       new Distribution("10.1",        "powerpc", "10.1",               
"packages/dists",     1, false, false, false),
-       new Distribution("10.2-gcc3.3", "powerpc", "10.2 (gcc3.3 only)", 
"dists/10.2-gcc3.3",  2, true, true, false),
-       new Distribution("10.3",        "powerpc", "10.3",               
"dists/10.3",         3, true, true, false),
-       new Distribution("10.4",        "powerpc", "10.4/powerpc",       
"dists/10.4",         4, true, true, false),
-       new Distribution("10.4",        "i386",    "10.4/i386",          
"dists/10.4",         5, true, true, false),
-       new Distribution("10.5",        "powerpc", "10.5/powerpc",       
"dists/10.4",         6, true, true, true),
-       new Distribution("10.5",        "i386",    "10.5/i386",          
"dists/10.4",         7, true, true, true),
-       new Distribution("10.5",        "x86_64",  "10.5/x86_64",        
"dists/10.4",         8, true, false, false),
-       new Distribution("10.6",        "i386",    "10.6/i386",          
"dists/10.4",         9, true, true, true),
-       new Distribution("10.6",        "x86_64",  "10.6/x86_64",        
"dists/10.4",        10, true, true, true),
+       new Distribution("10.1",        "powerpc", "10.1",               
"packages/dists",     1, FALSE, FALSE, FALSE),
+       new Distribution("10.2-gcc3.3", "powerpc", "10.2 (gcc3.3 only)", 
"dists/10.2-gcc3.3",  2, TRUE, TRUE, FALSE),
+       new Distribution("10.3",        "powerpc", "10.3",               
"dists/10.3",         3, TRUE, TRUE, FALSE),
+       new Distribution("10.4",        "powerpc", "10.4/powerpc",       
"dists/10.4",         4, TRUE, TRUE, FALSE),
+       new Distribution("10.4",        "i386",    "10.4/i386",          
"dists/10.4",         5, TRUE, TRUE, FALSE),
+       new Distribution("10.5",        "powerpc", "10.5/powerpc",       
"dists/10.4",         6, TRUE, TRUE, TRUE),
+       new Distribution("10.5",        "i386",    "10.5/i386",          
"dists/10.4",         7, TRUE, TRUE, TRUE),
+       new Distribution("10.5",        "x86_64",  "10.5/x86_64",        
"dists/10.4",         8, TRUE, FALSE, FALSE),
+       new Distribution("10.6",        "i386",    "10.6/i386",          
"dists/10.4",         9, TRUE, TRUE, TRUE),
+       new Distribution("10.6",        "x86_64",  "10.6/x86_64",        
"dists/10.4",        10, TRUE, TRUE, TRUE),
 ) as $_dist) {
        $distributions[$_dist->getId()] = $_dist;
 }
 
 foreach(array(
-       new Release($distributions["10.1-powerpc"],         "bindist",  
"0.4.1a",  1, false),
-       new Release($distributions["10.2-gcc3.3-powerpc"],  "bindist",  
"0.6.4",   1, true),
-       new Release($distributions["10.2-gcc3.3-powerpc"],  "stable",   
"current", 2, true),
-       new Release($distributions["10.2-gcc3.3-powerpc"],  "unstable", 
"current", 3, true),
-       new Release($distributions["10.3-powerpc"],         "bindist",  
"0.7.2",   1, true),
-       new Release($distributions["10.3-powerpc"],         "stable",   
"current", 2, true),
-       new Release($distributions["10.3-powerpc"],         "unstable", 
"current", 3, true),
-       new Release($distributions["10.4-powerpc"],         "bindist",  
"0.8.1",   1, true),
-       new Release($distributions["10.4-powerpc"],         "stable",   
"current", 2, true),
-       new Release($distributions["10.4-powerpc"],         "unstable", 
"current", 3, true),
-       new Release($distributions["10.4-i386"],            "bindist",  
"0.8.1",   1, true),
-       new Release($distributions["10.4-i386"],            "stable",   
"current", 2, true),
-       new Release($distributions["10.4-i386"],            "unstable", 
"current", 3, true),
-       new Release($distributions["10.5-powerpc"],         "bindist",  
"0.9.0",   1, true),
-       new Release($distributions["10.5-powerpc"],         "stable",   
"current", 2, true),
-       new Release($distributions["10.5-powerpc"],         "unstable", 
"current", 3, true),
-       new Release($distributions["10.5-i386"],            "bindist",  
"0.9.0",   1, true),
-       new Release($distributions["10.5-i386"],            "stable",   
"current", 2, true),
-       new Release($distributions["10.5-i386"],            "unstable", 
"current", 3, true),
-#      new Release($distributions["10.5-x86_64"],          "bindist",  
"0.9.0",   1, true),
-       new Release($distributions["10.5-x86_64"],          "stable",   
"current", 2, true),
-       new Release($distributions["10.5-x86_64"],          "unstable", 
"current", 3, true),
-#      new Release($distributions["10.6-i386"],            "bindist",  
"0.10.0",  1, true),
-       new Release($distributions["10.6-i386"],            "stable",   
"current", 2, true),
-       new Release($distributions["10.6-i386"],            "unstable", 
"current", 3, true),
-#      new Release($distributions["10.6-x86_64"],          "bindist",  
"0.10.0",  1, true),
-       new Release($distributions["10.6-x86_64"],          "stable",   
"current", 2, true),
-       new Release($distributions["10.6-x86_64"],          "unstable", 
"current", 3, true),
+       new Release($distributions["10.1-powerpc"],         "bindist",  
"0.4.1a",  1, FALSE),
+       new Release($distributions["10.2-gcc3.3-powerpc"],  "bindist",  
"0.6.4",   1, TRUE),
+       new Release($distributions["10.2-gcc3.3-powerpc"],  "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.2-gcc3.3-powerpc"],  "unstable", 
"current", 3, TRUE),
+       new Release($distributions["10.3-powerpc"],         "bindist",  
"0.7.2",   1, TRUE),
+       new Release($distributions["10.3-powerpc"],         "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.3-powerpc"],         "unstable", 
"current", 3, TRUE),
+       new Release($distributions["10.4-powerpc"],         "bindist",  
"0.8.1",   1, TRUE),
+       new Release($distributions["10.4-powerpc"],         "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.4-powerpc"],         "unstable", 
"current", 3, TRUE),
+       new Release($distributions["10.4-i386"],            "bindist",  
"0.8.1",   1, TRUE),
+       new Release($distributions["10.4-i386"],            "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.4-i386"],            "unstable", 
"current", 3, TRUE),
+       new Release($distributions["10.5-powerpc"],         "bindist",  
"0.9.0",   1, TRUE),
+       new Release($distributions["10.5-powerpc"],         "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.5-powerpc"],         "unstable", 
"current", 3, TRUE),
+       new Release($distributions["10.5-i386"],            "bindist",  
"0.9.0",   1, TRUE),
+       new Release($distributions["10.5-i386"],            "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.5-i386"],            "unstable", 
"current", 3, TRUE),
+#      new Release($distributions["10.5-x86_64"],          "bindist",  
"0.9.0",   1, TRUE),
+       new Release($distributions["10.5-x86_64"],          "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.5-x86_64"],          "unstable", 
"current", 3, TRUE),
+#      new Release($distributions["10.6-i386"],            "bindist",  
"0.10.0",  1, TRUE),
+       new Release($distributions["10.6-i386"],            "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.6-i386"],            "unstable", 
"current", 3, TRUE),
+#      new Release($distributions["10.6-x86_64"],          "bindist",  
"0.10.0",  1, TRUE),
+       new Release($distributions["10.6-x86_64"],          "stable",   
"current", 2, TRUE),
+       new Release($distributions["10.6-x86_64"],          "unstable", 
"current", 3, TRUE),
 ) as $_rel) {
        $releases[$_rel->getId()] = $_rel;
 }


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to