[Koha-cvs] CVS: koha/C4 Biblio.pm,1.41,1.42 Output.pm,1.42,1.43 SearchMarc.pm,1.3,1.4

[Paul POULAIN]

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

Modified Files:
	Biblio.pm Output.pm SearchMarc.pm 
Log Message:
last commits before 1.9.1

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** Biblio.pm	1 Apr 2003 12:26:43 -0000	1.41
--- Biblio.pm	4 Apr 2003 08:41:11 -0000	1.42
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  # $Log$
+ # Revision 1.42  2003/04/04 08:41:11  tipaul
+ # last commits before 1.9.1
+ #
  # Revision 1.41  2003/04/01 12:26:43  tipaul
  # fixes
***************
*** 724,728 ****
  					if ($oldfield->subfield(@$subfield[0]) ne @$subfield[1] ) {
  						my $subfieldid=&MARCfindsubfieldid($dbh,$bibid,$field->tag(),$tagorder,@$subfield[0],$subfieldorder);
- 						warn "subfieldid => $subfieldid";
  						&MARCmodsubfield($dbh,$subfieldid,@$subfield[1]);
  					}
--- 727,730 ----

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** Output.pm	4 Apr 2003 08:04:16 -0000	1.42
--- Output.pm	4 Apr 2003 08:41:15 -0000	1.43
***************
*** 121,129 ****
    foreach my $th (@themes) {
      foreach my $la (@languages) {
- 	warn "File = $htdocs/$th/$la/$tmpl\n";
  	if (-e "$htdocs/$th/$la/$tmpl") {
  	    $theme = $th;
  	    $lang = $la;
- 	    warn "FOUND";
  	    last THEME;
  	}
--- 121,127 ----

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SearchMarc.pm	1 Apr 2003 12:26:43 -0000	1.3
--- SearchMarc.pm	4 Apr 2003 08:41:17 -0000	1.4
***************
*** 70,74 ****
  	my $sql_where2; # will contain m1.bibid=m2.bibid
  	my $nb=1;
- 	warn "value : ".@$value;
  	for(my $i=0; $i<=@$value;$i++) {
  		if (@$value[$i]) {
--- 70,73 ----
***************
*** 129,135 ****
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select m1.bibid from $sql_tables where $sql_where2 and ($sql_where1)");
  	} else {
! 		$sth = $dbh->prepare("select m1.bibid from $sql_tables where $sql_where1");
  	}
  	$sth->execute;
--- 128,136 ----
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from $sql_tables where $sql_where2 and ($sql_where1)");
! 		warn("-->select m1.bibid from $sql_tables where $sql_where2 and ($sql_where1)");
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from $sql_tables where $sql_where1");
! 		warn("==>select m1.bibid from $sql_tables where $sql_where1");
  	}
  	$sth->execute;