--- search/nn-swish.cgi 2002/06/20 07:57:05 1.4
+++ search/nn-swish.cgi 2002/06/26 12:14:54 1.8
@@ -5,25 +5,39 @@
use Text::Query;
use CGI::Carp qw(fatalsToBrowser);
use SWISH;
+use Unicode::String qw(utf8 utf16);
require Unicode::Map8;
my $dir='/home/dpavlin/nn/swish';
my $hits=0;
+my $max_hits=100;
+
+my %labels = (100=>' 100', 200=>' 200', 500=>' 500', 0=>'neograničeno');
print header(-charset=>'iso-8859-2'),start_html(-title=>'NN pretrazivanje',-lang=>'hr'),start_form;
-print "Potra¾i zakone sa riječima: ",textfield('search');
+print "Potra¾i ",popup_menu(-name=>'max_hits',-values=>[ sort keys %labels ],-labels=>\%labels,-default=>$max_hits)," zakona sa riječima: ",textfield('search');
print submit(-value=>'prika¾i');
print end_form,hr;
if (param('search')) {
- my $s=param('search');
+ my $s;
+ # re-write query from +/- to and/and not
+ foreach (split(/\s+/,param('search'))) {
+ if (m/^([+-])(\S+)/) {
+ $s.= ($s) ? "and " : "";
+ $s.="not " if ($1 eq "-");
+ $s.="$2 ";
+ } else {
+ $s .= "$_ ";
+ }
+ }
$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 $us = Unicode::String->new();
my $sh = SWISH->connect('Fork',
prog => "$dir/swish-e",
@@ -32,14 +46,15 @@
results => sub {
my ($sh,$hit) = @_;
- my $us=$hit->swishtitle;
+ $us->utf8($hit->swishtitle);
- print "swishdocpath,"\">NN",$hit->god,"/",$hit->br," ",$hit->nr," ",$hit->swishtitle," [",$hit->swishrank,"]
\n";
+ print "swishdocpath,"\">NN",$hit->god,"/",$hit->br," ",$hit->nr," ",$l2_map->to8($us->utf16)," [",$hit->swishrank,"]
\n";
# print $_[1]->as_string,"
\n";
# my @fields = $hit->field_names;
# print "Field '$_' = '", $hit->$_, "'
\n" for sort @fields;
},
+ maxhits => param('max_hits') || $max_hits,
);
die $SWISH::errstr unless $sh;
@@ -47,9 +62,9 @@
$hits = $sh->query("naslov_czs=($s)");
if ($hits > 0) {
- print p,hr,"Našeno je $hits zakona...";
+ print p,hr,"Prikazujem $hits zakona (maks. ",param('max_hits') || $max_hits,")... ($s)";
} else {
- print p,"Nije našen niti jedan zakon... (",$sh->errstr,")";
+ print p,"Nije našen niti jedan zakon... ($s, ",$sh->errstr,")";
}
} else {
print p('Kod pretra¾ivanja pretra¾ivač pronalazi sve zakone u kojima se pojavljuju sve upisanje riječi.',br,'Ako ispred riječi upi¹ete minus (-) neęe se prikazivati zakoni koji imaju takvu riječ. Npr. +kava +zakon -dopunama');