/[webpac2]/trunk/vhost/webpac2.cgi
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /trunk/vhost/webpac2.cgi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1162 by dpavlin, Sat Apr 25 14:20:42 2009 UTC revision 1170 by dpavlin, Sat Apr 25 21:25:15 2009 UTC
# Line 93  if ( -e $html_markup ) { Line 93  if ( -e $html_markup ) {
93          undef $html_markup;          undef $html_markup;
94  }  }
95    
96  my $estraier = YAML::LoadFile( "$dir/../var/estraier/$database.yaml" );  my $stats;
97    {
98            my $path = "$dir/../var/swish/$database.yaml";
99            $stats = YAML::LoadFile( $path );
100            dump_yaml( "stats $path", $stats );
101    }
102    
103  my $db = $config->{databases}->{$database};  my $db = $config->{databases}->{$database};
104    
105  my @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup  my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
106    
107  # XXX pipe delimit list!  # XXX pipe delimit list!
108  my $select_attr_operators = << '__ATTR_OPERATORS__';  my $select_attr_operators = << '__ATTR_OPERATORS__';
# Line 158  print Line 163  print
163    
164  ;  ;
165    
 dump_yaml( 'inputs', $db->{input} );  
 dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );  
   
166  print   end_form;  print   end_form;
167    
168  if ( my $search = param('search') ) {  if ( my $search = param('search') ) {
# Line 216  if ( my $search = param('search') ) { Line 218  if ( my $search = param('search') ) {
218    
219          $pager->total_entries( $swish_results->hits );          $pager->total_entries( $swish_results->hits );
220    
221            $swish_results->seek_result( $pager->first );
222    
223          if ( ! $pager->total_entries ) {          if ( ! $pager->total_entries ) {
224                  my $no_results = 'No results for search <b>%s</b>';                  my $no_results = 'No results for search <b>%s</b>';
225                  $no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;                  $no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;
# Line 232  if ( my $search = param('search') ) { Line 236  if ( my $search = param('search') ) {
236                  my $start = $pager->first;                  my $start = $pager->first;
237                  print qq|<ol start=$start>\n|;                  print qq|<ol start=$start>\n|;
238    
239                    my $limit = $pager->entries_on_this_page;
240    
241                  while ( my $result = $swish_results->next_result ) {                  while ( my $result = $swish_results->next_result ) {
242                            last if $limit-- == 0;
243    
244                          my $data = from_json $result->property('data');                          my $data = from_json $result->property('data');
245    
246                            dump_yaml( 'data', $data );
247    
248                          print qq|<li>|;                          print qq|<li>|;
249                          foreach my $attr ( @attr ) {                          foreach my $attr ( @attr ) {
250                                  next unless defined $data->{$attr};                                  next unless defined $data->{$attr};
# Line 260  if ( my $search = param('search') ) { Line 270  if ( my $search = param('search') ) {
270    
271  }  }
272    
273  dump_yaml( 'db', $db );  dump_yaml( "config databases $database", $db );
274  dump_yaml( 'html_markup_skip', $html_markup_skip );  dump_yaml( 'html_markup_skip', $html_markup_skip );
275    
276  print   end_html;  print   end_html;
Legend:
Removed from v.1162  
changed lines
  Added in v.1170
  ViewVC Help
Powered by ViewVC 1.1.26