Merge remote-tracking branch 'origin/new/bug_6132'

[koha.git] / cataloguing / value_builder / unimarc_field_117.pl

diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index eed4204..fcbb18f 100755 (executable)
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -15,11 +14,12 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use CGI;
 use C4::Context;
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -39,32 +42,38 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "117".(int(rand(100000))+1);
 my $res="
 <script>
-function Focus$function_name(subfield_managed) {
+function Focus$field_number(subfield_managed) {
 return 1;
 }
 
-function Blur$function_name(subfield_managed) {
+function Blur$field_number(subfield_managed) {
        return 1;
 }
 
-function Clic$function_name(i) {
-       defaultvalue=document.forms['f'].field_value[i].value;
-       newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=600,height=225,toolbar=false,scrollbars=yes');
+function Clic$field_number(i) {
+       defaultvalue=document.getElementById(\"$field_number\").value;
+       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=$field_number&result=\"+defaultvalue,\"unimarc_field_117\",'width=600,height=225,toolbar=false,scrollbars=yes');
 
 }
 </script>
 ";
 
-return ($function_name,$res);
+return ($field_number,$res);
+}
+
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "dblspace" if $char eq "  ";
+    return "pipe" if $char eq "|";
+    return "dblpipe" if $char eq "||";
+    return $char;
 }
+
 sub plugin {
 my ($input) = @_;
-       my %env;
-
-#      my $input = new CGI;
        my $index= $input->param('index');
        my $result= $input->param('result');
 
@@ -74,15 +83,15 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {editcatalogue => 1},
+                            flagsrequired => {editcatalogue => '*'},
                             debug => 1,
                             });
-       my $f1 = substr($result,0,2);
-       my $f2 = substr($result,2,2);
-       my $f3 = substr($result,4,2);
-       my $f4 = substr($result,6,2);
+       my $f1 = substr($result,0,2); $f1 = wrapper( $f1 ) if $f1;
+       my $f2 = substr($result,2,2); $f2 = wrapper( $f2 ) if $f2;
+       my $f3 = substr($result,4,2); $f3 = wrapper( $f3 ) if $f3;
+       my $f4 = substr($result,6,2); $f4 = wrapper( $f4 ) if $f4;
 
-       my $f5 = substr($result,8,1);
+       my $f5 = substr($result,8,1); $f5 = wrapper( $f5 ) if $f5;
 
        $template->param(index => $index,
                                                        "f1$f1" => 1,
@@ -91,7 +100,7 @@ my ($template, $loggedinuser, $cookie)
                                                        "f4$f4" => 1,
                                                        "f5$f5" => 1
  );
-       print $input->header(-cookie => $cookie),$template->output;
+        output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;