[Koha-cvs] CVS: koha/C4 Search.pm,1.18.2.4,1.18.2.5

[Paul POULAIN]

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

Modified Files:
      Tag: rel-1-2
	Search.pm 
Log Message:
merging 1.2 and main. Only cosmetic


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -C2 -r1.18.2.4 -r1.18.2.5
*** Search.pm	26 Jun 2002 18:18:23 -0000	1.18.2.4
--- Search.pm	28 Jun 2002 08:38:48 -0000	1.18.2.5
***************
*** 11,15 ****
    
  # set the version for version checking
! $VERSION = 0.01;
      
  @ISA = qw(Exporter);
--- 11,15 ----
    
  # set the version for version checking
! $VERSION = 0.02;
      
  @ISA = qw(Exporter);
***************
*** 531,539 ****
  	     and biblioitems.dewey like '$search->{'dewey'}%'";
  	  } elsif ($search->{'illustrator'} ne '') {
- 	  if ($search->{'illustrator'} ne ''){
  	     $query="select * from biblioitems,biblio 
  	     where biblio.biblionumber=biblioitems.biblionumber
  	     and biblioitems.illus like '%".$search->{'illustrator'}."%'";
- 	  }
  	}
            $query .=" group by biblio.biblionumber";	 
--- 531,537 ----
***************
*** 573,577 ****
          my $query1 = "select * from biblioitems where isbn='$search2'";
  	my $sth1=$dbh->prepare($query1);
! #	print $query1;
  	$sth1->execute;
          my $i2=0;
--- 571,575 ----
          my $query1 = "select * from biblioitems where isbn='$search2'";
  	my $sth1=$dbh->prepare($query1);
! #	print STDERR "$query1\n";
  	$sth1->execute;
          my $i2=0;
***************
*** 606,610 ****
    }
  }
! #print $query;
  my $sth=$dbh->prepare($query);
  $sth->execute;
--- 604,608 ----
    }
  }
! #print STDERR "$query\n";
  my $sth=$dbh->prepare($query);
  $sth->execute;