[Koha-devel] CVS: koha search.pl,1.4,1.5

[Chris Cormack]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv31173

Modified Files:
	search.pl 
Log Message:
Removing reference to the FrontSearch subroutine as its never called


Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** search.pl	5 Oct 2001 20:13:20 -0000	1.4
--- search.pl	13 Mar 2002 07:46:43 -0000	1.5
***************
*** 1,8 ****
  #!/usr/bin/perl
  #script to provide intranet (librarian) advanced search facility
- #modified 9/11/1999 by chris at katipo.co.nz
- #adding an extra comment to play with CVS (Si, 19/11/99)
- #modified 29/12/99 by chris at katipo.co.nz to be usavle by opac as well
- #modified by chris 10/11/00 to fix dewey search
  
  use strict;
--- 1,4 ----
***************
*** 32,36 ****
  }       
  
! #print $input->dump;
  my $blah;
  my %search;
--- 28,32 ----
  }       
  
! #print $input->Dump;
  my $blah;
  my %search;
***************
*** 58,61 ****
--- 54,59 ----
  my $dewey=validate($input->param('dewey'));
  $search{'dewey'}=$dewey;
+ my $branch=validate($input->param('branch'));
+ $search{'branch'}=$branch;
  my @results;
  my $offset=$input->param('offset');
***************
*** 69,75 ****
  print startpage();
  print startmenu($type);
  #print $search{'ttype'};
! if ($type ne 'opac'){
    print mkheadr(1,'Catalogue Search Results');
  } else {
    print mkheadr(1,'Opac Search Results');
--- 67,76 ----
  print startpage();
  print startmenu($type);
+ #print $type;
  #print $search{'ttype'};
! if ($type eq 'intra'){
    print mkheadr(1,'Catalogue Search Results');
+ } elsif ($type eq 'catmain'){
+   print mkheadr(1,'Catalogue Maintenance');
  } else {
    print mkheadr(1,'Opac Search Results');
***************
*** 85,96 ****
    } else {
      if ($keyword ne ''){
- #      print "hey";
        ($count, at results)=&KeywordSearch(\$blah,'intra',\%search,$num,$offset);
-     } elsif ($search{'front'} ne '') {
-     ($count, at results)&FrontSearch(\$blah,'intra',\%search,$num,$offset);
- #    print "hey";
      }elsif ($title ne '' || $author ne '' || $illustrator ne '' || $dewey ne '' || $class ne '') {
        ($count, at results)=&CatSearch(\$blah,'loose',\%search,$num,$offset);
- #            print "hey";
      }
    }
--- 86,92 ----