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

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

revision 76 by dpavlin, Sat Jul 5 23:07:47 2003 UTC revision 111 by dpavlin, Tue Jul 15 12:48:49 2003 UTC
# Line 117  sub show_results_list { Line 117  sub show_results_list {
117    
118          my $tmpl = $self->load_tmpl('results.html');          my $tmpl = $self->load_tmpl('results.html');
119    
120            sub esc_html {
121                    my $html = shift;
122                    $html =~ s/</&lt;/g;
123                    $html =~ s/>/&gt;/g;
124                    return $html;
125            }
126    
127          # call swish          # call swish
128          my $sh = SWISH->connect('Fork',          my $sh = SWISH->connect('Fork',
129                  prog     => $SWISH,                  prog     => $SWISH,
# Line 128  sub show_results_list { Line 135  sub show_results_list {
135                          push @swish_results, {                          push @swish_results, {
136                                  nr => ($#swish_results + 2),                                  nr => ($#swish_results + 2),
137                                  path => $hit->swishdocpath,                                  path => $hit->swishdocpath,
138                                  headline => $from_utf8->convert($hit->headline),                                  headline => esc_html($from_utf8->convert($hit->headline)),
139                                  html => back2html($from_utf8->convert($hit->html)),                                  html => back2html($from_utf8->convert($hit->html)),
140                                  rank => $hit->swishrank };                                  rank => $hit->swishrank };
141    
# Line 140  sub show_results_list { Line 147  sub show_results_list {
147          die $SWISH::errstr unless $sh;          die $SWISH::errstr unless $sh;
148          # construct swish query          # construct swish query
149          my $sw_q = join(" and ",@s_arr);          my $sw_q = join(" and ",@s_arr);
150          if (@path_arr) {          if (@path_arr && $q->param('show_full')) {
151                  $sw_q .= "and (swishdocpath=\"";                  $sw_q .= "and (swishdocpath=\"";
152                  $sw_q .= join("\" or swishdocpath=\"",@path_arr);                  $sw_q .= join("\" or swishdocpath=\"",@path_arr);
153                  $sw_q .= "\")";                  $sw_q .= "\")";

Legend:
Removed from v.76  
changed lines
  Added in v.111

  ViewVC Help
Powered by ViewVC 1.1.26