Fix handling of the base search URL

Actually use the template config variable in the templates.
(Re-)Introduce the search_url variable in config.sh so
that make_search_url can actually use it.

diff --git a/config.sh.sed.in b/config.sh.sed.in
index c2088787c1c5fc2887ad9e7696d55ca4d1cbd75b..9fddcb86a605d79d2d78744a11d3bd315f755346 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -35,7 +35,9 @@ ddtp_ftpsite=http://ddtp.debian.net/debian
 wget_cmd="wget --no-verbose --tries=2 --timeout=60"
 check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
 
+# URLs that need to be known in the code (as opposed to the templates)
 root=""
+search_url="/search"
 
 # Architectures
 #

diff --git a/lib/Packages/Config.pm b/lib/Packages/Config.pm
index 1b9dbf52ad57df2b8a8f428765935d95be9f4240..2ec87edfd278bf977b7cf9b59d32174452561bdf 100644 (file)
--- a/lib/Packages/Config.pm
+++ b/lib/Packages/Config.pm
@@ -8,11 +8,11 @@ use Packages::CGI qw( :DEFAULT error );
 
 our @ISA = qw( Exporter );
 
-our ( $TOPDIR, $DBDIR, $TEMPLATEDIR, $CACHEDIR, $ROOT,
+our ( $TOPDIR, $DBDIR, $TEMPLATEDIR, $CACHEDIR, $ROOT, $SEARCH_URL,
       @LANGUAGES, @DDTP_LANGUAGES,
       @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES,
       @PRIORITIES, %FTP_SITES );
-our @EXPORT_OK = qw( $TOPDIR $DBDIR $TEMPLATEDIR $CACHEDIR $ROOT
+our @EXPORT_OK = qw( $TOPDIR $DBDIR $TEMPLATEDIR $CACHEDIR $ROOT $SEARCH_URL
                     @LANGUAGES @DDTP_LANGUAGES
                     @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES
                     @PRIORITIES %FTP_SITES  );
@@ -35,6 +35,7 @@ sub init {
            $TEMPLATEDIR = $1 if /^\s*templatedir="?([^\"]*)"?\s*$/o;
            $CACHEDIR = $1 if /^\s*cachedir="?([^\"]*)"?\s*$/o;
            $ROOT = $1 if /^\s*root="?([^\"]*)"?\s*$/o;
+           $SEARCH_URL = $1 if /^\s*search_url="?([^\"]*)"?\s*$/o;
            $FTP_SITES{us} = $1 if /^\s*ftpsite="?([^\"]*)"?\s*$/o;
            $FTP_SITES{$1} = $2 if /^\s*(\w+)_ftpsite="?([^\"]*)"?\s*$/o;
            @LANGUAGES = split(/\s+/, $1) if /^\s*polangs="?([^\"]*)"?\s*$/o;

diff --git a/templates/config.tmpl b/templates/config.tmpl
index e4ccf7210df2a181afd7048e4d45b635413d746e..3e91e260cd513291ed95b3d9b1b75f59571991a8 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -7,7 +7,7 @@
    project_homepage = 'http://www.debian.org/'
    packages_homepage = 'http://packages.debian.net/'
    searchformurl = packages_homepage
-   search_url = '/'
+   search_url = '/search'
    tags_url = 'http://debtags.alioth.debian.org/'
    bugs_url = 'http://bugs.debian.org/'
    pts_url = 'http://packages.qa.debian.org/'

diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl
index 9526e226a469d9e5bab81fd3903d435f48b88ffb..1cc5d1fc1dde7fb530effe50a8a9115140c341d6 100644 (file)
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@ -36,7 +36,7 @@
 [%- IF print_search_field %]
 [% checked = 'checked="checked"'
    selected = 'selected="selected"' %]
-<form method="GET" action="/search">
+<form method="GET" action="[% search_url %]">
 <div id="hpacketsearch">
 [% IF search_field_values.mode %]<input type="hidden" name="mode" value="[% search_field_values.mode %]">[% END %]
 [% IF search_field_values.sort_by %]<input type="hidden" name="sort_by" value="[% search_field_values.sort_by %]">[% END %]