--- trunk/vhost/webpac2.cgi	2009/04/25 17:11:33	1165
+++ trunk/vhost/webpac2.cgi	2009/04/26 00:07:58	1174
@@ -22,7 +22,7 @@
 
 sub dump_yaml {
 	my $name = shift;
-	print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>| if $debug;
+	print qq|<div class=dump><tt>$name</tt><pre>|, YAML::Dump( @_ ), qq|</pre></div>| if $debug;
 }
 
 sub show_pager {
@@ -76,9 +76,13 @@
 }
 
 my $path = $ENV{PATH_INFO} || 'ecas';
+$path =~ s{^/+}{};
+$path =~ s{/+$}{};
 my $dir = $0;
 $dir =~ s{/[^/]+.cgi}{};
 
+dump_yaml( 'dir', $dir );
+
 my $config = YAML::LoadFile( "$dir/$path/config.yml" );
 
 my $database = (keys %{ $config->{databases} })[0];
@@ -102,24 +106,25 @@
 
 my $db = $config->{databases}->{$database};
 
-my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
+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;
+}
 
-# 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_labels    = read_config_txt 'labels';
+my $attr_operators = read_config_txt 'operators';
 
-my $attr_operator;
+my @attr = @{ $attr_labels->{'-values'} };
+@attr = keys %{ $stats->{attr} } unless @attr;
 
-foreach ( split(/[\n\r]+/, $select_attr_operators ) ) {
-	my ( $operator,$label ) = split(/\s+\|\s+/,$_,2);
-	push @{ $attr_operator->{ '-values' } }, $operator;
-	        $attr_operator->{ '-labels' }->{$operator} = $label;
-}
 
-warn "## attr_operator = ", dump( $attr_operator );
+warn dump( $attr_labels, $attr_operators );
 
 my $only_input;
 
@@ -133,24 +138,29 @@
 
 warn "## only_input = ", dump( $only_input );
 
+my @style = ( '../../style.css' );
+push @style, "../../$path/$path.css" if -e "$dir/$path/$path.css";
+dump_yaml( 'style', \@style );
+
 print
 	start_html(
 		-title => $db->{name},
-		-style => '../../style.css',
+		-style => [ @style ],
 	),
 	h1( $db->{name} ),
 	qq|<div id=description>|, $db->{description}, qq|</div>|,
 	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 ),
-		hidden( -name => 'current_page', -default => 1 ),
+		# we need current_page fixed at 1 so that every submit through form will reset it
+		qq|<input type=hidden name=current_page value=1 >|,
 		checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
 		qq|<div id=inputs>|,
 		h2( 'Select input' ),
@@ -172,9 +182,7 @@
 	my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
 	$swish->abort_last_error if $swish->Error;
 
-	param( 'entries_per_page', $entries_per_page ) unless param('entries_per_page'); # FIXME not needed?
 	my $pager = Data::Page->new;
-	$pager->total_entries( param('current_page') * param('entries_per_page') );
 	$pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
 
 	dump_yaml( 'pager', $pager );
@@ -218,6 +226,8 @@
 
 	$pager->total_entries( $swish_results->hits );
 
+	$swish_results->seek_result( $pager->first );
+
 	if ( ! $pager->total_entries ) {
 		my $no_results = 'No results for search <b>%s</b>';
 		$no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;
@@ -234,9 +244,15 @@
 		my $start = $pager->first;
 		print qq|<ol start=$start>\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');
 
+			dump_yaml( 'data', $data );
+
 			print qq|<li>|;
 			foreach my $attr ( @attr ) {
 				next unless defined $data->{$attr};
@@ -248,7 +264,8 @@
 						$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|;
 		}