OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 26-Nov-2005 00:43:29 Branch: HEAD Handle: 2005112523432900 Modified files: openpkg-registry registry-ui.pl Log: W3C Markup Validation Service; remove debug message Summary: Revision Changes Path 1.25 +23 -20 openpkg-registry/registry-ui.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-registry/registry-ui.pl ============================================================================ $ cvs diff -u -r1.24 -r1.25 registry-ui.pl --- openpkg-registry/registry-ui.pl 25 Nov 2005 22:36:41 -0000 1.24 +++ openpkg-registry/registry-ui.pl 25 Nov 2005 23:43:29 -0000 1.25 @@ -1033,9 +1033,9 @@ $html = ''; $html .= "<h2>Sorry</h2>\n"; - $html .= "<img src=\"?page=gif;name=icon-x\"> an internal <b>ERROR</b> occurred and prevents further processing.<br>\n"; - $html .= sprintf("<h2>Problem scope</h2>\n%s<br>\n", $marketingmessage) if (defined $marketingmessage and $marketingmessage ne ""); - $html .= sprintf("<h2>Technical details</h2>\n%s<br>\n", $technicaldetail) if (defined $technicaldetail and $technicaldetail ne ""); + $html .= "<img src=\"?page=gif;name=icon-x\"> an internal <b>ERROR</b> occurred and prevents further processing.<br/>\n"; + $html .= sprintf("<h2>Problem scope</h2>\n%s<br/>\n", $marketingmessage) if (defined $marketingmessage and $marketingmessage ne ""); + $html .= sprintf("<h2>Technical details</h2>\n%s<br/>\n", $technicaldetail) if (defined $technicaldetail and $technicaldetail ne ""); $html .= "<h2>Please come back later and try again</h2>\nSorry for the inconvenience.\n"; return $html } @@ -1179,14 +1179,14 @@ if (not defined $rv) { $msg = $dbh->errstr; $msg =~ s/[ ]*ERROR:?[ ]*//; - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR DataBase reports %s\n", $k, $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR DataBase reports %s\n", $k, $msg); next; } if ($rv != 1) { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR update failed rv=$rv\n", $k); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR update failed rv=$rv\n", $k); next; } - $html .= sprintf("<br><img src=\"?page=gif;name=icon-ok\"> <code><b>%s</b></code> %s\n", $k, $formstruct->{$mode}->{$k}->{registry_desc}); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-ok\"> <code><b>%s</b></code> %s\n", $k, $formstruct->{$mode}->{$k}->{registry_desc}); } } } @@ -1207,14 +1207,14 @@ if (not defined $rv) { $msg = $dbh->errstr; $msg =~ s/[ ]*ERROR:?[ ]*//; - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR DataBase reports %s\n", $k, $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR DataBase reports %s\n", $k, $msg); next; } if ($rv != 1) { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR deletion failed rv=$rv\n", $k); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <code><b>%s</b></code> ERROR deletion failed rv=$rv\n", $k); next; } - $html .= sprintf("<br><img src=\"?page=gif;name=icon-ok\"> <code><b>%s</b></code> %s\n", $k, $formstruct->{$mode}->{$k}->{registry_desc}); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-ok\"> <code><b>%s</b></code> %s\n", $k, $formstruct->{$mode}->{$k}->{registry_desc}); } } } @@ -1400,7 +1400,7 @@ $html .= "</registry>\n"; } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> ERROR: not XML data\n"); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> ERROR: not XML data\n"); } return $html; } @@ -1419,7 +1419,7 @@ $html .= "</registry>\n"; } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> ERROR: XML parser reports %s\n", $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> ERROR: XML parser reports %s\n", $msg); } return $html; } @@ -1437,7 +1437,7 @@ $html .= "</registry>\n"; } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> ERROR: at begin of transaction, DataBase reports %s\n", $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> ERROR: at begin of transaction, DataBase reports %s\n", $msg); } return $html; } @@ -1461,7 +1461,7 @@ $html .= sprintf(" <response id=\"%s\" done=\"no\">ERROR DataBase reports %s</response>\n", $k, $msg); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR DataBase reports %s\n", $k, $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR DataBase reports %s\n", $k, $msg); } $commit = 0; next; @@ -1471,7 +1471,7 @@ $html .= sprintf(" <response id=\"%s\" done=\"no\">ERROR username %s not found</response>\n", $k, $username); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR username <i>%s</i> not found\n", $k, $username); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR username <i>%s</i> not found\n", $k, $username); } $commit = 0; next; @@ -1498,7 +1498,7 @@ $html .= sprintf(" <response id=\"%s\" done=\"no\">ERROR DataBase reports %s</response>\n", $k, $msg); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR DataBase reports %s\n", $k, $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR DataBase reports %s\n", $k, $msg); } $commit = 0; next; @@ -1527,7 +1527,7 @@ $html .= sprintf(" <response id=\"%s\" done=\"no\">ERROR DataBase reports %s</response>\n", $k, $msg); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR DataBase reports %s\n", $k, $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR DataBase reports %s\n", $k, $msg); } $commit = 0; next; @@ -1537,7 +1537,7 @@ $html .= sprintf(" <response id=\"%s\" done=\"no\">ERROR update failed rv=%s</response>\n", $k, $msg); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR update failed rv=$rv\n", $k); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> <b>%s</b> ERROR update failed rv=$rv\n", $k); } $commit = 0; next; @@ -1547,7 +1547,7 @@ $html .= sprintf(" <response id=\"%s\" done=\"yes\">%s</response>\n", $k, $ref->{request}->{$k}->{registry_desc}); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-ok\"> <b>%s</b> %s\n", $k, $ref->{request}->{$k}->{registry_desc}); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-ok\"> <b>%s</b> %s\n", $k, $ref->{request}->{$k}->{registry_desc}); } } @@ -1560,7 +1560,7 @@ $html .= sprintf(" <response id=\"FIXME\" done=\"no\">ERROR commit transaction failed, DataBase reports %s</response>\n", $msg); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> ERROR commit transaction failed, DataBase reports %s\n", $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> ERROR commit transaction failed, DataBase reports %s\n", $msg); } } $cgi->delete(-name=>'data'); @@ -1574,7 +1574,7 @@ $html .= sprintf(" <response id=\"FIXME\" done=\"no\">ERROR rollback transaction failed, DataBase reports %s</response>\n", $msg); } else { - $html .= sprintf("<br><img src=\"?page=gif;name=icon-x\"> ERROR rollback transaction failed, DataBase reports %s\n", $msg); + $html .= sprintf("<br/><img src=\"?page=gif;name=icon-x\"> ERROR rollback transaction failed, DataBase reports %s\n", $msg); } } } @@ -1661,8 +1661,11 @@ (undef, undef, $canvas) = &fetchurlcached($cfg->{canvas}->{url}); if (not defined $canvas or $canvas eq "") { $canvas = + "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n" . + " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n" . "<html>\n" . " <head>\n" . + " <title>OpenPKG registry</title>\n" . $cfg->{canvas}->{mark_head} . "\n" . " </head>\n" . " <body class=\"registry\">\n" . @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org