/[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 670 by dpavlin, Wed Feb 16 00:26:37 2005 UTC
# Line 328  sub show_results_list { Line 328  sub show_results_list {
328                  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).")";
329          }          }
330    
331          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);
332    
333          $tmpl->param('url_params',"?".join("&",@url_params));          $tmpl->param('url_params',"?".join("&",@url_params));
334    
# Line 344  sub show_results_list { Line 344  sub show_results_list {
344                  $sort = 'headline';                  $sort = 'headline';
345                  push @persist_vars, "sort";                  push @persist_vars, "sort";
346          }          }
347          if ($q->param("sortby")) {  
348                  $sort = $q->param("sortby");          my $sortby = $q->param("sortby");
349                  push @persist_vars, "sort";          if ($sortby) {
350                    $sort = $sortby;
351                    push @persist_vars, "sortby";
352          }          }
353            $tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
354    
355          # construct swish query          # construct swish query
356          my $sw_q = join(" and ",@s_arr);          my $sw_q = join(" and ",@s_arr);
# Line 373  sub show_results_list { Line 376  sub show_results_list {
376          my $search = $swish->New_Search_Object;          my $search = $swish->New_Search_Object;
377    
378          $search->SetSort($sort);          $search->SetSort($sort);
 print "sort: $sort\n";  
379    
380          my $results = $search->Execute($sw_q);          my $results = $search->Execute($sw_q);
381          $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;          $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
# Line 467  sub show_index { Line 469  sub show_index {
469                  return $html;                  return $html;
470          }          }
471    
472          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);
473          $tmpl->param('field',$field);          $tmpl->param('field',$field);
474          $tmpl->param('limit',$limit);          $tmpl->param('limit',$limit);
475          $tmpl->param('total',$total);          $tmpl->param('total',$total);
Legend:
Removed from v.659  
changed lines
  Added in v.670
  ViewVC Help
Powered by ViewVC 1.1.26