merging 2.2 branch with head. Sorry for not making it before, many many commits done...

[koha_gimpoz] / acqui.simple / addbiblio.pl

diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl
index f736192..ebdb6db 100755 (executable)
--- a/acqui.simple/addbiblio.pl
+++ b/acqui.simple/addbiblio.pl
@@ -176,10 +176,16 @@ sub create_input () {
                $subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
        # 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>";
+               $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'}) {
-               my $plugin="../value_builder/".$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);
                my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);