[Koha-cvs] CVS: koha/C4 Biblio.pm,1.48,1.49 Search.pm,1.68,1.69

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv16203/C4

Modified Files:
	Biblio.pm Search.pm 
Log Message:
improvments/fixes for z3950 support.
* Works now even on ADD, not only on MODIFY
* able to search on ISBN, author, title

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** Biblio.pm	16 Jun 2003 09:22:53 -0000	1.48
--- Biblio.pm	17 Jun 2003 11:21:13 -0000	1.49
***************
*** 2,5 ****
--- 2,10 ----
  # $Id$
  # $Log$
+ # Revision 1.49  2003/06/17 11:21:13  tipaul
+ # improvments/fixes for z3950 support.
+ # * Works now even on ADD, not only on MODIFY
+ # * able to search on ISBN, author, title
+ #
  # Revision 1.48  2003/06/16 09:22:53  rangi
  # Just added an order clause to getitemtypes
***************
*** 479,483 ****
  	}
  
! 	$sth=$dbh->prepare("select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,thesaurus_category,value_builder from marc_subfield_structure order by tagfield,tagsubfield");
  	$sth->execute;
  
--- 484,488 ----
  	}
  
! 	$sth=$dbh->prepare("select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,thesaurus_category,value_builder,kohafield from marc_subfield_structure order by tagfield,tagsubfield");
  	$sth->execute;
  
***************
*** 486,490 ****
  	my $thesaurus_category;
  	my $value_builder;
! 	while ( ($tag, $subfield, $lib, $tab, $mandatory, $repeatable,$authorised_value,$thesaurus_category,$value_builder) = $sth->fetchrow) {
  		$res->{$tag}->{$subfield}->{lib}=$lib;
  		$res->{$tag}->{$subfield}->{tab}=$tab;
--- 491,496 ----
  	my $thesaurus_category;
  	my $value_builder;
! 	my $kohafield;
! 	while ( ($tag, $subfield, $lib, $tab, $mandatory, $repeatable,$authorised_value,$thesaurus_category,$value_builder,$kohafield) = $sth->fetchrow) {
  		$res->{$tag}->{$subfield}->{lib}=$lib;
  		$res->{$tag}->{$subfield}->{tab}=$tab;
***************
*** 494,497 ****
--- 500,504 ----
  		$res->{$tag}->{$subfield}->{thesaurus_category}=$thesaurus_category;
  		$res->{$tag}->{$subfield}->{value_builder}=$value_builder;
+ 		$res->{$tag}->{$subfield}->{kohafield}=$kohafield;
  	}
  	return $res;

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** Search.pm	11 Jun 2003 18:48:07 -0000	1.68
--- Search.pm	17 Jun 2003 11:21:13 -0000	1.69
***************
*** 2415,2418 ****
--- 2415,2419 ----
  		}
  	}
+ 	warn "Q : $query";
  	$sth   = $dbh->prepare($query);
  	$sth->execute;