[Koha-cvs] CVS: koha/opac opac-detail.pl,1.10,1.11 opac-main.pl,1.10,1.11 opac-search.pl,1.10,1.11

[Paul POULAIN]

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2695/opac

Modified Files:
        opac-detail.pl opac-main.pl opac-search.pl 
Log Message:
Marc search ported to OPAC.
seems to work fine

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-detail.pl      8 Jan 2004 18:23:49 -0000       1.10
--- opac-detail.pl      10 May 2004 09:24:14 -0000      1.11
***************
*** 54,58 ****
  $template->param(WEB_RESULTS => $webarray);
  $template->param(SITE_RESULTS => $sitearray,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
  );
  
--- 54,57 ----

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-main.pl        15 Mar 2004 15:02:19 -0000      1.10
--- opac-main.pl        10 May 2004 09:24:14 -0000      1.11
***************
*** 36,40 ****
  
  $template->param(CGIitemtype => $CGIitemtype,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;
--- 36,39 ----

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-search.pl      8 Jan 2004 18:26:53 -0000       1.10
--- opac-search.pl      10 May 2004 09:24:14 -0000      1.11
***************
*** 9,12 ****
--- 9,15 ----
  use C4::Database;
  use HTML::Template;
+ use C4::SearchMarc;
+ use C4::Catalogue;
+ use C4::Biblio;
  
  my $classlist='';
***************
*** 21,37 ****
  
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie)
!     = get_template_and_user({template_name => "opac-search.tmpl",
!                            query => $query,
!                            type => "opac",
!                            authnotrequired => 1,
!                            flagsrequired => {borrow => 1},
!                        });
! 
! 
! $template->param(classlist => $classlist,
!                            LibraryName => 
C4::Context->preference("LibraryName"),
! );
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 24,184 ----
  
  my $query = new CGI;
+ my $op = $query->param("op");
+ my $type=$query->param('type');
  
! my $startfrom=$query->param('startfrom');
! $startfrom=0 if(!defined $startfrom);
! my ($template, $loggedinuser, $cookie);
! my $resultsperpage;
! 
! if ($op eq "do_search") {
!       my @marclist = $query->param('marclist');
!       my @and_or = $query->param('and_or');
!       my @excluding = $query->param('excluding');
!       my @operator = $query->param('operator');
!       my @value = $query->param('value');
! 
!       $resultsperpage= $query->param('resultsperpage');
!       $resultsperpage = 19 if(!defined $resultsperpage);
!       my $orderby = $query->param('orderby');
! 
!       # builds tag and subfield arrays
!       my @tags;
! 
!       foreach my $marc (@marclist) {
!               if ($marc) {
!                       my ($tag,$subfield) = 
MARCfind_marc_from_kohafield($dbh,$marc);
!                       if ($tag) {
!                               push @tags,$dbh->quote("$tag$subfield");
!                       } else {
!                               push @tags, $dbh->quote(substr($marc,0,4));
!                       }
!               } else {
!                       push @tags, "";
!               }
!       }
!       findseealso($dbh,address@hidden);
!       warn "IN THERE";
!       my ($results,$total) = catalogsearch($dbh, 
address@hidden,address@hidden,
!                                                                               
address@hidden, address@hidden, address@hidden,
!                                                                               
$startfrom*$resultsperpage, $resultsperpage,$orderby);
! 
!       ($template, $loggedinuser, $cookie)
!               = get_template_and_user({template_name => 
"opac-searchresults.tmpl",
!                               query => $query,
!                               type => 'opac',
!                               authnotrequired => 1,
!                               debug => 1,
!                               });
! 
!       # multi page display gestion
!       my $displaynext=0;
!       my $displayprev=$startfrom;
!       if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
!               $displaynext = 1;
!       }
! 
!       my @field_data = ();
! 
! 
!       for(my $i = 0 ; $i <= $#marclist ; $i++)
!       {
!               push @field_data, { term => "marclist", val=>$marclist[$i] };
!               push @field_data, { term => "and_or", val=>$and_or[$i] };
!               push @field_data, { term => "excluding", val=>$excluding[$i] };
!               push @field_data, { term => "operator", val=>$operator[$i] };
!               push @field_data, { term => "value", val=>$value[$i] };
!       }
! 
!       my @numbers = ();
! 
!       if ($total>$resultsperpage)
!       {
!               for (my $i=1; $i<$total/$resultsperpage+1; $i++)
!               {
!                       if ($i<16)
!                       {
!                       my $highlight=0;
!                       ($startfrom==($i-1)) && ($highlight=1);
!                       push @numbers, { number => $i,
!                                       highlight => $highlight ,
!                                       searchdata=> address@hidden,
!                                       startfrom => ($i-1)};
!                       }
!       }
!       }
! 
!       my $from = $startfrom*$resultsperpage+1;
!       my $to;
! 
!       if($total < (($startfrom+1)*$resultsperpage))
!       {
!               $to = $total;
!       } else {
!               $to = (($startfrom+1)*$resultsperpage);
!       }
!       $template->param(results => $results,
!                                                       startfrom=> $startfrom,
!                                                       displaynext=> 
$displaynext,
!                                                       displayprev=> 
$displayprev,
!                                                       resultsperpage => 
$resultsperpage,
!                                                       startfromnext => 
$startfrom+1,
!                                                       startfromprev => 
$startfrom-1,
!                                                       
searchdata=>address@hidden,
!                                                       total=>$total,
!                                                       from=>$from,
!                                                       to=>$to,
!                                                       numbers=>address@hidden,
!                                                       );
! 
! } else {
!       ($template, $loggedinuser, $cookie)
!               = get_template_and_user({template_name => "opac-search.tmpl",
!                                       query => $query,
!                                       type => "opac",
!                                       authnotrequired => 1,
!                               });
!       
!       
!       $sth=$dbh->prepare("Select itemtype,description from itemtypes order by 
description");
!       $sth->execute;
!       my  @itemtype;
!       my %itemtypes;
!       push @itemtype, "";
!       $itemtypes{''} = "";
!       while (my ($value,$lib) = $sth->fetchrow_array) {
!               push @itemtype, $value;
!               $itemtypes{$value}=$lib;
!       }
!       
!       my $CGIitemtype=CGI::scrolling_list( -name     => 'value',
!                               -values   => address@hidden,
!                               -labels   => \%itemtypes,
!                               -size     => 1,
!                               -multiple => 0 );
!       $sth->finish;
!       
!       my @branches;
!       my @select_branch;
!       my %select_branches;
!       my ($count2,@branches)=branches();
!       push @select_branch, "";
!       $select_branches{''} = "";
!       for (my $i=0;$i<$count2;$i++){
!               push @select_branch, $branches[$i]->{'branchcode'};#
!               $select_branches{$branches[$i]->{'branchcode'}} = 
$branches[$i]->{'branchname'};
!       }
!       my $CGIbranch=CGI::scrolling_list( -name     => 'value',
!                               -values   => address@hidden,
!                               -labels   => \%select_branches,
!                               -size     => 1,
!                               -multiple => 0 );
!       $sth->finish;
!       
!       $template->param(classlist => $classlist,
!                                       CGIitemtype => $CGIitemtype,
!                                       CGIbranch => $CGIbranch,
!       );
! }
  
  output_html_with_http_headers $query, $cookie, $template->output;