--- trunk/vhost/webpac2.cgi	2009/04/25 22:26:29	1173
+++ trunk/vhost/webpac2.cgi	2009/04/26 15:04:52	1175
@@ -106,24 +106,25 @@
 
 my $db = $config->{databases}->{$database};
 
-my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
-
-# XXX pipe delimit list!
-my $select_attr_operators = << '__ATTR_OPERATORS__';
-Q*			|	Bilo koja riječ
-BW Q		|	Početak
-BW Q EW		|	Točan oblik
-__ATTR_OPERATORS__
-
-my $attr_operator;
-
-foreach ( split(/[\n\r]+/, $select_attr_operators ) ) {
-	my ( $operator,$label ) = split(/\s+\|\s+/,$_,2);
-	push @{ $attr_operator->{ '-values' } }, $operator;
-	        $attr_operator->{ '-labels' }->{$operator} = $label;
+sub read_config_txt {
+	my ( $file ) = @_;
+	my $input;
+	foreach ( split(/[\n\r]+/, read_file( "$dir/$path/$path-$file.txt" ) ) ) {
+		my ( $val,$label ) = split(/\s*\t\s*/,$_,2);
+		push @{ $input->{ '-values' } }, $val;
+				$input->{ '-labels' }->{$val} = $label;
+	}
+	return $input;
 }
 
-warn "## attr_operator = ", dump( $attr_operator );
+my $attr_labels    = read_config_txt 'labels';
+my $attr_operators = read_config_txt 'operators';
+
+my @attr = @{ $attr_labels->{'-values'} };
+@attr = keys %{ $stats->{attr} } unless @attr;
+
+
+warn dump( $attr_labels, $attr_operators );
 
 my $only_input;
 
@@ -151,11 +152,11 @@
 	start_form( -action => self_url( query => 0 ) ),
 		radio_group(
 			-name => 'attr',
-			-values => [ @attr ],
+			%$attr_labels,
 #			-linebreak => 0,
 		),
 		textfield( -name => 'search' ),
-		popup_menu( -name => 'attr_operator', %$attr_operator ),
+		popup_menu( -name => 'attr_operator', %$attr_operators ),
 		submit,
 		hidden( -name => 'entries_per_page', -default => $entries_per_page ),
 		# we need current_page fixed at 1 so that every submit through form will reset it
@@ -181,11 +182,6 @@
 	my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
 	$swish->abort_last_error if $swish->Error;
 
-	my $pager = Data::Page->new;
-	$pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
-
-	dump_yaml( 'pager', $pager );
-
 	my @search = (); 
 	if ( $search =~ m{(=|"|AND|OR)} ) {
 		push @search, $search;
@@ -223,9 +219,13 @@
 
 	dump_yaml( 'swish_results', $swish_results );
 
+	my $pager = Data::Page->new;
+	$pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
 	$pager->total_entries( $swish_results->hits );
 
-	$swish_results->seek_result( $pager->first );
+	dump_yaml( 'pager', $pager );
+
+	$swish_results->seek_result( $pager->first - 1 );
 
 	if ( ! $pager->total_entries ) {
 		my $no_results = 'No results for search <b>%s</b>';
@@ -240,13 +240,12 @@
 
 		print qq|<ul class="pager">$pager_html</ul>\n\n| if $pager_html;
 
-		my $start = $pager->first;
-		print qq|<ol start=$start>\n|;
+		my $nr = $pager->first;
+		print qq|<ol start=$nr>\n|;
 
 		my $limit = $pager->entries_on_this_page;
 
 		while ( my $result = $swish_results->next_result ) {
-			last if $limit-- == 0;
 
 			my $data = from_json $result->property('data');
 
@@ -263,9 +262,12 @@
 						$html_markup_skip->{$attr} = $@;
 					}
 				}
-				print qq|<div><label>$attr</label><span class=$attr>$v</span></div>\n|;
+				my $label = $attr_labels->{'-labels'}->{$attr} || $attr;
+				print qq|<div><label>$label</label><span class=$attr>$v</span></div>\n|;
 			}
 			print qq|</li>\n|;
+
+			last if $nr++ == $pager->last;
 		}
 		print qq|</ol>\n\n|;