Update of /cvsroot/fink/web/pdb
In directory sc8-pr-cvs17:/tmp/cvs-serv11328
Modified Files:
Tag: redesign_pdb
browse.php header.inc package.php
Log Message:
Enhance error reporting
Index: package.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/package.php,v
retrieving revision 1.43.2.27
retrieving revision 1.43.2.28
diff -u -d -r1.43.2.27 -r1.43.2.28
--- package.php 10 Sep 2007 18:02:20 -0000 1.43.2.27
+++ package.php 22 Sep 2007 15:45:26 -0000 1.43.2.28
@@ -12,7 +12,7 @@
<?
if ($package == "-") {
?>
-<p><b>No package specified.</b></p>
+<p class="attention"><b>No package specified.</b></p>
<?
} else { /* if (no package) */
@@ -69,9 +69,11 @@
$qtodisplay_order .= "ORDER BY d.priority DESC,r.priority DESC";
$qtodisplay = $qtodisplay_sel.$qtodisplay_where.$qtodisplay_order;
+$error_level = error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
$qs = mysql_query($qtodisplay, $dbh);
+error_reporting($error_level);
if (!$qs) {
- print '<p><b>error during query:</b> '.mysql_error().'</p>';
+ print '<p class="attention"><b>Error during db query (Package):</b>
'.mysql_error().'</p>';
} else {
$pkg2disp = mysql_fetch_array($qs);
}
@@ -79,9 +81,11 @@
$warning = '';
if (!$pkg2disp) { # No specific version found, try latest
$qtodisplay = $qtodisplay_sel."WHERE p.name='$package' ".$qtodisplay_order;
+ $error_level = error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
$qs = mysql_query($qtodisplay, $dbh);
+ error_reporting($error_level);
if (!$qs) {
- print '<p><b>error during query:</b> '.mysql_error().'</p>';
+ print '<p class="attention"><b>Error during db query (Latest Package):</b>
'.mysql_error().'</p>';
} else {
$pkg2disp = mysql_fetch_array($qs);
}
@@ -178,7 +182,7 @@
$q .= "ORDER BY priority DESC";
$qdist = mysql_query($q, $dbh);
if (!$qdist) {
- die('<p><b>error during query:</b> '.mysql_error().'</p>');
+ die('<p class="attention"><b>Error during db query (Distributions):</b>
'.mysql_error().'</p>');
}
$color_count = 0;
$last_identifier = '';
@@ -198,7 +202,7 @@
$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><b>error during query:</b> '.mysql_error().'</p>');
+ die('<p class="attention"><b>Error during db query (Releases):</b>
'.mysql_error().'</p>');
}
$pkg_release = array();
@@ -323,7 +327,7 @@
$q = "SELECT * FROM `package` WHERE rel_id='$pkg2disp[rel_id]' AND
parentname='$pkg2disp[name]' ORDER BY name";
$rs = mysql_query($q, $dbh);
if (!$rs) {
- print '<p><b>error during query:</b> '.mysql_error().'</p>';
+ print '<p class="attention"><b>Error during db query (Splitoffs):</b>
'.mysql_error().'</p>';
} else {
if($row = mysql_fetch_array($rs))
it_item("SplitOffs:", link_to_package($row["name"], $version,
$rel_id, $row["descshort"]));
Index: header.inc
===================================================================
RCS file: /cvsroot/fink/web/pdb/header.inc,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -d -r1.10.2.6 -r1.10.2.7
--- header.inc 10 Sep 2007 19:54:22 -0000 1.10.2.6
+++ header.inc 22 Sep 2007 15:45:26 -0000 1.10.2.7
@@ -32,7 +32,7 @@
$title .= $pispec;
$pdbroot = "../../";
} else {
- print '<p><b>PATH_INFO not in expected format!</b></p>';
+ print '<p class="attention"><b>PATH_INFO not in expected format!</b></p>';
exit;
}
$root = "-".$pdbroot;
@@ -59,8 +59,16 @@
/* connect to database */
include $fsroot."db.inc.php";
-$dbh = mysql_pconnect($db_host, $db_user, $db_passwd);
-mysql_select_db($db_name, $dbh);
+$error_level = error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);
+try {
+ $dbh = mysql_pconnect($db_host, $db_user, $db_passwd);
+ mysql_select_db($db_name, $dbh);
+}
+catch (Exception $e) {
+}
+error_reporting($error_level);
+if (!$dbh)
+ print '<p class="attention"><b>Couldn\'t connect to database!</b></p>';
// Read url parameters. We use basic HTML encoding for now, and
Index: browse.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/browse.php,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -d -r1.1.2.28 -r1.1.2.29
--- browse.php 10 Sep 2007 18:02:20 -0000 1.1.2.28
+++ browse.php 22 Sep 2007 15:45:25 -0000 1.1.2.29
@@ -115,7 +115,7 @@
$q .= "ORDER BY priority DESC";
$qdist = mysql_query($q, $dbh);
if (!$qdist) {
- die('<p class="attention"><b>Error in db query (distribution):</b>
'.mysql_error().'</p>');
+ die('<p class="attention"><b>Error during db query (distribution):</b>
'.mysql_error().'</p>');
}
$dist_values[''] = 'Any';
while ($dist = mysql_fetch_array($qdist)) {
@@ -140,7 +140,7 @@
$query = "SELECT * FROM sections ORDER BY name ASC";
$rs = mysql_query($query, $dbh);
if (!$rs) {
- print '<p class="attention"><b>Error in db query (sections):</b>
'.mysql_error().'</p>';
+ print '<p class="attention"><b>Error during db query (sections):</b>
'.mysql_error().'</p>';
} else {
$seccount = mysql_num_rows($rs);
while ($row = mysql_fetch_array($rs)) {
@@ -393,7 +393,7 @@
$rs = mysql_query($query, $dbh);
$time_sql_end = microtime_float();
if (!$rs) {
- print '<p class="attention"><b>Error in db query (list packages):</b>
'.mysql_error().'</p>';
+ print '<p class="attention"><b>Error during db query (list packages):</b>
'.mysql_error().'</p>';
} else {
$count = mysql_num_rows($rs);
-------------------------------------------------------------------------
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
