[Koha-cvs] koha admin/auth_subfields_structure.pl admin/ma... [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/09/01 13:13:34

Modified files:
        admin          : auth_subfields_structure.pl 
                         marc_subfields_structure.pl 
        authorities    : authorities.pl 
        cataloguing    : additem.pl plugin_launcher.pl 

Log message:
        fix bad link to value builder.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7&r2=1.7.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marc_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38&r2=1.38.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/authorities.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.15&r2=1.15.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/additem.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/plugin_launcher.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: admin/auth_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- admin/auth_subfields_structure.pl   4 Jul 2006 14:36:51 -0000       1.7
+++ admin/auth_subfields_structure.pl   1 Sep 2006 13:13:33 -0000       1.7.2.1
@@ -115,9 +115,9 @@
        # on a standard install, /cgi-bin need to be added. 
        # test one, then the other
        my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-       unless (opendir(DIR, "$cgidir/value_builder")) {
+       unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
                $cgidir = C4::Context->intranetdir;
-               opendir(DIR, "$cgidir/value_builder") || die "can't opendir 
$cgidir/value_builder: $!";
+               opendir(DIR, "$cgidir/cataloguing/value_builder") || die "can't 
opendir $cgidir/value_builder: $!";
        } 
        while (my $line = readdir(DIR)) {
                if ($line =~ /\.pl$/) {

Index: admin/marc_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -b -r1.38 -r1.38.2.1
--- admin/marc_subfields_structure.pl   4 Jul 2006 14:36:51 -0000       1.38
+++ admin/marc_subfields_structure.pl   1 Sep 2006 13:13:33 -0000       1.38.2.1
@@ -138,9 +138,9 @@
        # on a standard install, /cgi-bin need to be added. 
        # test one, then the other
        my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-       unless (opendir(DIR, "$cgidir/value_builder")) {
+       unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
                $cgidir = C4::Context->intranetdir;
-               opendir(DIR, "$cgidir/value_builder") || die "can't opendir 
$cgidir/value_builder: $!";
+               opendir(DIR, "$cgidir/cataloguing/value_builder") || die "can't 
opendir $cgidir/value_builder: $!";
        } 
        while (my $line = readdir(DIR)) {
                if ($line =~ /\.pl$/) {

Index: authorities/authorities.pl
===================================================================
RCS file: /sources/koha/koha/authorities/authorities.pl,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- authorities/authorities.pl  4 Jul 2006 14:36:51 -0000       1.15
+++ authorities/authorities.pl  1 Sep 2006 13:13:33 -0000       1.15.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: authorities.pl,v 1.15 2006/07/04 14:36:51 toins Exp $
+# $Id: authorities.pl,v 1.15.2.1 2006/09/01 13:13:33 toins Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -163,9 +163,9 @@
        } 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";
+               my $cgidir = C4::Context->intranetdir 
."/cgi-bin/cataloguing/value_builder";
                unless (opendir(DIR, "$cgidir")) {
-                       $cgidir = C4::Context->intranetdir."/value_builder";
+                       $cgidir = 
C4::Context->intranetdir."/cataloguing/value_builder";
                } 
                my 
$plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
                require $plugin;

Index: cataloguing/additem.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/additem.pl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- cataloguing/additem.pl      1 Sep 2006 08:08:49 -0000       1.7.2.1
+++ cataloguing/additem.pl      1 Sep 2006 13:13:33 -0000       1.7.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: additem.pl,v 1.7.2.1 2006/09/01 08:08:49 toins Exp $
+# $Id: additem.pl,v 1.7.2.2 2006/09/01 13:13:33 toins Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -301,7 +301,7 @@
                        $subfield_data{marc_value}="<input type=\"text\" 
name=\"field_value\"  size=47 maxlength=255> <a 
href=\"javascript:Dopop('cataloguing/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'};
+                       my 
$plugin="value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
                        require $plugin;
                        my $extended_param = 
plugin_parameters($dbh,$record,$tagslib,$i,0);
                        my ($function_name,$javascript) = 
plugin_javascript($dbh,$record,$tagslib,$i,0);

Index: cataloguing/plugin_launcher.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/Attic/plugin_launcher.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- cataloguing/plugin_launcher.pl      1 Sep 2006 08:55:06 -0000       1.1.2.1
+++ cataloguing/plugin_launcher.pl      1 Sep 2006 13:13:33 -0000       1.1.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: plugin_launcher.pl,v 1.1.2.1 2006/09/01 08:55:06 toins Exp $
+# $Id: plugin_launcher.pl,v 1.1.2.2 2006/09/01 13:13:33 toins Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -28,12 +28,12 @@
 
 my $input = new CGI;
 my $plugin_name=$input->param("plugin_name");
-my $plugin_name="value_builder/".$input->param("plugin_name");
+my $plugin_name="cataloguing/value_builder/".$input->param("plugin_name");
 
 # 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";
-unless (opendir(DIR, "$cgidir/value_builder")) {
+unless (opendir(DIR, "$cgidir/cataloguing/value_builder")) {
        $cgidir = C4::Context->intranetdir;
 } 
 require $cgidir."/".$plugin_name;