Merge remote-tracking branch 'origin/master' into new/bug_6679

[srvgit] / cataloguing / value_builder / unimarc_leader.pl

diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 05a0a5e..af4d808 100755 (executable)
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.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;
@@ -48,16 +48,16 @@ return 1;
 }
 
 function Blur$function_name(subfield_managed) {
-       var leader_lenght = document.getElementById(\"$field_number\").value.length;
-    if (leader_lenght != 25) {
-        alert(_('leader has an incorrect size: ' + leader_lenght + ' instead of 25 chars'));
+       var leader_length = document.getElementById(\"$field_number\").value.length;
+    if (leader_length != 24 && leader_length !=0) {
+        alert(_('leader has an incorrect size: ' + leader_length + ' instead of 24 chars'));
     }
     return 1;
 }
 
 function Clic$function_name(i) {
        defaultvalue=document.getElementById(\"$field_number\").value;
-       newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc_field_100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
@@ -66,6 +66,13 @@ function Clic$function_name(i) {
     return ( $function_name, $res );
 }
 
+sub wrapper {
+    my ($char) = @_;
+    return "space" if $char eq " ";
+    return "pipe" if $char eq "|";
+    return $char;
+}
+
 sub plugin {
     my ($input) = @_;
     my $index   = $input->param('index');
@@ -78,18 +85,18 @@ sub plugin {
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
-            flagsrequired   => { editcatalogue => 1 },
+            flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
     );
     $result = "     nam         3       " unless $result;
-    my $f5  = substr( $result, 5,  1 );
-    my $f6  = substr( $result, 6,  1 );
-    my $f7  = substr( $result, 7,  1 );
-    my $f8  = substr( $result, 8,  1 );
+    my $f5  = substr( $result, 5,  1 ); $f5  = wrapper( $f5 ) if $f5;
+    my $f6  = substr( $result, 6,  1 ); $f6  = wrapper( $f6 ) if $f6;
+    my $f7  = substr( $result, 7,  1 ); $f7  = wrapper( $f7 ) if $f7;
+    my $f8  = substr( $result, 8,  1 ); $f8  = wrapper( $f8 ) if $f8;
     my $f9  = substr( $result, 9,  1 );
-    my $f17 = substr( $result, 17, 1 );
-    my $f18 = substr( $result, 18, 1 );
+    my $f17 = substr( $result, 17, 1 ); $f17 = wrapper( $f17 ) if $f17;
+    my $f18 = substr( $result, 18, 1 ); $f18 = wrapper( $f18 ) if $f18;
     my $f19 = substr( $result, 19, 1 );
 
     $template->param(