[Dehs-devel] r90 - trunk/www
atomo64-guest at alioth.debian.org
atomo64-guest at alioth.debian.org
Thu Jan 3 21:12:02 UTC 2008
Author: atomo64-guest
Date: 2008-01-03 21:12:02 +0000 (Thu, 03 Jan 2008)
New Revision: 90
Modified:
trunk/www/index.php
trunk/www/maintainer.php
trunk/www/no_updated.php
Log:
www/index.php:
added better Copyright information and link to the source code
www/maintainer.php:
fixed a bug where packages without an upstream version were displayed as up to date
made some improvements to the layout and added anchors (#package, #foo, #bar)
www/no_updated.php:
display mangled Debian version strings when available
Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php 2007-12-21 17:57:58 UTC (rev 89)
+++ trunk/www/index.php 2008-01-03 21:12:02 UTC (rev 90)
@@ -19,7 +19,7 @@
<input type="submit" name="Display">
</form>
</div>
-<small><div style="text-align: center;">All the scripts are copyright of <a href='mailto:bluefuture at nospam@email.it'>Stefano Fabri</a>
-<br>Source code are available under GPL terms <a href="http://svn.debian.org/">here</a></br></div></small>
+<small><div style="text-align: center;">All the scripts are copyright 2004 by <a href='mailto:bluefuture at nospam@email.it'>Stefano Fabri</a>
+<br>Source code is available under the GPL terms <a href="http://svn.debian.org/">here</a> in the <a href="http://svn.debian.org/wsvn/dehs/">Subversion repository</a></br></div></small>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/www/maintainer.php
===================================================================
--- trunk/www/maintainer.php 2007-12-21 17:57:58 UTC (rev 89)
+++ trunk/www/maintainer.php 2008-01-03 21:12:02 UTC (rev 90)
@@ -16,7 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/ ?>
+*/
+ob_start('ob_gzhandler');
+?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
@@ -57,13 +59,13 @@
(Select max(pop_inst) as mpop_inst,SUM(up_error) as tot_up_error,AVG(avg_error_date) as tot_avg_error_date,name,dist FROM binpkgs GROUP BY name,dist HAVING max(pop_inst) IS NOT NULL) as binpkgs using(name,dist)
WHERE (watch IS NULL OR watch='') AND (maint LIKE '$maint' OR uploaders LIKE '%$maint%') AND name LIKE '$name' ORDER BY mpop_inst DESC;",
no_upstream=>"select id,mpop_inst,name,section,version, tot_up_error, tot_avg_error_date, pkgs.dist,watch_warn,up_changes, up_version,up_url,dversionmangled from pkgs INNER JOIN (Select max(pop_inst) as mpop_inst,SUM(up_error) as tot_up_error,AVG(avg_error_date) as tot_avg_error_date,name,dist FROM binpkgs GROUP BY name,dist)
-as binpkgs using(name,dist) where up_version='' AND watch!='' AND (maint LIKE '%$maint%' OR uploaders LIKE '$maint') AND name LIKE '$name' order by mpop_inst desc;",
+as binpkgs using(name,dist) where up_version='' AND watch!='' AND (maint LIKE '$maint' OR uploaders LIKE '%$maint%') AND name LIKE '$name' order by mpop_inst desc;",
no_updated=>"Select id,mpop_inst,name,section,version,tot_up_error,tot_avg_error_date,pkgs.dist,up_version,watch_warn, up_changes,up_url,dversionmangled from pkgs
INNER join (Select max(pop_inst) as mpop_inst,SUM(up_error) as tot_up_error,AVG(avg_error_date) as tot_avg_error_date,name,dist FROM binpkgs GROUP BY name,dist) as binpkgs using(name,dist)
where updated='1' AND up_version!='' AND (maint LIKE '$maint' OR uploaders LIKE '%$maint%') AND name LIKE '$name'
order by mpop_inst desc;",ok=>"Select id,mpop_inst,name,section,version,tot_up_error,tot_avg_error_date,pkgs.dist,up_version,watch_warn, up_changes,up_url,dversionmangled from pkgs
INNER join (Select max(pop_inst) as mpop_inst,SUM(up_error) as tot_up_error,AVG(avg_error_date) as tot_avg_error_date,name,dist FROM binpkgs GROUP BY name,dist) as binpkgs using(name,dist)
-where updated='0' AND (maint LIKE '$maint' OR uploaders LIKE '%$maint%') AND name LIKE '$name'
+where updated='0' AND (maint LIKE '$maint' OR uploaders LIKE '%$maint%') AND name LIKE '$name' AND (up_version != '' AND up_version IS NOT NULL)
order by mpop_inst desc;");
foreach($sql as $key => $value) {
$rs=pg_exec($db,$value) OR Die("Error on query");
@@ -71,7 +73,17 @@
$totrs=pg_numrows($rs);
$totpkgs=pg_fetch_array($qta,0);
if ($totrs>0) {
- print '<div style="text-align: center;">';
+ ?><table bgcolor="#BBDDFF" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+ <tr>
+ <td colspan="3" valign="top" width="100%">
+ <img src="http://www.debian.org/Pics/blue-upperleft.png" align="left" border="0" hspace="0" vspace="0" alt="" width="8" height="8">
+ <img src="http://www.debian.org/Pics/blue-upperright.png" align="right" border="0" hspace="0" vspace="0" alt="" width="8" height="8">
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td valign="top" class="smallsserif">
+<p><big> <?php
switch ($key) {
case "no_watch":
print "<b>Packages without a watch file</b>: $totrs
@@ -90,14 +102,22 @@
<b>Total packages:</b> $totpkgs[0] <b>Percentage: </b> " . number_format ( $totrs/$totpkgs[0] * 100, 2, ",",".") . "%<br>" ;
break;
} ?>
-</div>
+</big></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan="3" valign="bottom" width="100%">
+ <img src="http://www.debian.org/Pics/blue-lowerleft.png" align="left" border="0" hspace="0" vspace="0" alt="" width="8.5" height="8">
+ <img src="http://www.debian.org/Pics/blue-lowerright.png" align="right" border="0" hspace="0" vspace="0" alt="" width="8" height="8">
+ </td>
+ </tr>
+ </table>
<?
while ($res_array=pg_fetch_array($rs)) {
?>
-<hr>
<ul>
-<li><b>Name:</b> <a href="http://packages.qa.debian.org/<?=$res_array['name']?>"><? print $res_array["name"]; ?></a></li>
+<li><a name="<? print $res_array["name"]; ?>"><b>Name:</b> <a href="http://packages.qa.debian.org/<?=$res_array['name']?>"><? print $res_array["name"]; ?></a></a></li>
<ul>
<li><b>Pop Inst:</b> <a href="http://qa.debian.org/popcon.php?package=<?=$res_array['name']?>"><? print $res_array["mpop_inst"]; ?></a></li>
<? if ($key=="no_watch") { ?>
@@ -154,13 +174,13 @@
<li><b>Copyright: </b><? print "<a href=" . htmlentities(changelog($res_array)) . ">" . "View</a>"; ?></li>
</ul>
</ul>
+<hr>
<?
print "<!-- Machine-readable: " . $res_array['name'] . " " .
$res_array["version"] . " " .
$res_array["up_version"] . " " .
$res_array["wwiz_version"] . " -->";
} ?>
-<hr>
<?
}
}
Modified: trunk/www/no_updated.php
===================================================================
--- trunk/www/no_updated.php 2007-12-21 17:57:58 UTC (rev 89)
+++ trunk/www/no_updated.php 2008-01-03 21:12:02 UTC (rev 90)
@@ -33,7 +33,7 @@
<?
require("config_www.inc");
$rsql=pg_exec($db,
-"Select id,mpop_inst,name,version,bytes, tot_up_error,tot_avg_error_date,pkgs.dist,up_version,watch_warn, up_changes from pkgs
+"Select id,mpop_inst,name,version,bytes, tot_up_error,tot_avg_error_date,pkgs.dist,up_version,watch_warn, up_changes,dversionmangled from pkgs
INNER join (Select max(pop_inst) as mpop_inst,SUM(up_error) as tot_up_error,AVG(avg_error_date) as tot_avg_error_date,name,dist FROM binpkgs GROUP BY name,dist) as binpkgs using(name,dist)
where updated='1' AND up_version!=''
order by mpop_inst desc;") OR Die("Error on query");;
@@ -74,7 +74,9 @@
<?}
else print $res_array["up_version"].'<br>';?>
</td>
- <td style="vertical-align: top;"><? print $res_array["version"]; ?><br>
+ <td style="vertical-align: top;"><? print $res_array["version"]; if ($res_array["dversionmangled"] != $res_array["version"]) {
+ echo ' (mangled: <i>' . htmlentities($res_array["dversionmangled"]) . '</i>)';
+} ?><br>
</td>
<td style="vertical-align: top;"><? print number_format ($res_array[bytes]/1024, 0); ?><br></td>
<td style="vertical-align: top;"><? print number_format($res_array["tot_up_error"] ,0); ?><br>
More information about the Dehs-devel
mailing list