[csw-devel] SF.net SVN: opencsw:[324] web/wordpresscsw/wp-content/themes/opencsw/ qa-gar-missing.php

wbonnet at users.sourceforge.net wbonnet at users.sourceforge.net
Wed Feb 23 23:01:51 CET 2011


Revision: 324
          http://opencsw.svn.sourceforge.net/opencsw/?rev=324&view=rev
Author:   wbonnet
Date:     2011-02-23 22:01:51 +0000 (Wed, 23 Feb 2011)

Log Message:
-----------
Remove GAR and upstream information for packages missing from gar

Modified Paths:
--------------
    web/wordpresscsw/wp-content/themes/opencsw/qa-gar-missing.php

Modified: web/wordpresscsw/wp-content/themes/opencsw/qa-gar-missing.php
===================================================================
--- web/wordpresscsw/wp-content/themes/opencsw/qa-gar-missing.php	2011-02-23 09:35:58 UTC (rev 323)
+++ web/wordpresscsw/wp-content/themes/opencsw/qa-gar-missing.php	2011-02-23 22:01:51 UTC (rev 324)
@@ -28,23 +28,13 @@
     $template      = "/wp-content/themes/opencsw";
 
     print "<h3>Packages ( " . count($arrayPkg) . " )</h3>";
-    print "<span>The list of packages uses several icons. Here are the meanings of each icon that may be displayed below :</span>";
-    print "<br>";
-    print "<ul>";
-    print "<img src=\"$template/img/uwatch-missing.png\" title=\"Package is not in GAR.\" alt=\"-\"/> Package is not in GAR";
-    print "<br>";
-    print "<img src=\"$template/img/uwatch-deactivated.png\" title=\"uWatch is not activated. Information about upstream version not available\" alt=\"-\"/> uWatch is not activated. Information about upstream version not available";
-    print "<br>";
-    print "<img src=\"$template/img/uwatch-error.png\" title=\"uWatch reported an error while checking upstream site\" alt=\"X\"/> uWatch reported an error while checking upstream site";
-    print "<br>";
-    print "</ul>";
     print "<table border=\"0\">";
     print "<tbody  class=\"package-list\">";
     print "<tr>";
-    print "<th rowspan=\"2\">Software name</th><th colspan=\"4\" class=\"package-list-cell\">Bugs</th><th colspan=\"3\" class=\"package-list-cell\">Version</th><th colspan=\"2\" class=\"package-list-cell\">uWatch</th><th rowspan=\"2\" class=\"package-list-cell\">Lutefisk</th><th rowspan=\"2\" class=\"package-list-cell\">uBuild</th><th rowspan=\"2\" class=\"package-list-cell\">CheckPkg</th>";
+    print "<th rowspan=\"2\">Software name</th><th colspan=\"4\" class=\"package-list-cell\">Bugs</th><th colspan=\"3\" class=\"package-list-cell\">Version</th><th rowspan=\"2\" class=\"package-list-cell\">Lutefisk</th><th rowspan=\"2\" class=\"package-list-cell\">uBuild</th><th rowspan=\"2\" class=\"package-list-cell\">CheckPkg</th>";
     print "</tr>";
     print "<tr>";
-    print "<th class=\"package-list-cell\">Critical</th><th class=\"package-list-cell\">Major</th><th class=\"package-list-cell\">Minor</th><th class=\"package-list-cell\">Tweak</th><th class=\"package-list-cell\">Stable</th><th class=\"package-list-cell\">Testing</th><th class=\"package-list-cell\">Unstable</th><th class=\"package-list-cell\">GAR</th><th>Upstream</th>";
+    print "<th class=\"package-list-cell\">Critical</th><th class=\"package-list-cell\">Major</th><th class=\"package-list-cell\">Minor</th><th class=\"package-list-cell\">Tweak</th><th class=\"package-list-cell\">Stable</th><th class=\"package-list-cell\">Testing</th><th class=\"package-list-cell\">Unstable</th>";
     print "</tr>";
 
     // Initialize global counter
@@ -106,8 +96,6 @@
         $testingVersion  = empty($versionInfo["testingVersion"])  ? "-" : $versionInfo["testingVersion"];
         $stableVersion   = empty($versionInfo["stableVersion"])   ? "-" : $versionInfo["stableVersion"];
         $unstableVersion = empty($versionInfo["unstableVersion"]) ? "-" : $versionInfo["unstableVersion"];
-        $garVersion      = empty($versionInfo["garVersion"])      ? "-" : $versionInfo["garVersion"];
-        $upstreamVersion = empty($versionInfo["upstreamVersion"]) ? "-" : $versionInfo["upstreamVersion"];
 
         // Display catalog version information
         if ( $stableVersion == $testingVersion ) {
@@ -127,44 +115,6 @@
             }
         }
 
-        $garHighlightOn     = "";
-        $garHighlightOff    = "";
-        if ( ( $garVersion <> $unstableVersion )  && ( ! empty($versionInfo["garVersion"]) ) ) {
-            $packageToRelease++;   
-            $garHighlightOn="<b>";
-            $garHighlightOff="</b>";
-        }
-
-        // Test if the package exists in gar
-        if ( $versionInfo["garPath"] == "") {
-            print "<td class=\"package-list-cell\" colspan=\"2\"><img src=\"$template/img/uwatch-missing.png\" title=\"Package " . $package["software"] . " is not in GAR.\" alt=\"-\"/></td>\n" ;     
-        } else {
-            // Test if uwatch is deactived
-            if ( $versionInfo["uwatchActivated"] != 1) {
-                // Yes thus display GAR info and deactivated icon
-                print "<td class=\"package-list-cell\">" . $garHighlightOn . $garVersion . $garHighlightOff . "</td>\n" ;               // GAR
-                print "<td class=\"package-list-cell\"><img src=\"$template/img/uwatch-deactivated.png\" title=\"uWatch is not activated. Information about upstream version not available\" alt=\"-\"/></td>\n" ;     
-            } else {
-                // Uwatch is actived, check if there is an error
-                if ( $versionInfo["lastUpstreamCheckStatus"] != 1) {
-                    // Yes thus display GAR info and deactivated icon
-                    print "<td class=\"package-list-cell\">" . $garHighlightOn . $garVersion . $garHighlightOff . "</td>\n" ;               // GAR
-                    print "<td class=\"package-list-cell\"><img src=\"$template/img/uwatch-error.png\" title=\"uWatch reported an error while checking upstream site\" alt=\"X\"/></td>\n" ;     
-                } else {
-                    // Display gar version information
-                    if ( ( $garVersion == $upstreamVersion ) && ( ! empty($versionInfo["garVersion"]) ) ) {
-                        print "<td colspan=\"2\" class=\"package-list-cell\">" . $garHighlightOn . $upstreamVersion . $garHighlightOff. "</td>\n" ;          // Same for GAR and upstream
-                    } else {
-                        print "<td class=\"package-list-cell\">" . $garHighlightOn . $garVersion . $garHighlightOff . "</td>\n" ;               // GAR
-                        print "<td class=\"package-list-cell\"><a title='" . $upstreamVersion . " upstream site' href='" . $package["vendorurl"] ;
-                        print "'>" . $upstreamVersion . "</a></td>\n" ;          // Upstream
-                        if ( ! empty($versionInfo["garVersion"]) ) {
-                            $upgradablePackages++;
-                        }
-                    }
-                }
-            }
-        }
         print "<td class=\"package-list-cell\">-</td>\n" ;          // Lutefisk
         print "<td class=\"package-list-cell\">-</td>\n" ;          // bBuild
         print "<td class=\"package-list-cell\">-</td>\n" ;          // Checkpkg
@@ -182,7 +132,6 @@
 
     // Display catalog version information
     print "<td class=\"package-list-cell\" colspan=\"3\">To release : $packageToRelease</td>\n" ;            // Stable
-    print "<td class=\"package-list-cell\" colspan=\"2\">Upgradable : $upgradablePackages</td>\n" ;            // Stable
     print "<td class=\"package-list-cell\" colspan=\"3\"></td>\n" ;            // Stable
     print "</tr>\n" ;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list