/[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 1149 by dpavlin,
Fri Apr 24 16:58:09 2009 UTC
+revision 1162 by dpavlin,
Sat Apr 25 14:20:42 2009 UTC
 Line 99 
 my $db = $config->{databases}->{$databas
  my @attr = keys %{ $estraier->{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;
+ }
+ 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 113 
 print
+Line 142 
 print
  #                       -linebreak => 0,
                  ),
                  textfield( -name => 'search' ),
-                 popup_menu( -name => 'attr_operator', -values => [ '', 'STRBW', 'STREQ' ],
+                 popup_menu( -name => 'attr_operator', %$attr_operator ),
-                         -labels => {
-                                 '' => 'Bilo koja riječ',
-                                 'STRBW' => 'Početak',
-                                 'STREQ' => 'Točan oblik',
-                         },
-                 ),
                  submit,
                  hidden( -name => 'entries_per_page', -default => $entries_per_page ),
                  hidden( -name => 'current_page', -default => 1 ),
-Line 128 
 print
+Line 151 
 print
                  h2( 'Select input' ),
                  checkbox_group(
                          -name => 'only_input',
-                         -values => [ map { $_->{name} } @{ $db->{input} } ],
+                         %$only_input,
                          -linebreak=> 'true',
                  ),
                  qq|</div>|,
-Line 154 
 if ( my $search = param('search') ) {
+Line 177 
 if ( my $search = param('search') ) {
          dump_yaml( 'pager', $pager );
-         my @search = ( "xml=$search" );
+         my @search = ();
+         if ( $search =~ m{(=|"|AND|OR)} ) {
- #       if ( my $op = param('attr_operator') ) {
+                 push @search, $search;
- #               $cond->add_attr( param('attr') . " $op " . param('search') );
+         } elsif ( my $op = param('attr_operator') ) {
- #       }
+                 my $attr = param('attr');
+                 my $v = $search;
-         my @only_input = param('only_input');
+                 $v =~ s/^\s+//;
+                 warn "-- v: $v\n";
-         push @search, '(' . join(') or (', @only_input) . ')' if @only_input;
+                 sub rewrite {
+                         my ( $whitespace, $v ) = @_;
+                         warn "## filter $op $whitespace $v\n";
+                         my $template = $op;
+                            $template =~ s{Q}{$v};
+                         $whitespace = " AND " if $whitespace;
+                         return
+                                 $whitespace .
+                                 $attr . '="' . $template . '"';
+                                 ;
+                 };
+                 $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, "all=\"$search\"";
+         }
-         my $q = '(' . join(') and (', @search) . ')';
+         my $q = '(' . join(') AND (', @search) . ')';
+         $q =~ s{\(\((.+)\)\)}{($1)};
          warn "# query: $q\n";
          my $swish_results = $swish->query( $q );
-         $swish->abort_last_error if $swish->Error;
          dump_yaml( 'swish_results', $swish_results );
          $pager->total_entries( $swish_results->hits );
          if ( ! $pager->total_entries ) {
-                 my $no_results = "No results for search '%s'";
+                 my $no_results = 'No results for search <b>%s</b>';
-                 printf qq|<div class="error">$no_results</div>\n\n|, $search;
+                 $no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;
+                 printf qq|<div class="error">$no_results</div>\n\n|, $q;
          } else {
-                 my $results = "%d results for search '%s' showing results %d - %d on page %d";
+                 my $results = "<b>%d</b> results for search <b>%s</b> showing results %d - %d";
-                 printf qq|<div class="message">$results</div>\n\n|, $pager->total_entries, $search, $pager->first, $pager->last, $pager->current_page;
+                 printf qq|<div class="message">$results</div>\n\n|, $pager->total_entries, $q, $pager->first, $pager->last;
                  my $pager_html = join("\n", show_pager( $pager ));

 Legend:



Removed from v.1149
 


changed lines


 
Added in v.1162
 Legend:



Removed from v.1149
 


changed lines


 
Added in v.1162
-Removed from v.1149
+Added in v.1162

	ViewVC Help
Powered by ViewVC 1.1.26