/[webpac]/trunk/WebPac.pm
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/WebPac.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 659 by dpavlin, Tue Feb 15 21:48:16 2005 UTC revision 676 by dpavlin, Mon Feb 21 22:47:48 2005 UTC
# Line 182  sub make_pager_vars { Line 182  sub make_pager_vars {
182          my $tmpl = shift @_;          my $tmpl = shift @_;
183          my @persist_vars = @_;          my @persist_vars = @_;
184          my $hidden_vars = '';          my $hidden_vars = '';
185            my $hidden_search = '';
186          foreach my $v (@persist_vars) {          foreach my $v (@persist_vars) {
187                  foreach my $val ($q->param($v)) {                  foreach my $val ($q->param($v)) {
188                          next if (! $val || $val eq '');                          next if (! $val || $val eq '');
189                          $hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";                          $hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
190                            $hidden_search .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n" if ($v ne "rm");
191                  }                  }
192          }          }
193    
194          $tmpl->param('PAGER_HIDDEN', $hidden_vars);          $tmpl->param('PAGER_HIDDEN', $hidden_vars);
195            $tmpl->param('SEARCH_HIDDEN', $hidden_search);
196          $tmpl->param('PAGER_JAVASCRIPT', qq#          $tmpl->param('PAGER_JAVASCRIPT', qq#
197  <SCRIPT LANGUAGE="Javascript">  <SCRIPT LANGUAGE="Javascript">
198  <!-- Begin  <!-- Begin
# Line 224  sub show_results_list { Line 227  sub show_results_list {
227    
228          my $q = $self->query();          my $q = $self->query();
229    
230            # submit was reset?
231            if ($q->param('reset')) {
232                    $q->delete_all;
233                    return $self->show_search_form();
234            }
235    
236          # load template for this page          # load template for this page
237    
238          my @s_arr;      # all queries are located here          my @s_arr;      # all queries are located here
# Line 328  sub show_results_list { Line 337  sub show_results_list {
337                  push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";                  push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";
338          }          }
339    
340          my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1);          my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1, die_on_bad_params => 0);
341    
342          $tmpl->param('url_params',"?".join("&",@url_params));          $tmpl->param('url_params',"?".join("&",@url_params));
343    
# Line 344  sub show_results_list { Line 353  sub show_results_list {
353                  $sort = 'headline';                  $sort = 'headline';
354                  push @persist_vars, "sort";                  push @persist_vars, "sort";
355          }          }
356          if ($q->param("sortby")) {  
357                  $sort = $q->param("sortby");          my $sortby = $q->param("sortby");
358                  push @persist_vars, "sort";          if ($sortby) {
359                    $sort = $sortby;
360                    push @persist_vars, "sortby";
361          }          }
362            $tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
363    
364          # construct swish query          # construct swish query
365          my $sw_q = join(" and ",@s_arr);          my $sw_q = join(" and ",@s_arr);
# Line 373  sub show_results_list { Line 385  sub show_results_list {
385          my $search = $swish->New_Search_Object;          my $search = $swish->New_Search_Object;
386    
387          $search->SetSort($sort);          $search->SetSort($sort);
 print "sort: $sort\n";  
388    
389          my $results = $search->Execute($sw_q);          my $results = $search->Execute($sw_q);
390          $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;          $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
# Line 467  sub show_index { Line 478  sub show_index {
478                  return $html;                  return $html;
479          }          }
480    
481          my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1);          my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1, die_on_bad_params => 0);
482          $tmpl->param('field',$field);          $tmpl->param('field',$field);
483          $tmpl->param('limit',$limit);          $tmpl->param('limit',$limit);
484          $tmpl->param('total',$total);          $tmpl->param('total',$total);

Legend:
Removed from v.659  
changed lines
  Added in v.676

  ViewVC Help
Powered by ViewVC 1.1.26