/[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 1241 by dpavlin, Sun Jul 12 17:42:27 2009 UTC revision 1330 by dpavlin, Sun Mar 21 20:58:57 2010 UTC
# Line 11  use Data::Page; Line 11  use Data::Page;
11  use Data::Dump qw/dump/;  use Data::Dump qw/dump/;
12  use SWISH::API;  use SWISH::API;
13  use JSON;  use JSON;
14    use Text::Unaccent::PurePerl qw/unac_string/;
15    use HTML::FillInForm::Lite;
16    use Encode;
17    
18  my $range_around = 5;  my $range_around = 5;
19  my @entries_per_page = ( 30, 50, 100, 500 );  my @entries_per_page = ( 30, 50, 100, 500 );
# Line 136  my $inputs_available = 0; Line 139  my $inputs_available = 0;
139    
140  foreach ( @{ $db->{input} } ) {  foreach ( @{ $db->{input} } ) {
141          my $input = $_->{name} || die "no name in ",dump( $_ );          my $input = $_->{name} || die "no name in ",dump( $_ );
142            next unless defined $stats->{input}->{$input}; # skip inputs without data
143          if ( ! $only_input->{'-labels'}->{$input} ) {          if ( ! $only_input->{'-labels'}->{$input} ) {
144                  push @{ $only_input->{'-values'} }, $input;                  push @{ $only_input->{'-values'} }, $input;
145                          $only_input->{'-labels'}->{$input} = $_->{description} || $input;                          $only_input->{'-labels'}->{$input} = $_->{description} || $input;
# Line 150  push @style, "../../$path/$path.css" if Line 154  push @style, "../../$path/$path.css" if
154  dump_yaml( 'style', \@style );  dump_yaml( 'style', \@style );
155    
156  sub search_form {  sub search_form {
157    
158            my $form_html = "$dir/$path/$path-search.html";
159            if ( -e $form_html ) {
160                    my $html = read_file( $form_html );
161                    my $q = CGI->new();
162                    my $h = HTML::FillInForm::Lite->new();
163                    return $h->fill(\$html, $q);
164            }
165    
166          qq|<a name="form"></a>|,          qq|<a name="form"></a>|,
167          start_form( -action => self_url( query => 0 ) ),          start_form( -action => self_url( query => 0 ) ),
168                  checkbox_group(                  checkbox_group(
# Line 190  print Line 203  print
203    
204  if ( my $search = param('search') ) {  if ( my $search = param('search') ) {
205    
206            $search = unac_string( Encode::decode('utf-8',$search) );
207    
208          print qq|          print qq|
209                  <a href="#form" class="skip" title="skip to search form">#</a>                  <a href="#form" class="skip" title="skip to search form">#</a>
210                  <div id="results">                  <div id="results">
# Line 202  if ( my $search = param('search') ) { Line 217  if ( my $search = param('search') ) {
217          my @attrs = param('attr');          my @attrs = param('attr');
218          my $op = param('attr_operator');          my $op = param('attr_operator');
219    
220          if ( $search =~ m{(=|"|AND|OR)} ) {          if ( $search =~ m{(=|"|\bAND\b|\bOR\b)} ) {
221                  push @search, $search;                  push @search, $search;
222          } elsif ( @attrs ) {          } elsif ( @attrs ) {
223    
# Line 247  if ( my $search = param('search') ) { Line 262  if ( my $search = param('search') ) {
262          $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;          $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
263    
264          warn "# query: $q\n";          warn "# query: $q\n";
265          my $swish_results = $swish->query( $q );          my $search_obj = $swish->new_search_object;
266            if ( my $sort = param('sort') ) {
267                    $search_obj->set_sort( $sort );
268            }
269            my $swish_results = $search_obj->execute( $q );
270    
271          dump_yaml( 'swish_results', $swish_results );          dump_yaml( 'swish_results', $swish_results );
272    
# Line 281  if ( my $search = param('search') ) { Line 300  if ( my $search = param('search') ) {
300    
301                  while ( my $result = $swish_results->next_result ) {                  while ( my $result = $swish_results->next_result ) {
302    
303                          my $data = from_json( $result->property('data'), {utf8 => 1} );                          my $data = $result->property('data');
   
304                          dump_yaml( 'data', $data );                          dump_yaml( 'data', $data );
305                            # FIXME if we produce valid json we shouldn't need eval here!
306                            eval { $data = from_json( $data, {utf8 => 1} ); };
307                            if ( $@ ) {
308                                    warn "ERROR: $@ from ",dump( $data );
309                                    next;
310                            }
311    
312                          my $li_class = '';                          my $li_class = '';
313                          $li_class = qq| class="z"| if $nr % 2 == 0;                          $li_class = qq| class="z"| if $nr % 2 == 0;
Legend:
Removed from v.1241  
changed lines
  Added in v.1330
  ViewVC Help
Powered by ViewVC 1.1.26