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

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

revision 703 by dpavlin, Sun Mar 13 02:03:30 2005 UTC revision 704 by dpavlin, Sat Apr 30 15:48:40 2005 UTC
# Line 337  sub show_results_list { Line 337  sub show_results_list {
337                                  }                                  }
338                          }                          }
339                          $s =~ s/\*+/*/g;                          $s =~ s/\*+/*/g;
340                            $s =~ s/[()]//g;        # () are used in query language
341                          $s = $pre.$s.$post if ($q->param("e$i"));                          $s = $pre.$s.$post if ($q->param("e$i"));
342                          push @swish_q,$s;                          push @swish_q,$s;
343                  }                  }
# Line 347  sub show_results_list { Line 348  sub show_results_list {
348    
349          my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1, die_on_bad_params => 0);          my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1, die_on_bad_params => 0);
350    
         $tmpl->param('url_params',"?".join("&",@url_params));  
   
351          sub esc_html {          sub esc_html {
352                  my $html = shift;                  my $html = shift;
353                  $html =~ s/</&lt;/g;                  $html =~ s/</&lt;/g;
# Line 367  sub show_results_list { Line 366  sub show_results_list {
366                  $sort = $sortby;                  $sort = $sortby;
367                  push @persist_vars, "sortby";                  push @persist_vars, "sortby";
368          }          }
369          $tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));          # used to filter entries in index and swish
370            my $filter = $q->param("filter");
371    
372          # construct swish query          # construct swish query
373          my $sw_q = join(" and ",@s_arr);          my $sw_q = join(" and ",@s_arr);
374          if (@path_arr && $q->param('show_full')) {          if (@path_arr && $q->param('show_full')) {
375                  $sw_q .= "and (swishdocpath=\"";                  $sw_q .= " and (swishdocpath=\"";
376                  $sw_q .= join("\" or swishdocpath=\"",@path_arr);                  $sw_q .= join("\" or swishdocpath=\"",@path_arr);
377                  $sw_q .= "\")";                  $sw_q .= "\")";
378                  $tmpl->param('full',1); # show full records                  $tmpl->param('full',1); # show full records
379    #       } elsif (@path_arr && $#path_arr == 0) {
380    #               # I will assume that it's a filter since there isn't show_full
381    #               $filter = shift @path_arr;
382          } elsif ($q->param('show_full')) {          } elsif ($q->param('show_full')) {
383                  # just show full path, no path defined                  # just show full path, no path defined
384                  $tmpl->param('full',1);                  $tmpl->param('full',1);
# Line 383  sub show_results_list { Line 386  sub show_results_list {
386                  $tmpl->param('full',0);                  $tmpl->param('full',0);
387          }          }
388    
389            if ($filter) {
390                    $sw_q .= " and (swishdocpath=\"$filter\")" unless (@path_arr);
391                    push @persist_vars, "filter";
392                    push @url_params, "filter=$filter";
393                    push @url_params_persist, "filter=$filter";
394            }
395    
396          my $swish_msg = ' ';          my $swish_msg = ' ';
397    
398          # create new swish instance          # create new swish instance
# Line 407  sub show_results_list { Line 417  sub show_results_list {
417          $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);          $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
418          $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);          $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
419    
420            # URL parametars for search results
421            $tmpl->param('url_params',"?".join("&",@url_params));
422            $tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
423    
424    
425    
426          #          #
427          # build pager          # build pager
428          #          #

Legend:
Removed from v.703  
changed lines
  Added in v.704

  ViewVC Help
Powered by ViewVC 1.1.26