--- trunk/WebPac.pm	2003/06/01 15:33:08	51
+++ trunk/WebPac.pm	2003/07/04 20:37:04	63
@@ -8,6 +8,7 @@
 use SWISH;
 use Text::Iconv;
 use DBI;
+use Config::IniFiles;
 
 use lib '..';
 use index_DBI;
@@ -19,13 +20,17 @@
 my $CHARSET = 'ISO-8859-2';
 my $SWISH = '/usr/bin/swish-e';
 my $INDEX = '/data/webpac/index/isis.index';
-my $MAX_HITS = 500;
+my $MAX_HITS = 0;
 my $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;
 	$self->tmpl_path($TEMPLATE_PATH);
@@ -90,6 +95,8 @@
 				$s.= ($s) ? "and " : "";
 				$s.="not " if ($1 eq "-");
 				$s.="$2* ";
+			} elsif (m/(and|or|not)/i) {
+				$s.="$_ ";
 			} else {
 				$s.="$_* ";
 			}
@@ -192,7 +199,12 @@
 
 	my $html;
 
-	my $index = new index_DBI();
+	my $index = new index_DBI(
+		$cfg_global->val('global', 'dbi_dbd'),
+		$cfg_global->val('global', 'dbi_dsn'),
+		$cfg_global->val('global', 'dbi_user'),
+		$cfg_global->val('global', 'dbi_passwd') || ''
+	);
 
 	my $total = $index->check($field);
 	if (! $total) {