[Koha-cvs] koha/cataloguing addbiblio.pl plugin_launcher.pl [rel_3_0]

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   07/01/08 14:06:40

Modified files:
        cataloguing    : addbiblio.pl plugin_launcher.pl 

Log message:
        replace require by do
        
        otherwise, with mod_perl activated, the symbol table is not updated 
from call to call & the plugin that is open seems silly : nothing changes in 
the code, so the require is not re-run & a previous plugin is used. the 
behaviour with mod_perl is then completly unpredicable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.18&r2=1.14.2.19
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/plugin_launcher.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5

Patches:
Index: addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.14.2.18
retrieving revision 1.14.2.19
diff -u -b -r1.14.2.18 -r1.14.2.19
--- addbiblio.pl        20 Dec 2006 16:53:35 -0000      1.14.2.18
+++ addbiblio.pl        8 Jan 2007 14:06:40 -0000       1.14.2.19
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 
-# $Id: addbiblio.pl,v 1.14.2.18 2006/12/20 16:53:35 tipaul Exp $
+# $Id: addbiblio.pl,v 1.14.2.19 2007/01/08 14:06:40 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -255,7 +255,7 @@
             $cgidir = C4::Context->intranetdir."/cataloguing/value_builder";
         }
         my 
$plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
-        require $plugin;
+        do $plugin;
         my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
         my ($function_name,$javascript) = 
plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
         $subfield_data{marc_value}="<input tabindex=\"1\" type=\"text\" 
name=\"field_value\"  value=\"$value\" size=\"70\" maxlength=\"255\" 
OnFocus=\"javascript:Focus$function_name($i)\" 
OnBlur=\"javascript:Blur$function_name($i); \"> <a  style=\"cursor: help;\" 
href=\"javascript:Clic$function_name($i)\">...</a> $javascript";

Index: plugin_launcher.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/Attic/plugin_launcher.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- plugin_launcher.pl  18 Dec 2006 16:35:18 -0000      1.1.2.4
+++ plugin_launcher.pl  8 Jan 2007 14:06:40 -0000       1.1.2.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: plugin_launcher.pl,v 1.1.2.4 2006/12/18 16:35:18 toins Exp $
+# $Id: plugin_launcher.pl,v 1.1.2.5 2007/01/08 14:06:40 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -35,5 +35,5 @@
 unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
        $cgidir = C4::Context->intranetdir;
 }
-require $cgidir."/".$plugin_name;
+do $cgidir."/".$plugin_name;
 &plugin($input);