/[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 1165 by dpavlin, Sat Apr 25 17:11:33 2009 UTC revision 1171 by dpavlin, Sat Apr 25 22:07:59 2009 UTC
# Line 22  print header( Line 22  print header(
22    
23  sub dump_yaml {  sub dump_yaml {
24          my $name = shift;          my $name = shift;
25          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;
26  }  }
27    
28  sub show_pager {  sub show_pager {
# Line 150  print Line 150  print
150                  popup_menu( -name => 'attr_operator', %$attr_operator ),                  popup_menu( -name => 'attr_operator', %$attr_operator ),
151                  submit,                  submit,
152                  hidden( -name => 'entries_per_page', -default => $entries_per_page ),                  hidden( -name => 'entries_per_page', -default => $entries_per_page ),
153                  hidden( -name => 'current_page', -default => 1 ),                  # we need current_page fixed at 1 so that every submit through form will reset it
154                    qq|<input type=hidden name=current_page value=1 >|,
155                  checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?                  checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
156                  qq|<div id=inputs>|,                  qq|<div id=inputs>|,
157                  h2( 'Select input' ),                  h2( 'Select input' ),
# Line 172  if ( my $search = param('search') ) { Line 173  if ( my $search = param('search') ) {
173          my $swish = SWISH::API->new( "$dir/../var/swish/$database" );          my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
174          $swish->abort_last_error if $swish->Error;          $swish->abort_last_error if $swish->Error;
175    
         param( 'entries_per_page', $entries_per_page ) unless param('entries_per_page'); # FIXME not needed?  
176          my $pager = Data::Page->new;          my $pager = Data::Page->new;
         $pager->total_entries( param('current_page') * param('entries_per_page') );  
177          $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );          $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
178    
179          dump_yaml( 'pager', $pager );          dump_yaml( 'pager', $pager );
# Line 218  if ( my $search = param('search') ) { Line 217  if ( my $search = param('search') ) {
217    
218          $pager->total_entries( $swish_results->hits );          $pager->total_entries( $swish_results->hits );
219    
220            $swish_results->seek_result( $pager->first );
221    
222          if ( ! $pager->total_entries ) {          if ( ! $pager->total_entries ) {
223                  my $no_results = 'No results for search <b>%s</b>';                  my $no_results = 'No results for search <b>%s</b>';
224                  $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 234  if ( my $search = param('search') ) { Line 235  if ( my $search = param('search') ) {
235                  my $start = $pager->first;                  my $start = $pager->first;
236                  print qq|<ol start=$start>\n|;                  print qq|<ol start=$start>\n|;
237    
238                    my $limit = $pager->entries_on_this_page;
239    
240                  while ( my $result = $swish_results->next_result ) {                  while ( my $result = $swish_results->next_result ) {
241                            last if $limit-- == 0;
242    
243                          my $data = from_json $result->property('data');                          my $data = from_json $result->property('data');
244    
245                            dump_yaml( 'data', $data );
246    
247                          print qq|<li>|;                          print qq|<li>|;
248                          foreach my $attr ( @attr ) {                          foreach my $attr ( @attr ) {
249                                  next unless defined $data->{$attr};                                  next unless defined $data->{$attr};
Legend:
Removed from v.1165  
changed lines
  Added in v.1171
  ViewVC Help
Powered by ViewVC 1.1.26