--- trunk/WebPac.pm	2003/02/16 22:41:37	13
+++ trunk/WebPac.pm	2003/07/04 20:37:04	63
@@ -6,22 +6,30 @@
 use HTML::Pager;
 use HTML::FillInForm;
 use SWISH;
-use Unicode::MapUTF8 qw(to_utf8 from_utf8 utf8_supported_charset);
+use Text::Iconv;
 use DBI;
+use Config::IniFiles;
 
 use lib '..';
 use index_DBI;
 use back2html;
 
 # configuration options
-# FIX: they really should go in configuration file!
+# 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 = 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;
@@ -64,6 +72,9 @@
 
 	my @s_arr;	# all queries are located here
 
+	my @path_arr = $q->param('path');
+	my $full = $q->param('full');
+
 	for(my $i = 1; $i <=10; $i++) {
 
 		return show_index($self, $i) if ($q->param("f".$i."_index"));
@@ -84,10 +95,13 @@
 				$s.= ($s) ? "and " : "";
 				$s.="not " if ($1 eq "-");
 				$s.="$2* ";
+			} elsif (m/(and|or|not)/i) {
+				$s.="$_ ";
 			} else {
 				$s.="$_* ";
 			}
 		}
+		$s =~ s/\*+/*/g;
 
 		push @s_arr,$q->param("f$i")."_swish=($s)";
 	}
@@ -105,21 +119,33 @@
 			push @swish_results, {
 				nr => ($#swish_results + 2),
 				path => $hit->swishdocpath,
-				headline => from_utf8({ -string => $hit->headline, -charset => $CHARSET }),
-				html => back2html(from_utf8({ -string => $hit->html, -charset => $CHARSET })),
+				headline => $from_utf8->convert($hit->headline),
+				html => back2html($from_utf8->convert($hit->html)),
 				rank => $hit->swishrank };
 
 		},
 		#startnum => 0,
-		maxhits => $MAX_HITS,
+		maxhits => $MAX_HITS
 	);
 
 	die $SWISH::errstr unless $sh;
 
-	my $hits = $sh->query(join(" and ",@s_arr)) || 0;	# FIX: and/or
+	# construct swish query
+	my $sw_q = join(" and ",@s_arr);
+	if (@path_arr) {
+		$sw_q .= "and (swishdocpath=\"";
+		$sw_q .= join("\" or swishdocpath=\"",@path_arr);
+		$sw_q .= "\")";
+		$tmpl->param('full',1);	# show full records
+	}
+
+	my $hits = $sh->query($sw_q);
 
 	$tmpl->param('hits',$hits);
-	$tmpl->param('search',join(" and ",@s_arr));
+	$tmpl->param('search',$sw_q);
+
+	$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(
@@ -173,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) {
@@ -188,6 +219,11 @@
 	$tmpl->param('limit',$limit);
 	$tmpl->param('total',$total);
 
+# FIXME I should set offset and leave out limit from fetch!!
+#	if (! $q->param("PAGER_offset") {
+#		$q->param("Pager_offet)
+#	}
+
 	my $pager = HTML::Pager->new(
 		query => $q,
 		get_data_callback => sub {