Introduce $SEARCH_CGI

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 735302e5f6931681b1fe3d26011b042d0da2318e..65a13f406e9b75ba2e9ad039d28a14a800881973 100644 (file)
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -23,15 +23,17 @@ our @EXPORT = qw( header title trailer file_changed time_stamp
                  pdeplegend pkg_list pmoreinfo );
 
 our $HOME = "http://www.debian.org";
                  pdeplegend pkg_list pmoreinfo );
 
 our $HOME = "http://www.debian.org";

+our $ROOT = "http://merkel.debian.org/~jeroen/pdo"; # <-- config.sh?!

 our $CONTACT_MAIL = 'debian-www@lists.debian.org';
 our $WEBMASTER_MAIL = 'webmaster@debian.org';
 our $CONTACT_MAIL = 'debian-www@lists.debian.org';
 our $WEBMASTER_MAIL = 'webmaster@debian.org';

-our $SEARCH_PAGE = "http://packages.debian.org/";
-our $CGI_ROOT = "http://packages.debian.org/cgi-bin";
+our $SEARCH_PAGE = "$ROOT/";
+our $SEARCH_CGI = "$ROOT/search";
+our $CGI_ROOT = "$ROOT/cgi-bin";

 our $CN_HELP_URL = "${HOME}/intro/cn";
 our $CHANGELOG_URL = '/changelogs';
 our $COPYRIGHT_URL = '/changelogs';
 our $CN_HELP_URL = "${HOME}/intro/cn";
 our $CHANGELOG_URL = '/changelogs';
 our $COPYRIGHT_URL = '/changelogs';

-our $SEARCH_URL = '/cgi-bin/search_packages.pl?searchon=names&amp;version=all&amp;exact=1&amp;keywords=';
-our $SRC_SEARCH_URL = '/cgi-bin/search_packages.pl?searchon=sourcenames&amp;version=all&amp;exact=1&amp;keywords=';
+our $SEARCH_URL = "$ROOT/search/";
+our $SRC_SEARCH_URL = "$SEARCH_CGI?searchon=sourcenames&amp;version=all&amp;exact=1&amp;keywords=";

 our $BUG_URL = 'http://bugs.debian.org/';
 our $SRC_BUG_URL = 'http://bugs.debian.org/src:';
 our $QA_URL = 'http://packages.qa.debian.org/';
 our $BUG_URL = 'http://bugs.debian.org/';
 our $SRC_BUG_URL = 'http://bugs.debian.org/src:';
 our $QA_URL = 'http://packages.qa.debian.org/';


@@ -292,7 +294,7 @@ sub header {
                                 sourcenames => "", );
        $checked_searchon{$values{searchon}} = "checked=\"checked\"";
        $search_in_header = <<MENU;
                                 sourcenames => "", );
        $checked_searchon{$values{searchon}} = "checked=\"checked\"";
        $search_in_header = <<MENU;

-<form method="GET" action="$CGI_ROOT/search_packages.pl">
+<form method="GET" action="$SEARCH_CGI">

 <div id="hpacketsearch">
 <input type="hidden" name="suite" value="$values{suite}">
 <input type="hidden" name="subword" value="$values{subword}">
 <div id="hpacketsearch">
 <input type="hidden" name="suite" value="$values{suite}">
 <input type="hidden" name="subword" value="$values{subword}">