77 |
my @path_arr = $q->param('path'); |
my @path_arr = $q->param('path'); |
78 |
my $full = $q->param('full'); |
my $full = $q->param('full'); |
79 |
|
|
80 |
|
my @persist_vars = ( 'rm' ); |
81 |
|
|
82 |
for(my $i = 1; $i <=30; $i++) { |
for(my $i = 1; $i <=30; $i++) { |
83 |
|
|
84 |
return show_index($self, $i) if ($q->param("f".$i."_index")); |
return show_index($self, $i) if ($q->param("f".$i."_index")); |
85 |
|
|
86 |
next if (! $q->param("v$i")); |
next if (! $q->param("v$i")); |
87 |
next if (! $q->param("f$i")); |
next if (! $q->param("f$i")); |
88 |
|
|
89 |
|
push @persist_vars, "f$i"; |
90 |
|
push @persist_vars, "v$i"; |
91 |
|
|
92 |
# re-write query from +/- to and/and not |
# re-write query from +/- to and/and not |
93 |
my @param_vals = $q->param("v$i"); |
my @param_vals = $q->param("v$i"); |
94 |
my @swish_q; |
my @swish_q; |
123 |
|
|
124 |
my $tmpl = $self->load_tmpl('results.html'); |
my $tmpl = $self->load_tmpl('results.html'); |
125 |
|
|
126 |
|
sub esc_html { |
127 |
|
my $html = shift; |
128 |
|
$html =~ s/</</g; |
129 |
|
$html =~ s/>/>/g; |
130 |
|
return $html; |
131 |
|
} |
132 |
|
|
133 |
# call swish |
# call swish |
134 |
my $sh = SWISH->connect('Fork', |
my $sh = SWISH->connect('Fork', |
135 |
prog => $SWISH, |
prog => $SWISH, |
141 |
push @swish_results, { |
push @swish_results, { |
142 |
nr => ($#swish_results + 2), |
nr => ($#swish_results + 2), |
143 |
path => $hit->swishdocpath, |
path => $hit->swishdocpath, |
144 |
headline => $from_utf8->convert($hit->headline), |
headline => esc_html($from_utf8->convert($hit->headline)), |
145 |
html => back2html($from_utf8->convert($hit->html)), |
html => back2html($from_utf8->convert($hit->html)), |
146 |
rank => $hit->swishrank }; |
rank => $hit->swishrank }; |
147 |
|
|
153 |
die $SWISH::errstr unless $sh; |
die $SWISH::errstr unless $sh; |
154 |
# construct swish query |
# construct swish query |
155 |
my $sw_q = join(" and ",@s_arr); |
my $sw_q = join(" and ",@s_arr); |
156 |
if (@path_arr) { |
if (@path_arr && $q->param('show_full')) { |
157 |
$sw_q .= "and (swishdocpath=\""; |
$sw_q .= "and (swishdocpath=\""; |
158 |
$sw_q .= join("\" or swishdocpath=\"",@path_arr); |
$sw_q .= join("\" or swishdocpath=\"",@path_arr); |
159 |
$sw_q .= "\")"; |
$sw_q .= "\")"; |
177 |
|
|
178 |
my @result; |
my @result; |
179 |
for (my $i=0; $i<$rows; $i++) { |
for (my $i=0; $i<$rows; $i++) { |
180 |
push @result, $swish_results[$offset+$i] if $swish_results[$offset+$i]; |
my $r = $swish_results[$offset+$i]; |
181 |
|
if ($r && $q->param('show_full')) { |
182 |
|
push @result, $r; |
183 |
|
} elsif ($r) { |
184 |
|
# if not full output, skip html |
185 |
|
delete $r->{html}; |
186 |
|
push @result, $r; |
187 |
|
} |
188 |
} |
} |
189 |
return \@result; |
return \@result; |
190 |
}, |
}, |
191 |
rows => $hits, |
rows => $hits, |
192 |
page_size => $ON_PAGE, |
page_size => $ON_PAGE, |
193 |
# some optional parameters |
# some optional parameters |
194 |
persist_vars => [ |
persist_vars => [ @persist_vars ], |
|
'rm', |
|
|
'f1', 'v1', |
|
|
'f2', 'v2', |
|
|
'f3', 'v3', |
|
|
'f4', 'v4', |
|
|
'f5', 'v5', |
|
|
'f6', 'v6', |
|
|
'f7', 'v7', |
|
|
'f8', 'v8', |
|
|
'f9', 'v9', |
|
|
], |
|
195 |
#cell_space_color => '#000000', |
#cell_space_color => '#000000', |
196 |
#cell_background_color => '#ffffff', |
#cell_background_color => '#ffffff', |
197 |
#nav_background_color => '#dddddd', |
#nav_background_color => '#dddddd', |