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

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

revision 73 by dpavlin, Sat Jul 5 22:31:46 2003 UTC revision 111 by dpavlin, Tue Jul 15 12:48:49 2003 UTC
# Line 15  use lib '..'; Line 15  use lib '..';
15  use index_DBI;  use index_DBI;
16  use back2html;  use back2html;
17    
18  # configuration options  
19  # FIXME they really should go in configuration file!  # read global.conf configuration
20  my $TEMPLATE_PATH = '/data/webpac/template_html';  my $cfg_global = new Config::IniFiles( -file => '../global.conf' ) || die "can't open 'global.conf'";
21  my $CHARSET = 'ISO-8859-2';  
22  my $SWISH = '/usr/bin/swish-e';  # configuration options from global.conf
23  my $INDEX = '/data/webpac/index/isis.index';  my $TEMPLATE_PATH = $cfg_global->val('webpac', 'template_html') || die "need template_html in global.conf, section webpac";
24  my $MAX_HITS = 0;  my $CHARSET = $cfg_global->val('webpac', 'charset') || 'ISO-8859-1';
25  my $ON_PAGE = 10;  my $SWISH = $cfg_global->val('webpac', 'swish') || '/usr/bin/swish-e';
26    my $INDEX = $cfg_global->val('webpac', 'index') || die "need index in global.conf, section webpac";
27    my $MAX_HITS = $cfg_global->val('webpac', 'max_hits') || 0;
28    my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;
29    
30    
31  Text::Iconv->raise_error(0);     # Conversion errors raise exceptions  Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
32    
33  my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);  my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
34    
 # read global.conf configuration  
 my $cfg_global = new Config::IniFiles( -file => '../global.conf' ) || die "can't open 'global.conf'";  
   
35    
36  sub setup {  sub setup {
37          my $self = shift;          my $self = shift;
# Line 116  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 127  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 139  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 .= "\")";
# Line 151  sub show_results_list { Line 159  sub show_results_list {
159          $tmpl->param('hits',$hits);          $tmpl->param('hits',$hits);
160          $tmpl->param('search',$sw_q);          $tmpl->param('search',$sw_q);
161    
162          $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 1);          $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
163          $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 1);          $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
164    
165          # create a Pager object          # create a Pager object
166          my $pager = HTML::Pager->new(          my $pager = HTML::Pager->new(

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

  ViewVC Help
Powered by ViewVC 1.1.26