[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.39,1.40 additem.pl,1.25,1.26

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20427/acqui.simple

Modified Files:
	addbiblio.pl additem.pl 
Log Message:
last sync for 2.1.0 release

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** addbiblio.pl	10 Jun 2004 09:34:55 -0000	1.39
--- addbiblio.pl	29 Jun 2004 16:07:09 -0000	1.40
***************
*** 344,348 ****
  my $encoding="";
  $record = MARCgetbiblio($dbh,$bibid) if ($bibid);
- # warn "R".$record->as_formatted;
  ($record,$encoding) = MARCfindbreeding($dbh,$breedingid) if ($breedingid);
  
--- 344,347 ----

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** additem.pl	3 Jun 2004 09:59:37 -0000	1.25
--- additem.pl	29 Jun 2004 16:07:10 -0000	1.26
***************
*** 201,204 ****
--- 201,213 ----
  		my ($x,$value);
  		($x,$value) = find_value($tag,$subfield,$itemrecord) if ($itemrecord);
+ 		# search for itemcallnumber if applicable
+ 		if ($tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' && C4::Context->preference('itemcallnumber')) {
+ 			my $CNtag = substr(C4::Context->preference('itemcallnumber'),0,3);
+ 			my $CNsubfield = substr(C4::Context->preference('itemcallnumber'),3,1);
+ 			my $temp = $record->field($CNtag);
+ 			if ($temp) {
+ 				$value = $temp->subfield($CNsubfield);
+ 			}
+ 		}
  		if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
  			my @authorised_values;
***************
*** 241,244 ****
--- 250,254 ----
  		} elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
  			$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\"  size=47 maxlength=255> <a href=\"javascript:Dopop('../thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
+ 			#"
  		} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
  			my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};