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

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

revision 710 by dpavlin, Sun Sep 11 18:45:50 2005 UTC revision 790 by dpavlin, Sun Jan 22 18:46:24 2012 UTC
# Line 63  sub suff2file($$$$) { Line 63  sub suff2file($$$$) {
63    
64          return $tpl if (! $base_path);          return $tpl if (! $base_path);
65    
66            #warn "base_path: $base_path, p: $p, path: $path, tpl: $tpl\n";
67    
68            $p =~ s#/[^/]*$##;
69    
70          # strip everything to and including base path, leaving only          # strip everything to and including base path, leaving only
71          # additional (virtual) path          # additional (virtual) path
72          if ($base_path eq "/") {          if ($base_path eq "/") {
# Line 282  sub show_results_list { Line 286  sub show_results_list {
286                  $url_params->{"f$i"} = $q->url_param("f$i");                  $url_params->{"f$i"} = $q->url_param("f$i");
287                  $url_params_persist->{"f$i"} = $q->url_param("f$i") if ($persist);                  $url_params_persist->{"f$i"} = $q->url_param("f$i") if ($persist);
288    
289                    my @v;
290    
291                  foreach my $v ($q->url_param("v$i")) {                  foreach my $v ($q->url_param("v$i")) {
292                          # escape quotes so that phrase search work                          # escape quotes so that phrase search work
293                          $v =~ s/"/%22/g;                          $v =~ s/"/%22/g;
294                          $url_params->{"v$i"} = $v;                          push @v, $v;
                         $url_params_persist->{"v$i"} = $v if ($persist);  
295                  }                  }
296                    $url_params->{"v$i"} = \@v;
297                    $url_params_persist->{"v$i"} = \@v if ($persist);
298    
299                  if ($q->param("e$i")) {                  if ($q->param("e$i")) {
300                          $url_params->{"e$i"} = $q->url_param("e$i");                          $url_params->{"e$i"} = $q->url_param("e$i");
# Line 414  sub show_results_list { Line 421  sub show_results_list {
421          my $hits = $results->Hits;          my $hits = $results->Hits;
422    
423          $tmpl->param('hits',$hits);          $tmpl->param('hits',$hits);
424            $tmpl->param('hits_gt_2',$hits > 2);
425          my $search_msg = $sw_q;          my $search_msg = $sw_q;
426          $search_msg .= '<em>'.$swish_msg.'</em>' if ($swish_msg);          $search_msg .= '<em>'.$swish_msg.'</em>' if ($swish_msg);
427          $tmpl->param('search', $search_msg);          $tmpl->param('search', $search_msg);
# Line 424  sub show_results_list { Line 432  sub show_results_list {
432          # URL parametars for search results          # URL parametars for search results
433          sub cook_url_params {          sub cook_url_params {
434                  my $hash = shift || return;                  my $hash = shift || return;
435                  return join("&", map { $_."=".$hash->{$_} } keys %{$hash});                  return join("&", map {
436                            my $var = $_;
437                            if (ref($hash->{$var}) eq 'ARRAY') {
438                                    join('&',
439                                            map { $var.'='.$_ } @{$hash->{$var}}
440                                    );
441                            } else {
442                                    $var."=".$hash->{$var};
443                            }
444                    } keys %{$hash});
445          }          }
446    
447          $tmpl->param('url_params',"?".cook_url_params($url_params));          $tmpl->param('url_params',"?".cook_url_params($url_params));
Legend:
Removed from v.710  
changed lines
  Added in v.790
  ViewVC Help
Powered by ViewVC 1.1.26