[Koha-patches] [PATCH] Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
Janusz Kaczmarek
januszop at gmail.com
Sat Jun 18 13:52:09 CEST 2011
A corrected version of the patch of 6 June 2011.
---
cataloguing/value_builder/unimarc_field_100.pl | 18 +++++--
cataloguing/value_builder/unimarc_field_105.pl | 37 ++++++++------
cataloguing/value_builder/unimarc_field_110.pl | 24 ++++++---
cataloguing/value_builder/unimarc_field_115a.pl | 41 +++++++++------
cataloguing/value_builder/unimarc_field_115b.pl | 25 ++++++---
cataloguing/value_builder/unimarc_field_116.pl | 31 +++++++----
cataloguing/value_builder/unimarc_field_117.pl | 20 ++++++--
cataloguing/value_builder/unimarc_field_120.pl | 21 ++++++--
cataloguing/value_builder/unimarc_field_121a.pl | 12 ++++-
cataloguing/value_builder/unimarc_field_125b.pl | 10 +++-
cataloguing/value_builder/unimarc_field_126a.pl | 20 +++++--
cataloguing/value_builder/unimarc_field_128b.pl | 9 +++-
cataloguing/value_builder/unimarc_field_130.pl | 10 +++-
cataloguing/value_builder/unimarc_field_135a.pl | 10 +++-
cataloguing/value_builder/unimarc_field_140.pl | 43 +++++++++------
cataloguing/value_builder/unimarc_leader.pl | 19 +++++--
.../cataloguing/value_builder/unimarc_field_100.tt | 10 ++--
.../cataloguing/value_builder/unimarc_field_105.tt | 18 +++---
.../cataloguing/value_builder/unimarc_field_110.tt | 2 +-
.../value_builder/unimarc_field_115a.tt | 2 +-
.../cataloguing/value_builder/unimarc_field_116.tt | 54 ++++++++++----------
.../cataloguing/value_builder/unimarc_field_117.tt | 30 ++++++------
.../cataloguing/value_builder/unimarc_field_120.tt | 14 +++---
.../value_builder/unimarc_field_121a.tt | 4 +-
.../value_builder/unimarc_field_125b.tt | 2 +-
.../value_builder/unimarc_field_126a.tt | 14 +++---
.../value_builder/unimarc_field_128b.tt | 6 +-
.../cataloguing/value_builder/unimarc_field_130.tt | 2 +-
.../value_builder/unimarc_field_135a.tt | 2 +-
.../cataloguing/value_builder/unimarc_field_140.tt | 34 ++++++------
.../cataloguing/value_builder/unimarc_leader.tt | 6 +-
31 files changed, 339 insertions(+), 211 deletions(-)
diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index c49b956..0d01554 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -67,6 +67,14 @@ sub plugin_javascript {
return ( $field_number, $res );
}
+sub wrapper {
+ my ($char) = @_;
+ return "space" if $char eq " ";
+ return "dblspace" if $char eq " ";
+ return "pipe" if $char eq "|";
+ return $char;
+}
+
sub plugin {
my ($input) = @_;
my $index = $input->param('index');
@@ -90,14 +98,14 @@ sub plugin {
my @today = Date::Calc::Today();
$f1 = $today[0] . sprintf('%02s',$today[1]) . sprintf('%02s',$today[2]);
}
- my $f2 = substr( $result, 8, 1 );
+ my $f2 = substr( $result, 8, 1 ); $f2 = wrapper( $f2 ) if $f2;
my $f3 = substr( $result, 9, 4 );
$f3='' if $f3 eq ' '; # empty publication year if only spaces, otherwise it's hard to fill the field
my $f4 = substr( $result, 13, 4 );
$f4='' if $f4 eq ' ';
- my $f5 = substr( $result, 17, 1 );
- my $f6 = substr( $result, 18, 1 );
- my $f7 = substr( $result, 19, 1 );
+ my $f5 = substr( $result, 17, 1 ); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr( $result, 18, 1 ); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr( $result, 19, 1 ); $f7 = wrapper( $f7 ) if $f7;
my $f8 = substr( $result, 20, 1 );
my $f9 = substr( $result, 21, 1 );
my $f10 = substr( $result, 22, 3 );
@@ -105,7 +113,7 @@ sub plugin {
my $f12 = substr( $result, 26, 2 );
my $f13 = substr( $result, 28, 2 );
my $f14 = substr( $result, 30, 4 );
- my $f15 = substr( $result, 34, 2 );
+ my $f15 = substr( $result, 34, 2 ); $f15 = wrapper( $f15 ) if $f15;
$template->param(
index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index 8d44a82..c84e826 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -63,6 +63,13 @@ sub plugin_javascript {
return ($field_number,$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,21 +85,21 @@ sub plugin {
flagsrequired => {editcatalogue => '*'},
debug => 1,
});
- my $f1 = substr($result,0,1);
- my $f2 = substr($result,1,1);
- my $f3 = substr($result,2,1);
- my $f4 = substr($result,3,1);
-
- my $f5 = substr($result,4,1);
- my $f6 = substr($result,5,1);
- my $f7 = substr($result,6,1);
- my $f8 = substr($result,7,1);
-
- my $f9 = substr($result,8,1);
- my $f10 = substr($result,9,1);
- my $f11 = substr($result,10,1);
- my $f12 = substr($result,11,1);
- my $f13 = substr($result,12,1);
+ my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+
+ my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
+ my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+
+ my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+ my $f10 = substr($result,9,1); $f10 = wrapper( $f10 ) if $f10;
+ my $f11 = substr($result,10,1); $f11 = wrapper( $f11 ) if $f11;
+ my $f12 = substr($result,11,1); $f12 = wrapper( $f12 ) if $f12;
+ my $f13 = substr($result,12,1); $f13 = wrapper( $f13 ) if $f13;
$template->param(index => $index,
"f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 848a53a..2c301ae 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -62,6 +62,14 @@ sub plugin_javascript {
return ($field_number,$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');
@@ -76,15 +84,15 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {editcatalogue => '*'},
debug => 1,
});
- my $f1 = substr($result,0,1);
- my $f2 = substr($result,1,1);
- my $f3 = substr($result,2,1);
- my $f4 = substr($result,3,1);
+ my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
my $f5 = substr($result,4,3);
- my $f6 = substr($result,7,1);
- my $f7 = substr($result,8,1);
- my $f8 = substr($result,9,1);
- my $f9 = substr($result,10,1);
+ my $f6 = substr($result,7,1); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr($result,8,1); $f7 = wrapper( $f7 ) if $f7;
+ my $f8 = substr($result,9,1); $f8 = wrapper( $f8 ) if $f8;
+ my $f9 = substr($result,10,1); $f9 = wrapper( $f9 ) if $f9;
$template->param(index => $index,
"f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index 6144771..2cd6806 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -69,6 +69,13 @@ sub plugin_javascript {
return ( $field_number, $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');
@@ -86,24 +93,24 @@ sub plugin {
debug => 1,
}
);
- my $f1 = substr( $result, 0, 1 );
+ my $f1 = substr( $result, 0, 1 ); $f1 = wrapper( $f1 ) if $f1;
my $f2 = substr( $result, 1, 3 );
- my $f3 = substr( $result, 4, 1 );
- my $f4 = substr( $result, 5, 1 );
- my $f5 = substr( $result, 6, 1 );
- my $f6 = substr( $result, 7, 1 );
- my $f7 = substr( $result, 8, 1 );
- my $f8 = substr( $result, 9, 1 );
- my $f9 = substr( $result, 10, 1 );
- my $f10 = substr( $result, 11, 1 );
- my $f11 = substr( $result, 12, 1 );
- my $f12 = substr( $result, 13, 1 );
- my $f13 = substr( $result, 14, 1 );
- my $f14 = substr( $result, 15, 1 );
- my $f15 = substr( $result, 16, 1 );
- my $f16 = substr( $result, 17, 1 );
- my $f17 = substr( $result, 18, 1 );
- my $f18 = substr( $result, 19, 1 );
+ my $f3 = substr( $result, 4, 1 ); $f3 = wrapper( $f3 ) if $f3;
+ my $f4 = substr( $result, 5, 1 ); $f4 = wrapper( $f4 ) if $f4;
+ my $f5 = substr( $result, 6, 1 ); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr( $result, 7, 1 ); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr( $result, 8, 1 ); $f7 = wrapper( $f7 ) if $f7;
+ my $f8 = substr( $result, 9, 1 ); $f8 = wrapper( $f8 ) if $f8;
+ my $f9 = substr( $result, 10, 1 ); $f9 = wrapper( $f9 ) if $f9;
+ my $f10 = substr( $result, 11, 1 ); $f10 = wrapper( $f10 ) if $f10;
+ my $f11 = substr( $result, 12, 1 ); $f11 = wrapper( $f11 ) if $f11;
+ my $f12 = substr( $result, 13, 1 ); $f12 = wrapper( $f12 ) if $f12;
+ my $f13 = substr( $result, 14, 1 ); $f13 = wrapper( $f13 ) if $f13;
+ my $f14 = substr( $result, 15, 1 ); $f14 = wrapper( $f14 ) if $f14;
+ my $f15 = substr( $result, 16, 1 ); $f15 = wrapper( $f15 ) if $f15;
+ my $f16 = substr( $result, 17, 1 ); $f16 = wrapper( $f16 ) if $f16;
+ my $f17 = substr( $result, 18, 1 ); $f17 = wrapper( $f17 ) if $f17;
+ my $f18 = substr( $result, 19, 1 ); $f18 = wrapper( $f18 ) if $f18;
$template->param(
index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 7582e74..919b1fa 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -63,6 +63,13 @@ function Clic$field_number() {
return ( $field_number, $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');
@@ -80,15 +87,15 @@ sub plugin {
debug => 1,
}
);
- my $f1 = substr( $result, 0, 1 );
- my $f2 = substr( $result, 1, 1 );
- my $f3 = substr( $result, 2, 1 );
- my $f4 = substr( $result, 3, 1 );
- my $f5 = substr( $result, 4, 1 );
- my $f6 = substr( $result, 5, 1 );
- my $f7 = substr( $result, 6, 1 );
- my $f8 = substr( $result, 7, 1 );
- my $f9 = substr( $result, 8, 1 );
+ my $f1 = substr( $result, 0, 1 ); $f1 = wrapper( $f1 ) if $f1;
+ my $f2 = substr( $result, 1, 1 ); $f2 = wrapper( $f2 ) if $f2;
+ my $f3 = substr( $result, 2, 1 ); $f3 = wrapper( $f3 ) if $f3;
+ my $f4 = substr( $result, 3, 1 ); $f4 = wrapper( $f4 ) if $f4;
+ my $f5 = substr( $result, 4, 1 ); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr( $result, 5, 1 ); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr( $result, 6, 1 ); $f7 = wrapper( $f7 ) if $f7;
+ my $f8 = substr( $result, 7, 1 ); $f8 = wrapper( $f8 ) if $f8;
+ my $f9 = substr( $result, 8, 1 ); $f9 = wrapper( $f9 ) if $f9;
my $f10 = substr( $result, 9, 4 );
my $f11 = substr( $result, 13, 2 );
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 21e2368..67f6875 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -63,6 +63,15 @@ function Clic$field_number(i) {
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 $index = $input->param('index');
@@ -79,20 +88,20 @@ sub plugin {
debug => 1,
}
);
- my $f1 = substr( $result, 0, 1 );
- my $f2 = substr( $result, 1, 1 );
- my $f3 = substr( $result, 2, 1 );
- my $f4 = substr( $result, 3, 1 );
+ my $f1 = substr( $result, 0, 1 ); $f1 = wrapper( $f1 ) if $f1;
+ my $f2 = substr( $result, 1, 1 ); $f2 = wrapper( $f2 ) if $f2;
+ my $f3 = substr( $result, 2, 1 ); $f3 = wrapper( $f3 ) if $f3;
+ my $f4 = substr( $result, 3, 1 ); $f4 = wrapper( $f4 ) if $f4;
- my $f5 = substr( $result, 4, 2 );
- my $f6 = substr( $result, 6, 2 );
- my $f7 = substr( $result, 8, 2 );
+ my $f5 = substr( $result, 4, 2 ); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr( $result, 6, 2 ); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr( $result, 8, 2 ); $f7 = wrapper( $f7 ) if $f7;
- my $f8 = substr( $result, 10, 2 );
- my $f9 = substr( $result, 12, 2 );
- my $f10 = substr( $result, 14, 2 );
+ my $f8 = substr( $result, 10, 2 ); $f8 = wrapper( $f8 ) if $f8;
+ my $f9 = substr( $result, 12, 2 ); $f9 = wrapper( $f9 ) if $f9;
+ my $f10 = substr( $result, 14, 2 ); $f10 = wrapper( $f10 ) if $f10;
- my $f11 = substr( $result, 16, 2 );
+ my $f11 = substr( $result, 16, 2 ); $f11 = wrapper( $f11 ) if $f11;
$template->param(
index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index ff206f7..fcbb18f 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -62,6 +62,16 @@ function Clic$field_number(i) {
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 $index= $input->param('index');
@@ -76,12 +86,12 @@ my ($template, $loggedinuser, $cookie)
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,
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 3f72c85..f140fce 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -63,6 +63,15 @@ function Clic$function_name(i) {
return ($function_name,$res);
}
+
+sub wrapper {
+ my ($char) = @_;
+ return "space" if $char eq " ";
+ return "dblspace" if $char eq " ";
+ return "pipe" if $char eq "|";
+ return $char;
+}
+
sub plugin {
my ($input) = @_;
my $index= $input->param('index');
@@ -82,13 +91,13 @@ my ($template, $loggedinuser, $cookie)
my $f1 = substr($result,0,1);
my $f2 = substr($result,1,1);
my $f3 = substr($result,2,1);
- my $f4 = substr($result,3,1);
- my $f5 = substr($result,4,1);
- my $f6 = substr($result,5,1);
- my $f7 = substr($result,6,1);
+ my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+ my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
my $f8 = substr($result,7,2);
- my $f9 = substr($result,9,2);
- my $f10 = substr($result,11,2);
+ my $f9 = substr($result,9,2); $f9 = wrapper( $f9 ) if $f9;
+ my $f10 = substr($result,11,2); $f10 = wrapper( $f10 ) if $f10;
$template->param(index => $index,
"f1$f1" => 1,
"f2$f2" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index a855332..d40f49c 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -63,6 +63,14 @@ 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');
@@ -80,8 +88,8 @@ my ($template, $loggedinuser, $cookie)
debug => 1,
});
my $f1 = substr($result,0,1);
- my $f2 = substr($result,1,1);
- my $f3 = substr($result,2,1);
+ my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
my $f4 = substr($result,3,2);
my $f5 = substr($result,5,1);
my $f6 = substr($result,6,1);
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index b356956..8c66161 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -60,6 +60,14 @@ 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');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {editcatalogue => '*'},
debug => 1,
});
- my $f1 = substr($result,0,1);
+ my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
$template->param(index => $index,
"f1$f1" => 1);
output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index 2f85f9e..e3d47b5 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -60,6 +60,14 @@ 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');
@@ -83,12 +91,12 @@ my ($template, $loggedinuser, $cookie)
my $f5 = substr($result,4,1);
my $f6 = substr($result,5,1);
my $f7 = substr($result,6,1);
- my $f8 = substr($result,7,1);
- my $f9 = substr($result,8,1);
- my $f10 = substr($result,9,1);
- my $f11 = substr($result,10,1);
- my $f12 = substr($result,11,1);
- my $f13 = substr($result,12,1);
+ my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+ my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+ my $f10 = substr($result,9,1); $f10 = wrapper( $f10 ) if $f10;
+ my $f11 = substr($result,10,1); $f11 = wrapper( $f11 ) if $f11;
+ my $f12 = substr($result,11,1); $f12 = wrapper( $f12 ) if $f12;
+ my $f13 = substr($result,12,1); $f13 = wrapper( $f13 ) if $f13;
my $f14 = substr($result,13,1);
my $f15 = substr($result,14,1);
$template->param(index => $index,
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index b44bd21..1f196ac 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -60,6 +60,13 @@ function Clic$function_name(i) {
return ($function_name,$res);
}
+
+sub wrapper {
+ my ($char) = @_;
+ return "dblpipe" if $char eq "||";
+ return $char;
+}
+
sub plugin {
my ($input) = @_;
my $index= $input->param('index');
@@ -76,7 +83,7 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {editcatalogue => '*'},
debug => 1,
});
- my $f1 = substr($result,0,2);
+ my $f1 = substr($result,0,2); $f1 = wrapper( $f1 ) if $f1;
$template->param(index => $index,
"f1$f1" => 1);
output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index caf6ba3..d0eb5c9 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -61,6 +61,14 @@ 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');
@@ -79,7 +87,7 @@ my ($template, $loggedinuser, $cookie)
});
my $f1 = substr($result,0,1);
my $f2 = substr($result,1,1);
- my $f3 = substr($result,2,1);
+ my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
my $f4 = substr($result,3,1);
my $f5 = substr($result,4,3);
my $f6 = substr($result,7,1);
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index de631c2..93454aa 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -60,6 +60,14 @@ 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');
@@ -76,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {editcatalogue => '*'},
debug => 1,
});
- my $f1 = substr($result,0,1);
+ my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
my $f2 = substr($result,1,1);
my $f3 = substr($result,2,1);
my $f4 = substr($result,3,1);
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index ac50f32..201e31a 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -60,6 +60,15 @@ function Clic$function_name(i) {
return ($function_name,$res);
}
+
+sub wrapper {
+ my ($char) = @_;
+ return "space" if $char eq " ";
+ return "dblspace" if $char eq " ";
+ return "pipe" if $char eq "|";
+ return $char;
+}
+
sub plugin {
my ($input) = @_;
my $index= $input->param('index');
@@ -76,23 +85,23 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {editcatalogue => '*'},
debug => 1,
});
- my $f1 = substr($result,0,1);
- my $f2 = substr($result,1,1);
- my $f3 = substr($result,2,1);
- my $f4 = substr($result,3,1);
- my $f5 = substr($result,4,1);
- my $f6 = substr($result,5,1);
- my $f7 = substr($result,6,1);
- my $f8 = substr($result,7,1);
- my $f9 = substr($result,8,1);
- my $f10 = substr($result,9,2);
- my $f11 = substr($result,11,2);
- my $f12 = substr($result,13,2);
- my $f13 = substr($result,15,2);
- my $f14 = substr($result,17,2);
- my $f15 = substr($result,19,1);
- my $f16 = substr($result,20,1);
- my $f17 = substr($result,21,1);
+ my $f1 = substr($result,0,1); $f1 = wrapper( $f1 ) if $f1;
+ my $f2 = substr($result,1,1); $f2 = wrapper( $f2 ) if $f2;
+ my $f3 = substr($result,2,1); $f3 = wrapper( $f3 ) if $f3;
+ my $f4 = substr($result,3,1); $f4 = wrapper( $f4 ) if $f4;
+ my $f5 = substr($result,4,1); $f5 = wrapper( $f5 ) if $f5;
+ my $f6 = substr($result,5,1); $f6 = wrapper( $f6 ) if $f6;
+ my $f7 = substr($result,6,1); $f7 = wrapper( $f7 ) if $f7;
+ my $f8 = substr($result,7,1); $f8 = wrapper( $f8 ) if $f8;
+ my $f9 = substr($result,8,1); $f9 = wrapper( $f9 ) if $f9;
+ my $f10 = substr($result,9,2); $f10 = wrapper( $f10 ) if $f10;
+ my $f11 = substr($result,11,2); $f11 = wrapper( $f11 ) if $f11;
+ my $f12 = substr($result,13,2); $f12 = wrapper( $f12 ) if $f12;
+ my $f13 = substr($result,15,2); $f13 = wrapper( $f13 ) if $f13;
+ my $f14 = substr($result,17,2); $f14 = wrapper( $f14 ) if $f14;
+ my $f15 = substr($result,19,1); $f15 = wrapper( $f15 ) if $f15;
+ my $f16 = substr($result,20,1); $f16 = wrapper( $f16 ) if $f16;
+ my $f17 = substr($result,21,1); $f17 = wrapper( $f17 ) if $f17;
my $f18 = substr($result,22,1);
my $f19 = substr($result,23,1);
my $f20 = substr($result,24,1);
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 05748a2..af4d808 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -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');
@@ -83,13 +90,13 @@ sub plugin {
}
);
$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(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index d186dfa..4686148 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -14,7 +14,7 @@
<td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
<td>
<select name="f2" id="f2" size="1">
- [% IF ( f2 ) %]
+ [% IF ( f2space ) %]
<option value=" " selected="selected">Non required value</option>
[% ELSE %]
<option value=" ">Non required value</option>
@@ -494,7 +494,7 @@ languages and obsolete typography)
<td>
<select name="f13" id="f13" size="1">
- [% IF ( f13 ) %]
+ [% IF ( f13dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -578,10 +578,10 @@ languages and obsolete typography)</option>
<td><label for="f15">Script of Title</label></td>
<td>
<select name="f15" id="f15" size="1">
- [% IF ( f15 ) %]
- <option value=" " selected="selected">Non required value</option>
+ [% IF ( f15dblspace ) %]
+ <option value=" " selected="selected">Non required value</option>
[% ELSE %]
- <option value=" ">Non required value</option>
+ <option value=" ">Non required value</option>
[% END %]
[% IF ( f15ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
index 18f652f..f7e5884 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
@@ -16,7 +16,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f1 ) %]
+ [% IF ( f1space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -114,7 +114,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f2 ) %]
+ [% IF ( f2space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -211,7 +211,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f3 ) %]
+ [% IF ( f3space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -307,7 +307,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f4 ) %]
+ [% IF ( f4space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -404,7 +404,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f5 ) %]
+ [% IF ( f5space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -542,7 +542,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f6 ) %]
+ [% IF ( f6space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -680,7 +680,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f7 ) %]
+ [% IF ( f7space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -817,7 +817,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f8 ) %]
+ [% IF ( f8space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -949,7 +949,7 @@
<td><label for="f9">Conference or meeting code:</label></td>
<td>
<select name="f9" id="f9" size="1">
- [% IF ( f1pipe ) %]
+ [% IF ( f9pipe ) %]
<option value="|" selected="selected">|- Filling character</option>
[% ELSE %]
<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
index ccb7624..b661898 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
@@ -198,7 +198,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f4 ) %]
+ [% IF ( f4space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
index 03a94e1..8a7b2eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
@@ -48,7 +48,7 @@
<td><label for="f3">Colour indicator</label></td>
<td>
<select name="f3" id="f3" size="1">
- [% IF ( f1pipe ) %]
+ [% IF ( f3pipe ) %]
<option value="|" selected="selected">|- Filling character</option>
[% ELSE %]
<option value="|">|- Filling character</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
index acb0695..70cd050 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
@@ -287,12 +287,12 @@
<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
<td>
<select name="f5" id="f5" size="1">
- [% IF ( f5pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f5dblpipe ) %]
+ <option value="||" selected="selected">|- Filling character</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f5 ) %]
+ [% IF ( f5dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -484,12 +484,12 @@
<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
<td>
<select name="f6" id="f6" size="1">
- [% IF ( f6pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f6dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f6 ) %]
+ [% IF ( f6dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -685,12 +685,12 @@
<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
<td>
<select name="f7" id="f7" size="1">
- [% IF ( f7pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f7dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f7 ) %]
+ [% IF ( f7dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -889,12 +889,12 @@
<td><label for="f8">Technique (Prints) 1</label></td>
<td>
<select name="f8" id="f8" size="1">
- [% IF ( f8pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f8dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling character</option>
[% END %]
- [% IF ( f8 ) %]
+ [% IF ( f8dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1082,13 +1082,13 @@
<td><label for="f9">Technique (Prints) 2</label></td>
<td>
<select name="f9" id="f9" size="1">
- [% IF ( f9pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f9dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f9 ) %]
+ [% IF ( f9dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1278,13 +1278,13 @@
<td><label for="f10">Technique (Prints) 3</label></td>
<td>
<select name="f10" id="f10" size="1">
- [% IF ( f10pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f10dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f10 ) %]
+ [% IF ( f10dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1472,10 +1472,10 @@
<td><label for="f11">Functional Designation</label></td>
<td>
<select name="f11" id="f11" size="1">
- [% IF ( f11pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f11dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
[% IF ( f11aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
index b42650f..376641a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
@@ -10,10 +10,10 @@
<td><label for="f1">Specific Material Designation</label></td>
<td>
<select name="f1" id="f1" size="1">
- [% IF ( f1pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f1dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
[% IF ( f1aa ) %]
@@ -220,13 +220,13 @@
<td><label for="f2">Material 1</label></td>
<td>
<select name="f2" id="f2" size="1">
- [% IF ( f2pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f2dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f2 ) %]
+ [% IF ( f2dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -399,13 +399,13 @@
<td><label for="f3">Material 2</label></td>
<td>
<select name="f3" id="f3" size="1">
- [% IF ( f3pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f3dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f3 ) %]
+ [% IF ( f3dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -579,12 +579,12 @@
<td><label for="f4">Material 3</label></td>
<td>
<select name="f4" id="f4" size="1">
- [% IF ( f4pipe ) %]
- <option value="|" selected="selected">|- Filling character</option>
+ [% IF ( f4dblpipe ) %]
+ <option value="||" selected="selected">||- Filling characters</option>
[% ELSE %]
- <option value="|">|- Filling character</option>
+ <option value="||">||- Filling characters</option>
[% END %]
- [% IF ( f4 ) %]
+ [% IF ( f4dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
index d072701..09ac0df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
@@ -71,7 +71,7 @@
<td><label for="f4">Relief codes 1:</label></td>
<td>
<select name="f4" id="f4" size="1">
- [% IF ( f4 ) %]
+ [% IF ( f4space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -148,7 +148,7 @@
<td><label for="f5">Relief codes 2:</label></td>
<td>
<select name="f5" id="f5" size="1">
- [% IF ( f5 ) %]
+ [% IF ( f5space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -226,7 +226,7 @@
<td>
<select name="f6" id="f6" size="1">
- [% IF ( f6 ) %]
+ [% IF ( f6space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -304,7 +304,7 @@
<td><label for="f7">Relief codes 4:</label></td>
<td>
<select name="f7" id="f7" size="1">
- [% IF ( f7 ) %]
+ [% IF ( f7space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -661,7 +661,7 @@
</td></tr><tr><td><label for="f9">Prime meridian 1:</label></td>
<td>
<select name="f9" id="f9" size="1">
- [% IF ( f9 ) %]
+ [% IF ( f9dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -901,10 +901,10 @@
<td>
<select name="f10" id="f10" size="1">
- [% IF ( f10 ) %]
+ [% IF ( f10dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
- <option value=" ">non required value</option>
+ <option value=" ">non required value</option>
[% END %]
[% IF ( f10aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
index f43bea8..827c506 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
@@ -27,7 +27,7 @@
<td>
<select name="f2" id="f2" size="1">
- [% IF ( f2 ) %]
+ [% IF ( f2space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -64,7 +64,7 @@
<td><label for="f3">Primary cartographic image 2:</label></td>
<td>
<select name="f3" id="f3" size="1">
- [% IF ( f3 ) %]
+ [% IF ( f3space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
index c8612de..7bee0bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
@@ -10,7 +10,7 @@
<td><label for="f1">Literary Text Indicator:</label></td>
<td>
<select name="f1" id="f1" size="1">
- [% IF ( f1 ) %]
+ [% IF ( f1space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
index e212a05..959e4a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
@@ -415,7 +415,7 @@
<td><label for="f8">Accompanying textual material 1:</label></td>
<td>
<select name="f8" id="f8" size="1">
- [% IF ( f8 ) %]
+ [% IF ( f8space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -502,7 +502,7 @@
<td>
<select name="f9" id="f9" size="1">
- [% IF ( f9 ) %]
+ [% IF ( f9space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -589,7 +589,7 @@
<td>
<select name="f10" id="f10" size="1">
- [% IF ( f10 ) %]
+ [% IF ( f10space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -676,7 +676,7 @@
<td>
<select name="f11" id="f11" size="1">
- [% IF ( f11 ) %]
+ [% IF ( f11space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -762,7 +762,7 @@
<td><label for="f12">Accompanying textual material 5:</label></td>
<td>
<select name="f12" id="f12" size="1">
- [% IF ( f12 ) %]
+ [% IF ( f12space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -848,7 +848,7 @@
<td><label for="f13">Accompanying textual material 6:</label></td>
<td>
<select name="f13" id="f13" size="1">
- [% IF ( f13 ) %]
+ [% IF ( f13space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1038,4 +1038,4 @@
//]]>
</script>
-[% INCLUDE 'popup-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'popup-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
index 7aad5b3..5751b2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
@@ -10,10 +10,10 @@
<td><label for="f1">Instruments ou voix dans un ensemble:</label></td>
<td>
<select name="f1" id="f1" size="1">
- [% IF ( f1pipe ) %]
- <option value="|" selected="selected">|- Caractère de remplissage</option>
+ [% IF ( f1dblpipe ) %]
+ <option value="||" selected="selected">||- Caractères de remplissage</option>
[% ELSE %]
- <option value="|">|- Caractère de remplissage</option>
+ <option value="||">||- Caractères de remplissage</option>
[% END %]
[% IF ( f1ba ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
index 8e66d82..6edba01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
@@ -89,7 +89,7 @@
<td>
<select name="f3" id="f3" size="1">
- [% IF ( f3 ) %]
+ [% IF ( f3space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
index 29b46e4..152c6f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
@@ -11,7 +11,7 @@
<td>
<select name="f1" id="f1" size="1">
- [% IF ( f1 ) %]
+ [% IF ( f1space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
index 0201d04..689e775 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
@@ -10,7 +10,7 @@
<td><label for="f1">Illustration - Book 1:</label></td>
<td>
<select name="f1" id="f1" size="1">
- [% IF ( f1 ) %]
+ [% IF ( f1space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -105,7 +105,7 @@
<td><label for="f2">Illustration - Book 2:</label></td>
<td>
<select name="f2" id="f2" size="1">
- [% IF ( f2 ) %]
+ [% IF ( f2space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -201,7 +201,7 @@
<td><label for="f3">Illustration - Book 3:</label></td>
<td>
<select name="f3" id="f3" size="1">
- [% IF ( f3 ) %]
+ [% IF ( f3space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -297,7 +297,7 @@
<td>
<select name="f4" id="f4" size="1">
- [% IF ( f4 ) %]
+ [% IF ( f4space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -394,7 +394,7 @@
<td>
<select name="f5" id="f5" size="1">
- [% IF ( f5 ) %]
+ [% IF ( f5space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -465,7 +465,7 @@
<td>
<select name="f6" id="f6" size="1">
- [% IF ( f6 ) %]
+ [% IF ( f6space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -537,7 +537,7 @@
<td>
<select name="f7" id="f7" size="1">
- [% IF ( f7 ) %]
+ [% IF ( f7space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -608,7 +608,7 @@
<td>
<select name="f8" id="f8" size="1">
- [% IF ( f8 ) %]
+ [% IF ( f8space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -679,7 +679,7 @@
<td>
<select name="f9" id="f9" size="1">
- [% IF ( f9 ) %]
+ [% IF ( f9space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -732,7 +732,7 @@
<td>
<select name="f10" id="f10" size="1">
- [% IF ( f10 ) %]
+ [% IF ( f10dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -888,7 +888,7 @@
<td>
<select name="f11" id="f11" size="1">
- [% IF ( f11 ) %]
+ [% IF ( f11dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1046,7 +1046,7 @@
<td>
<select name="f12" id="f12" size="1">
- [% IF ( f12 ) %]
+ [% IF ( f12dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1202,7 +1202,7 @@
<td>
<select name="f13" id="f13" size="1">
- [% IF ( f13 ) %]
+ [% IF ( f13dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1358,7 +1358,7 @@
<td>
<select name="f14" id="f14" size="1">
- [% IF ( f14 ) %]
+ [% IF ( f14dblspace ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1527,7 +1527,7 @@
<td>
<select name="f15" id="f15" size="1">
- [% IF ( f15 ) %]
+ [% IF ( f15space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1570,7 +1570,7 @@
<td>
<select name="f16" id="f16" size="1">
- [% IF ( f16 ) %]
+ [% IF ( f16space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
@@ -1611,7 +1611,7 @@
<td>
<select name="f17" id="f17" size="1">
- [% IF ( f17 ) %]
+ [% IF ( f17space ) %]
<option value=" " selected="selected">non required value</option>
[% ELSE %]
<option value=" ">non required value</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
index 24ffc74..6e53881 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
@@ -188,7 +188,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f8 ) %]
+ [% IF ( f8space ) %]
<option value=" " selected="selected"> - Hierarchical relationship undefined</option>
[% ELSE %]
<option value=" "> - Hierarchical relationship undefined</option>
@@ -230,7 +230,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f17 ) %]
+ [% IF ( f17space ) %]
<option value=" " selected="selected"> Full level ("item in hand")</option>
[% ELSE %]
<option value=" "> Full level ("item in hand")</option>
@@ -264,7 +264,7 @@
<option value="|">|- Filling character</option>
[% END %]
- [% IF ( f18 ) %]
+ [% IF ( f18space ) %]
<option value=" " selected="selected"> - In full ISBD form</option>
[% ELSE %]
<option value=" "> - In full ISBD form</option>
--
1.7.2.5
More information about the Koha-patches
mailing list