/[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!

Diff of /trunk/vhost/webpac2.cgi

Parent Directory | Revision Log | View Patch Patch

-revision 1155 by dpavlin,
Sat Apr 25 11:00:22 2009 UTC
+revision 1171 by dpavlin,
Sat Apr 25 22:07:59 2009 UTC
 Line 22 
 print header(
  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 {
 Line 93 
 if ( -e $html_markup ) {
          undef $html_markup;
  }
- my $estraier = YAML::LoadFile( "$dir/../var/estraier/$database.yaml" );
+ my $stats;
+ {
+         my $path = "$dir/../var/swish/$database.yaml";
+         $stats = YAML::LoadFile( $path );
+         dump_yaml( "stats $path", $stats );
+ }
  my $db = $config->{databases}->{$database};
- my @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup
+ my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
  # XXX pipe delimit list!
  my $select_attr_operators = << '__ATTR_OPERATORS__';
-Line 116 
 foreach ( split(/[\n\r]+/, $select_attr_
+Line 121 
 foreach ( split(/[\n\r]+/, $select_attr_
  warn "## attr_operator = ", dump( $attr_operator );
+ my $only_input;
+ foreach ( @{ $db->{input} } ) {
+         my $input = $_->{name} || die "no name in ",dump( $_ );
+         if ( ! $only_input->{'-labels'}->{$input} ) {
+                 push @{ $only_input->{'-values'} }, $input;
+                         $only_input->{'-labels'}->{$input} = $_->{description} || $input;
+         }
+ }
+ warn "## only_input = ", dump( $only_input );
  print
          start_html(
                  -title => $db->{name},
-Line 133 
 print
+Line 150 
 print
                  popup_menu( -name => 'attr_operator', %$attr_operator ),
                  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' ),
                  checkbox_group(
                          -name => 'only_input',
-                         -values => [ map { $_->{name} } @{ $db->{input} } ],
+                         %$only_input,
                          -linebreak=> 'true',
                  ),
                  qq|</div>|,
  ;
- dump_yaml( 'inputs', $db->{input} );
- dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
  print   end_form;
  if ( my $search = param('search') ) {
-Line 158 
 if ( my $search = param('search') ) {
+Line 173 
 if ( my $search = param('search') ) {
          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 );
          my @search = ();
          if ( $search =~ m{(=|"|AND|OR)} ) {
                  push @search, $search;
          } elsif ( my $op = param('attr_operator') ) {
-Line 189 
 if ( my $search = param('search') ) {
+Line 201 
 if ( my $search = param('search') ) {
                  $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
                  push @search, $v;
+                 my @only_input = param('only_input');
+                 push @search, '(' . join(') OR (', map { "input=$_" } @only_input) . ')' if @only_input;
          } else {
-                 push @search, "xml=$search";
+                 push @search, "all=\"$search\"";
          }
-         my @only_input = param('only_input');
+         my $q = '(' . join(') AND (', @search) . ')';
-         push @search, '(' . join(') or (', @only_input) . ')' if @only_input;
-         my $q = '(' . join(') and (', @search) . ')';
          $q =~ s{\(\((.+)\)\)}{($1)};
          warn "# query: $q\n";
          my $swish_results = $swish->query( $q );
-Line 206 
 if ( my $search = param('search') ) {
+Line 217 
 if ( my $search = param('search') ) {
          $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;
-Line 222 
 if ( my $search = param('search') ) {
+Line 235 
 if ( my $search = param('search') ) {
                  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};
-Line 250 
 if ( my $search = param('search') ) {
+Line 269 
 if ( my $search = param('search') ) {
  }
- dump_yaml( 'db', $db );
+ dump_yaml( "config databases $database", $db );
  dump_yaml( 'html_markup_skip', $html_markup_skip );
  print   end_html;

 Legend:



Removed from v.1155
 


changed lines


 
Added in v.1171
 Legend:



Removed from v.1155
 


changed lines


 
Added in v.1171
-Removed from v.1155
+Added in v.1171

	ViewVC Help
Powered by ViewVC 1.1.26