Fix some smaller issues reported by Thijs Kinkhorst

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index 86bb48962db56c02c6b93244d66dc9beff4071ba..04d5acb74273f5aabc30a916d9cce450a8f84558 100755 (executable)
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -77,7 +77,7 @@ my $source = 0;
 if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
     my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
 
-    push @components, 'index' if $path =~ m,/$,;
+    push @components, 'index' if @components && $path =~ m,/$,;
 
     my %LANGUAGES = map { $_ => 1 } @LANGUAGES;
     if (@components > 0 and $LANGUAGES{$components[0]}) {
@@ -281,7 +281,6 @@ print "Total page evaluation took ".timestr($tetd)."<br>"
     if DEBUG;
 
 my $trailer = Packages::HTML::trailer( $ROOT );
-$trailer =~ s/LAST_MODIFIED_DATE/gmtime()/e; #FIXME
 print $trailer;
 
 # vim: ts=8 sw=4

diff --git a/lib/Packages/DoFilelist.pm b/lib/Packages/DoFilelist.pm
index 6bdfca7c52fe61a89aa5a67be2284cc9cfdee7e1..a1dda56b95d01904096438c2b448ed828b39a37c 100644 (file)
--- a/lib/Packages/DoFilelist.pm
+++ b/lib/Packages/DoFilelist.pm
@@ -43,7 +43,7 @@ sub do_filelist {
     my $arch = $opts->{arch}[0] ||'';
 
     %$html_header = ( title => sprintf( _g( "Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>" ), $pkg, $suite, $arch ),
-                     title_tag => sprintf( _g( "Filelist of of package %s/%s/%s" ), $pkg, $suite, $arch ),
+                     title_tag => sprintf( _g( "Filelist of package %s/%s/%s" ), $pkg, $suite, $arch ),
                      lang => $opts->{lang},
                      keywords => "debian, $suite, $arch, filelist",
                      print_title => 1,

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 5b41162ddd2e3518459148d6c392f421d1009b83..f8782b1e5bd96fe65deccfba0dd2866cd493eec1 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -28,6 +28,7 @@ sub do_search {
 
     if ($params->{errors}{keywords}) {
        fatal_error( _g( "keyword not valid or missing" ) );
+       $opts->{keywords} = [];
     } elsif (grep { length($_) < 2 } @{$opts->{keywords}}) {
        fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
     }

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index b8698cc3b592830a0add06d4e3284ba5ba4c67a2..1a51ba3d445eb28c2f697ce5dd80a46e06e61d83 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -24,6 +24,7 @@ sub do_search_contents {
 
     if ($params->{errors}{keywords}) {
        fatal_error( _g( "keyword not valid or missing" ) );
+       $opts->{keywords} = [];
     } elsif (grep { length($_) < 2 } @{$opts->{keywords}}) {
        fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
     }

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 6f8a71ce8a300c9b2b840f98f4abcbd7858cf640..d42c9a0dc28891954566a375dfb48c48e8227640 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -70,7 +70,7 @@ sub do_show {
 
        unless (@results || @non_results ) {
            fatal_error( _g( "No such package." )."<br>".
-                        sprintf( _g( '<a href="%s">Search for the package</a>' ), "$SEARCH_URL/$pkg" ) );
+                        sprintf( _g( '<a href="%s">Search for the package</a>' ), make_search_url('','keywords='.uri_escape($pkg)) ) );
        } else {
            my %all_suites;
            foreach (@results, @non_results) {

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 6a6baf6c9e4055241d577ae97b97801cf5cce21b..c7dfd0b7479d6c420a52e88dbd4f4b4d867da23c 100644 (file)
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -211,7 +211,7 @@ sub dep_item {
     my ( $suite, $name, $info, $desc ) = @_;
     my ($link, $post_link) = ('', '');
     if ($suite) {
-       $link = "<a href=\"".make_url($name,'',{suite=>$suite})."\">";
+       $link = "<a href=\"".make_url($name,'',{suite=>$suite,source=>undef})."\">";
        $post_link = '</a>';
     }
     if ($info) {
@@ -235,7 +235,7 @@ sub provides_string {
     my $short_desc = $also ? _g("also a virtual package provided by ")
        : _g("virtual package provided by ");
     if (@provided_by < 10) {
-       $short_desc .= join( ', ',map { "<a href=\"".make_url($_,'',{suite=>$suite})."\">$_</a>" } @provided_by);
+       $short_desc .= join( ', ',map { "<a href=\"".make_url($_,'',{suite=>$suite,source=>undef})."\">$_</a>" } @provided_by);
     } else {
        $short_desc .= sprintf( _g("%s packages"), scalar(@provided_by));
     }
@@ -530,7 +530,7 @@ sub trailer {
        "<div id=\"fineprint\" class=\"bordertop\"><p>".
        sprintf( _g( "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</a>. For other contact information, see the Debian <a href=\"%s/contact\">contact page</a>." ), $CONTACT_MAIL, $CONTACT_MAIL, $HOME).
        "</p>\n".
-       "<p>". _g( "Last Modified: " ). "LAST_MODIFIED_DATE".
+       "<p>". _g( "Last Modified: " ). gmtime().
        "<br>\n".
        sprintf( _g( "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; See <a href=\"%s/license\">license terms</a>." ), "$HOME/" )."<br>\n".
        _g( "Debian is a registered trademark of Software in the Public Interest, Inc." ).