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

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

revision 639 by dpavlin, Wed Jan 19 22:34:31 2005 UTC revision 660 by dpavlin, Tue Feb 15 22:22:24 2005 UTC
# Line 12  use Text::Unaccent; Line 12  use Text::Unaccent;
12  use Data::Pageset;  use Data::Pageset;
13    
14  use lib '..';  use lib '..';
15  use index_DBI_cache;  use index_DBI_filter;
16  use back2html;  use back2html;
17    
18    
# Line 148  sub make_pager($$$) { Line 148  sub make_pager($$$) {
148    
149    
150          foreach my $p (@{$pager->pages_in_set()}) {          foreach my $p (@{$pager->pages_in_set()}) {
151                  next if ($p < 0);                  next if ($p <= 0);
152                  if($p == $pager->current_page()) {                  if($p == $pager->current_page()) {
153                          $pager_jump .= "<b>$p</b> ";                          $pager_jump .= "<b>$p</b> ";
154                  } else {                  } else {
# Line 345  sub show_results_list { Line 345  sub show_results_list {
345                  push @persist_vars, "sort";                  push @persist_vars, "sort";
346          }          }
347    
348            my $sortby = $q->param("sortby");
349            if ($sortby) {
350                    $sort = $sortby;
351                    push @persist_vars, "sortby";
352            }
353            $tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
354    
355          # construct swish query          # construct swish query
356          my $sw_q = join(" and ",@s_arr);          my $sw_q = join(" and ",@s_arr);
357          if (@path_arr && $q->param('show_full')) {          if (@path_arr && $q->param('show_full')) {
# Line 359  sub show_results_list { Line 366  sub show_results_list {
366                  $tmpl->param('full',0);                  $tmpl->param('full',0);
367          }          }
368    
369            my $swish_msg = ' ';
370    
371          # create new swish instance          # create new swish instance
372          my $swish = SWISH::API->new($INDEX);          my $swish = SWISH::API->new($INDEX);
373          die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;          $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
374    
375          # execute query and get number of results from SWISH-E          # execute query and get number of results from SWISH-E
376          my $search = $swish->New_Search_Object;          my $search = $swish->New_Search_Object;
# Line 369  sub show_results_list { Line 378  sub show_results_list {
378          $search->SetSort($sort);          $search->SetSort($sort);
379    
380          my $results = $search->Execute($sw_q);          my $results = $search->Execute($sw_q);
381          die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;          $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
382    
383          my $hits = $results->Hits;          my $hits = $results->Hits;
384    
385          $tmpl->param('hits',$hits);          $tmpl->param('hits',$hits);
386          $tmpl->param('search',$sw_q);          my $search_msg = $sw_q;
387            $search_msg .= '<em>'.$swish_msg.'</em>' if ($swish_msg);
388            $tmpl->param('search', $search_msg);
389    
390          $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);          $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
391          $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);          $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
# Line 438  sub show_index { Line 449  sub show_index {
449          my $field = $q->param("f$i");          my $field = $q->param("f$i");
450          my $limit = $q->param("v$i");          my $limit = $q->param("v$i");
451    
452            my $filter = $q->param("filter");
453    
454          my $html;          my $html;
455    
456          my $index = new index_DBI(          my $index = new index_DBI(
# Line 447  sub show_index { Line 460  sub show_index {
460                  $cfg_global->val('global', 'dbi_passwd') || ''                  $cfg_global->val('global', 'dbi_passwd') || ''
461          );          );
462    
463          my $total = $index->count($field,$limit);          my $total = $index->count($field,$limit,$filter);
464    
465          if (! $total) {          if (! defined($total)) {
466                  my $tmpl = $self->load_tmpl(url_ex($q,'no_index.html'));                  my $tmpl = $self->load_tmpl(url_ex($q,'no_index.html'));
467                  $tmpl->param('field',$field);                  $tmpl->param('field',$field);
468                  $html = $tmpl->output;                  $html = $tmpl->output;
# Line 482  sub show_index { Line 495  sub show_index {
495          make_pager($q, $tmpl, $pager);          make_pager($q, $tmpl, $pager);
496          make_pager_vars($q, $tmpl, @persist_vars);          make_pager_vars($q, $tmpl, @persist_vars);
497    
498          my @pager_data_list = $index->fetch($field,$limit, $pager->first - 1, $pager->entries_on_this_page);          my @pager_data_list = $index->fetch($field,$limit, $pager->first - 1, $pager->entries_on_this_page, $filter);
499          $tmpl->param('PAGER_DATA_LIST', \@pager_data_list);          $tmpl->param('PAGER_DATA_LIST', \@pager_data_list);
500    
501          return in_template($q,$tmpl->output);          return in_template($q,$tmpl->output);

Legend:
Removed from v.639  
changed lines
  Added in v.660

  ViewVC Help
Powered by ViewVC 1.1.26