[Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.10,1.11 Biblio.pm,1.116,1.117 Context.pm,1.19,1.20 Search.pm,1.100,1.101 SearchMarc.pm,1.39,1.40

[Paul POULAIN]

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

Modified Files:
	AuthoritiesMarc.pm Biblio.pm Context.pm Search.pm 
	SearchMarc.pm 
Log Message:
synch'ing with 2.2

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AuthoritiesMarc.pm	1 Mar 2005 13:40:48 -0000	1.10
--- AuthoritiesMarc.pm	7 Mar 2005 08:55:29 -0000	1.11
***************
*** 859,864 ****
  # $Id$
  # $Log$
! # Revision 1.10  2005/03/01 13:40:48  tipaul
! # merging 2.2 branch with head. Sorry for not making it before, many many commits done here
  #
  # Revision 1.9.2.2  2005/02/28 14:03:13  tipaul
--- 859,864 ----
  # $Id$
  # $Log$
! # Revision 1.11  2005/03/07 08:55:29  tipaul
! # synch'ing with 2.2
  #
  # Revision 1.9.2.2  2005/02/28 14:03:13  tipaul

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** Biblio.pm	1 Mar 2005 13:40:48 -0000	1.116
--- Biblio.pm	7 Mar 2005 08:55:29 -0000	1.117
***************
*** 2654,2659 ****
  # $Id$
  # $Log$
! # Revision 1.116  2005/03/01 13:40:48  tipaul
! # merging 2.2 branch with head. Sorry for not making it before, many many commits done here
  #
  # Revision 1.115.2.5  2005/02/24 13:54:04  tipaul
--- 2654,2659 ----
  # $Id$
  # $Log$
! # Revision 1.117  2005/03/07 08:55:29  tipaul
! # synch'ing with 2.2
  #
  # Revision 1.115.2.5  2005/02/24 13:54:04  tipaul



Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** SearchMarc.pm	3 Mar 2005 09:32:04 -0000	1.39
--- SearchMarc.pm	7 Mar 2005 08:55:30 -0000	1.40
***************
*** 166,170 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby, $desc_or_asc) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 166,170 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid