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

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

revision 307 by dpavlin, Sat Apr 17 20:57:48 2004 UTC revision 601 by dpavlin, Wed Dec 8 18:45:32 2004 UTC
# Line 28  my $MAX_HITS = $cfg_global->val('webpac' Line 28  my $MAX_HITS = $cfg_global->val('webpac'
28  my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;  my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;
29  my $MIN_WILDCARD =$cfg_global->val('webpac', 'min_wildcard') || 1;  my $MIN_WILDCARD =$cfg_global->val('webpac', 'min_wildcard') || 1;
30  my $TEMPLATE =$cfg_global->val('webpac', 'template');  my $TEMPLATE =$cfg_global->val('webpac', 'template');
31  my $UNAC_FILTER =$cfg_global->val('global', 'unac_filter');  my $UNAC_FILTER =$cfg_global->val('global', 'my_unac_filter');
32  my $BASE_PATH =$cfg_global->val('webpac', 'base_path');  my $BASE_PATH =$cfg_global->val('webpac', 'base_path');
33  # for pager  # for pager
34  my $pages_per_set = $cfg_global->val('webpac', 'pages_per_set') || 10;  my $pages_per_set = $cfg_global->val('webpac', 'pages_per_set') || 10;
35    
36    Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
37    
38    my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
39    
40  if ($UNAC_FILTER) {  if ($UNAC_FILTER) {
41          require $UNAC_FILTER;          require $UNAC_FILTER;
42    } else {
43            sub WebPac::my_unac_string {
44                    my ($charset, $string) = (@_);
45                    return $string;
46            }
47  }  }
48    
 Text::Iconv->raise_error(0);     # Conversion errors raise exceptions  
   
 my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);  
   
49  # use path from cgi script to support templates in subdirs  # use path from cgi script to support templates in subdirs
50  sub url_ex {  sub url_ex {
51          my $q = shift || die "suff2file needs CGI object!";          my $q = shift || die "suff2file needs CGI object!";
# Line 179  sub make_pager_vars { Line 183  sub make_pager_vars {
183          my @persist_vars = @_;          my @persist_vars = @_;
184          my $hidden_vars = '';          my $hidden_vars = '';
185          foreach my $v (@persist_vars) {          foreach my $v (@persist_vars) {
186                  $hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$q->param($v).'"/>'."\n";                  foreach my $val ($q->param($v)) {
187                            $hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
188                    }
189          }          }
190    
191          $tmpl->param('PAGER_HIDDEN', $hidden_vars);          $tmpl->param('PAGER_HIDDEN', $hidden_vars);
# Line 255  sub show_results_list { Line 261  sub show_results_list {
261                  while (my $search = shift @param_vals) {                  while (my $search = shift @param_vals) {
262                          my $s;                          my $s;
263                          # remove accents                          # remove accents
264                          $search = unac_string($CHARSET,$search);                          $search = my_unac_string($CHARSET,$search);
265                          while ($search =~ s/\s*("[^"]+")\s*/ /) {                          while ($search =~ s/\s*("[^"]+")\s*/ /) {
266                                  $s .= "$1 ";                                  $s .= "$1 ";
267                          }                          }
# Line 318  sub show_results_list { Line 324  sub show_results_list {
324    
325          # construct swish query          # construct swish query
326          my $sw_q = join(" and ",@s_arr);          my $sw_q = join(" and ",@s_arr);
327          if (@path_arr && $q->param('show_full')) {          if (@path_arr) {
328                  $sw_q .= "and (swishdocpath=\"";                  $sw_q .= "and (swishdocpath=\"";
329                  $sw_q .= join("\" or swishdocpath=\"",@path_arr);                  $sw_q .= join("\" or swishdocpath=\"",@path_arr);
330                  $sw_q .= "\")";                  $sw_q .= "\")";
331                  $tmpl->param('full',1); # show full records          }
332          } elsif ($q->param('show_full')) {  
333            if ($q->param('show_full')) {
334                  # just show full path, no path defined                  # just show full path, no path defined
335                  $tmpl->param('full',1);                  $tmpl->param('full',1);
336          } else {          } else {
Legend:
Removed from v.307  
changed lines
  Added in v.601
  ViewVC Help
Powered by ViewVC 1.1.26