--- search/nn-swish.cgi	2002/06/19 18:04:12	1.2
+++ search/nn-swish.cgi	2002/06/19 19:54:43	1.3
@@ -5,13 +5,14 @@
 use Text::Query;
 use CGI::Carp qw(fatalsToBrowser);
 use SWISH;
+require Unicode::Map8;
 
 my $dir='/home/dpavlin/nn/swish';
 
 my $hits=0;
 
 print header(-charset=>'iso-8859-2'),start_html(-title=>'NN pretrazivanje',-lang=>'hr'),start_form;
-print "Prika¾im zakone sa rijeèima: ",textfield('search');
+print "Potra¾i zakone sa rijeèima: ",textfield('search');
 print submit(-value=>'prika¾i');
 print end_form,hr;
 
@@ -21,15 +22,21 @@
 	$s=~tr/šðžèæŠÐŽÈÆ/¹ð¾èæ©Ð®ÈÆ/;	# 1250 -> iso8859-2
 	$s=~tr/¹©ðÐèÈæƾ®/sSdDcCcCzZ/;
 
+	my $l2_map = Unicode::Map8->new("ISO-8859-2") || die;
+	#my $utf8_map = Unicode::Map8->new("utf8") || die;
+
 	my $sh = SWISH->connect('Fork',
 		prog     => "$dir/swish-e",
 		indexes  => "$dir/nn.index",
+		properties  => [qw/god br nr/],
 		results  => sub {
-			my ($sh, $hit) = @_;
+			my ($sh,$hit) = @_;
+
+			my $us=$hit->swishtitle;
 
-			print $hit->swishreccount, '<a href="',$hit->swishdocpath,"'>",$hit->swishtitle,"</a> [",$hit->swishrank,"]<br>\n";
+			print "<a href=\"",$hit->swishdocpath,"\"><tt>",$hit->god,"/",$hit->br,"</a> ",$hit->nr," </tt>",$hit->swishtitle,"x</a> [",$hit->swishrank,"]<br>\n";
 
-#			print $_[1]->as_string,"\n";
+#			print $_[1]->as_string,"<br>\n";
 #			my @fields = $hit->field_names;
 #			print "Field '$_' = '", $hit->$_, "'<br>\n" for sort @fields;
 		},