[Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.11,1.115.2.12

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
fixing a bug : when a field was repeated, the last field was also repeated. (Was due to the "empty" field in html between fields : to separate fields, in html, an empty field is automatically added. in MARChtml2marc, this empty field was not discarded correctly)

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.11
retrieving revision 1.115.2.12
diff -C2 -r1.115.2.11 -r1.115.2.12
*** Biblio.pm	25 May 2005 15:48:43 -0000	1.115.2.11
--- Biblio.pm	30 May 2005 11:22:41 -0000	1.115.2.12
***************
*** 1043,1047 ****
--- 1043,1049 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  # 			warn "1=>".@$rtags[$i].@$rsubfields[$i]." = ".@$rvalues[$i].": ".$field->as_formatted;
***************
*** 1061,1065 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
--- 1063,1067 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
***************
*** 2632,2635 ****
--- 2634,2640 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.12  2005/05/30 11:22:41  tipaul
+ # fixing a bug : when a field was repeated, the last field was also repeated. (Was due to the "empty" field in html between fields : to separate fields, in html, an empty field is automatically added. in MARChtml2marc, this empty field was not discarded correctly)
+ #
  # Revision 1.115.2.11  2005/05/25 15:48:43  tipaul
  # * removing my for variables already declared