/[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 1155 by dpavlin, Sat Apr 25 11:00:22 2009 UTC revision 1165 by dpavlin, Sat Apr 25 17:11:33 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 116  foreach ( split(/[\n\r]+/, $select_attr_ Line 121  foreach ( split(/[\n\r]+/, $select_attr_
121    
122  warn "## attr_operator = ", dump( $attr_operator );  warn "## attr_operator = ", dump( $attr_operator );
123    
124    my $only_input;
125    
126    foreach ( @{ $db->{input} } ) {
127            my $input = $_->{name} || die "no name in ",dump( $_ );
128            if ( ! $only_input->{'-labels'}->{$input} ) {
129                    push @{ $only_input->{'-values'} }, $input;
130                            $only_input->{'-labels'}->{$input} = $_->{description} || $input;
131            }
132    }
133    
134    warn "## only_input = ", dump( $only_input );
135    
136  print  print
137          start_html(          start_html(
138                  -title => $db->{name},                  -title => $db->{name},
# Line 139  print Line 156  print
156                  h2( 'Select input' ),                  h2( 'Select input' ),
157                  checkbox_group(                  checkbox_group(
158                          -name => 'only_input',                          -name => 'only_input',
159                          -values => [ map { $_->{name} } @{ $db->{input} } ],                          %$only_input,
160                          -linebreak=> 'true',                          -linebreak=> 'true',
161                  ),                  ),
162                  qq|</div>|,                  qq|</div>|,
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 165  if ( my $search = param('search') ) { Line 179  if ( my $search = param('search') ) {
179    
180          dump_yaml( 'pager', $pager );          dump_yaml( 'pager', $pager );
181    
182          my @search = ();          my @search = ();
   
183          if ( $search =~ m{(=|"|AND|OR)} ) {          if ( $search =~ m{(=|"|AND|OR)} ) {
184                  push @search, $search;                  push @search, $search;
185          } elsif ( my $op = param('attr_operator') ) {          } elsif ( my $op = param('attr_operator') ) {
# Line 189  if ( my $search = param('search') ) { Line 202  if ( my $search = param('search') ) {
202                  $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;                  $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
203    
204                  push @search, $v;                  push @search, $v;
205            
206                    my @only_input = param('only_input');
207                    push @search, '(' . join(') OR (', map { "input=$_" } @only_input) . ')' if @only_input;
208          } else {          } else {
209                  push @search, "xml=$search";                  push @search, "all=\"$search\"";
210          }          }
211    
212          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) . ')';  
213          $q =~ s{\(\((.+)\)\)}{($1)};          $q =~ s{\(\((.+)\)\)}{($1)};
214          warn "# query: $q\n";          warn "# query: $q\n";
215          my $swish_results = $swish->query( $q );          my $swish_results = $swish->query( $q );
# Line 250  if ( my $search = param('search') ) { Line 262  if ( my $search = param('search') ) {
262    
263  }  }
264    
265  dump_yaml( 'db', $db );  dump_yaml( "config databases $database", $db );
266  dump_yaml( 'html_markup_skip', $html_markup_skip );  dump_yaml( 'html_markup_skip', $html_markup_skip );
267    
268  print   end_html;  print   end_html;
Legend:
Removed from v.1155  
changed lines
  Added in v.1165
  ViewVC Help
Powered by ViewVC 1.1.26