--- trunk/WebPac.pm	2003/01/22 22:27:19	12
+++ trunk/WebPac.pm	2003/02/16 22:41:37	13
@@ -11,12 +11,13 @@
 
 use lib '..';
 use index_DBI;
+use back2html;
 
 # configuration options
 # FIX: they really should go in configuration file!
 my $TEMPLATE_PATH = '/data/webpac/template_html';
 my $CHARSET = 'ISO-8859-2';
-my $SWISH = '/usr/local/bin/swish-e';
+my $SWISH = '/usr/bin/swish-e';
 my $INDEX = '/data/webpac/index/isis.index';
 my $MAX_HITS = 500;
 my $ON_PAGE = 10;
@@ -97,18 +98,17 @@
 	my $sh = SWISH->connect('Fork',
 		prog     => $SWISH,
 		indexes  => $INDEX,
-		#properties  => [qw/god br nr/],
+		properties  => [qw/swishdocpath swishrank swishtitle headline html/],
 		results  => sub {
 			my ($sh,$hit) = @_;
 
 			push @swish_results, {
 				nr => ($#swish_results + 2),
 				path => $hit->swishdocpath,
-				title => to_utf8({ -string => $hit->swishtitle, -charset => $CHARSET }),
+				headline => from_utf8({ -string => $hit->headline, -charset => $CHARSET }),
+				html => back2html(from_utf8({ -string => $hit->html, -charset => $CHARSET })),
 				rank => $hit->swishrank };
 
-#			my @fields = $hit->field_names;
-#			print "Field '$_' = '", $hit->$_, "'<br>\n" for sort @fields;
 		},
 		#startnum => 0,
 		maxhits => $MAX_HITS,