--- trunk/html/swish.cgi	2003/03/16 21:06:43	8
+++ trunk/html/swish.cgi	2003/03/16 21:44:42	16
@@ -24,10 +24,14 @@
 
 my $spelling_alt;
 # FIX: doesn't work very well
-if ($config->{affix}) {
+if ($config->{findaffix}) {
 	$spelling_alt = new Lingua::Spelling::Alternative;
 	$spelling_alt->load_findaffix($config->{affix});
 }
+if ($config->{affix}) {
+	$spelling_alt = new Lingua::Spelling::Alternative;
+	$spelling_alt->load_affix($config->{affix});
+}
 
 my $hits=0;
 my $max_hits=$config->{max_hits};
@@ -37,10 +41,18 @@
 	$labels{$_->{value}} = $from_utf8->convert($_->{content});
 }
 
-print header(-charset=>$CHARSET),start_html(-title=>'Pretrazivanje',-lang=>'hr'),start_form;
-print "Potraži ",popup_menu(-name=>'max_hits',-values=>[ sort keys %labels ],-labels=>\%labels,-default=>$max_hits)," dokumenata sa riječima: ",textfield('search');
-print submit(-value=>'prikaži');
-print checkbox(-name=>'no_affix', -checked=>0, -label=>'ne koristi variranje oblika riječi');
+if ($config->{charset}) {
+	print header(-charset=>$config->{charset});
+} else {
+	print header;
+}
+print start_html(-title=>$config->{title}),start_form;
+print $config->{text}->{search};
+print popup_menu(-name=>'max_hits',-values=>[ sort keys %labels ],-labels=>\%labels,-default=>$max_hits);
+print $config->{text}->{documents};
+print textfield('search');
+print submit(-value=> $config->{text}->{submit});
+print checkbox(-name=>'no_affix', -checked=>0, -label=>$config->{text}->{no_spell}) if ($spelling_alt);
 print end_form,hr;
 
 if (param('search')) {
@@ -90,7 +102,7 @@
 		results  => sub {
 			my ($sh,$hit) = @_;
 
-			print "<a href=\"",$hit->swishdocpath,"\">",$hit->swishtitle,"</a> [",$hit->swishrank,"]<br>\n";
+			printf ("<a href=\"%s\">%s</a> [%s]<br>\n","http://".virtual_host().$config->{url}.$hit->swishdocpath,$hit->swishtitle || 'untitled',$hit->swishrank);
 
 #			print $_[1]->as_string,"<br>\n";
 #			my @fields = $hit->field_names;
@@ -105,10 +117,12 @@
 	$hits = $sh->query($s);
 
 	if ($hits > 0) {
-		print p,hr,"Prikazujem $hits dokumenata (maks. ",param('max_hits') || $max_hits,")... <small>($s)</small>";
+		print p,hr;
+		printf ($config->{text}->{hits},$hits,param('max_hits') || $max_hits,$s);
 	} else {
-		print p,"Nije nađen niti jedan dokument... <small>($s, ",$sh->errstr,")</small>";
+		print p;
+		printf ($config->{text}->{no_hits},$s,$sh->errstr);
 	}
 } else {
-	print p('Kod pretraživanja pretraživač pronalazi sve dokumente u kojima se pojavljuju <b>sve upisanje riječi</b>.',br,'Ako ispred riječi upišete minus (-) neće se prikazivati dokumenti koji imaju takvu riječ. Npr. <tt>+mreza -novak</tt>');
+	print p($config->{text}->{footer});
 }