--- search/nn2-search.cgi	2002/02/01 14:27:36	1.2
+++ search/nn2-search.cgi	2002/02/12 19:25:41	1.6
@@ -4,11 +4,14 @@
 use CGI qw/:standard -no_xhtml/;
 use DBI;
 use Text::Query;
+use CGI::Carp qw(fatalsToBrowser);
 
-my $url="http://www.nn.hr/CijeliBrojS.asp?god=%d&br=%d#%d";
+my $url="http://www.nn.hr/CijeliBrojS.asp?god=%d&br=%d&mid=%d#%d";
 
 my %labels = ('Simple'=>'jednostavnim', 'Advanced'=>'naprednim');
 
+my $hits=0;
+
 print header(-charset=>'iso-8859-2'),start_html(-title=>'NN pretrazivanje',-lang=>'hr'),start_form;
 print "Tra¾i zakon: ",textfield('search')," sa ";
 print popup_menu(-name=>'type',-values=>[ keys %labels ],-labels=>\%labels);
@@ -24,7 +27,10 @@
 		-select => 'select br,god,aname,nr,title from nn where __WHERE__ order by god desc,br desc,nr asc'
 		);
 
-	$query->prepare(param('search'));
+	my $s=param('search');
+	$s=~tr/ššžčꊩŽČĘ/¹š¾čę©Š®ČĘ/;	# 1250 -> iso8859-2
+	$s=~tr/¹©šŠčČęĘ¾®/sSdDcCcCzZ/;
+	$query->prepare($s);
 
 #	print "--",$query->matchstring();
 
@@ -32,7 +38,13 @@
 	my $sth=$dbh->prepare($query->matchstring()) || die $dbh->errstr();
 	$sth->execute() || die $dbh->errstr();
 	while (my $row = $sth->fetchrow_hashref()) {
-		print br,"<tt><a href=\"",sprintf($url,$row->{god},$row->{br},$row->{aname}),"\">NN",$row->{god},"/",$row->{br},"</a> ",$row->{nr},"</tt> ",$row->{title},"\n";
+		print br,"<tt><a href=\"",sprintf($url,$row->{god},$row->{br},$row->{nr},$row->{aname}),"\">NN",$row->{god},"/",$row->{br},"</a> ",$row->{nr},"</tt> ",$row->{title},"\n";
+		$hits++;
+	}
+	if ($hits > 0) {
+		print p,hr,"Našeno je $hits zakona...";
+	} else {
+		print p,"Nije našen niti jedan zakon...";
 	}
 } else {
 	print p('U jednostavnom pretra¾ivanju pretra¾ivač pronalazi sve zakone u kojima se pojavljuje <b>bilo koja</b> od tih riječi. Da bi na¹li sve zakone u kojima se pojavljuju <b>sve upisane riječi</b>, upi¹ite ispred svake riječi znak plus (+). Npr: <tt>+zakon +kava</tt>',br,'Ako ispred riječi upi¹ete minus (-) neęe se prikazivati zakoni koji imaju takvu riječ. Npr. <tt>+kava +zakon -dopunama</tt>');