move configuration options in global.conf

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@76 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/WebPac.pm b/WebPac.pm
index 4e1a8a6..6afdba8 100644 (file)
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -15,22 +15,23 @@ use lib '..';
 use index_DBI;
 use back2html;
 
-# configuration options
-# FIXME they really should go in configuration file!
-my $TEMPLATE_PATH = '/data/webpac/template_html';
-my $CHARSET = 'ISO-8859-2';
-my $SWISH = '/usr/bin/swish-e';
-my $INDEX = '/data/webpac/index/isis.index';
-my $MAX_HITS = 0;
-my $ON_PAGE = 10;
+
+# read global.conf configuration
+my $cfg_global = new Config::IniFiles( -file => '../global.conf' ) || die "can't open 'global.conf'";
+
+# configuration options from global.conf
+my $TEMPLATE_PATH = $cfg_global->val('webpac', 'template_html') || die "need template_html in global.conf, section webpac";
+my $CHARSET = $cfg_global->val('webpac', 'charset') || 'ISO-8859-1';
+my $SWISH = $cfg_global->val('webpac', 'swish') || '/usr/bin/swish-e';
+my $INDEX = $cfg_global->val('webpac', 'index') || die "need index in global.conf, section webpac";
+my $MAX_HITS = $cfg_global->val('webpac', 'max_hits') || 0;
+my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;
+
 
 Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
 
 my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
 
-# read global.conf configuration
-my $cfg_global = new Config::IniFiles( -file => '../global.conf' ) || die "can't open 'global.conf'";
-
 
 sub setup {
        my $self = shift;
@@ -151,8 +152,8 @@ sub show_results_list {
        $tmpl->param('hits',$hits);
        $tmpl->param('search',$sw_q);
 
-       $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 1);
-       $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 1);
+       $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
+       $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
 
        # create a Pager object
        my $pager = HTML::Pager->new(

diff --git a/global.conf b/global.conf
index 2840037..fc27076 100644 (file)
--- a/global.conf
+++ b/global.conf
@@ -7,3 +7,17 @@
        dbi_user=dpavlin
        dbi_passwd=xx
 
+[webpac]
+       # path to template html files
+       template_html = /data/webpac/template_html
+       # charset encoding for template file *and* users (default iso-8859-1)
+       charset = ISO-8859-2
+       # path to swish binary (default /usr/bin/swish-e)
+       swish = /usr/bin/swish-e
+       # path to index file
+       index = /data/webpac/index/isis.index
+       # this is hard-coded maximum hits for ALL user. (default 0=disable)
+       max_hits = 0
+       # number of results on each pager page (default 10)
+       on_page = 30
+