[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.52,1.53

[Paul POULAIN]

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

Modified Files:
	addbiblio.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** addbiblio.pl	23 Dec 2004 08:43:43 -0000	1.52
--- addbiblio.pl	1 Mar 2005 13:40:50 -0000	1.53
***************
*** 177,184 ****
  	# it's a thesaurus / authority field
  	} elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
! 		$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE READONLY> <a href=\"javascript:Dopop('../authorities/auth_finder.pl?category=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
  	# it's a plugin field
  	} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
! 		my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
--- 177,190 ----
  	# it's a thesaurus / authority field
  	} elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
! 		$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE READONLY> <a href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
  	# it's a plugin field
  	} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
! 		# opening plugin. Just check wether we are on a developper computer on a production one
! 		# (the cgidir differs)
! 		my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
! 		unless (opendir(DIR, "$cgidir")) {
! 			$cgidir = C4::Context->intranetdir."/value_builder";
! 		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);