@@ -, +, @@
scripts
---
cataloguing/value_builder/EXAMPLE.pl | 13 ++++++++-----
cataloguing/value_builder/barcode.pl | 6 ++----
cataloguing/value_builder/barcode_manual.pl | 6 ++----
cataloguing/value_builder/callnumber-KU.pl | 2 +-
cataloguing/value_builder/callnumber.pl | 2 +-
cataloguing/value_builder/cn_browser.pl | 4 +---
cataloguing/value_builder/dateaccessioned.pl | 4 ++--
cataloguing/value_builder/macles.pl | 4 +---
cataloguing/value_builder/marc21_field_005.pl | 6 ++----
cataloguing/value_builder/marc21_field_006.pl | 4 +---
cataloguing/value_builder/marc21_field_007.pl | 4 +---
cataloguing/value_builder/marc21_field_008.pl | 4 +---
cataloguing/value_builder/marc21_field_008_authorities.pl | 4 +---
.../value_builder/marc21_field_008_classifications.pl | 4 +---
cataloguing/value_builder/marc21_field_245h.pl | 6 ++----
cataloguing/value_builder/marc21_leader.pl | 4 +---
cataloguing/value_builder/marc21_leader_authorities.pl | 6 ++----
cataloguing/value_builder/marc21_linking_section.pl | 2 +-
cataloguing/value_builder/marc21_orgcode.pl | 4 +---
cataloguing/value_builder/normarc_field_007.pl | 4 +---
cataloguing/value_builder/normarc_field_008.pl | 4 +---
cataloguing/value_builder/normarc_leader.pl | 4 +---
cataloguing/value_builder/stocknumber.pl | 4 +---
cataloguing/value_builder/stocknumberam123.pl | 2 +-
cataloguing/value_builder/unimarc_field_010.pl | 2 +-
cataloguing/value_builder/unimarc_field_100.pl | 2 +-
cataloguing/value_builder/unimarc_field_100_authorities.pl | 2 +-
cataloguing/value_builder/unimarc_field_105.pl | 2 +-
cataloguing/value_builder/unimarc_field_110.pl | 2 +-
cataloguing/value_builder/unimarc_field_115a.pl | 2 +-
cataloguing/value_builder/unimarc_field_115b.pl | 2 +-
cataloguing/value_builder/unimarc_field_210c.pl | 2 +-
cataloguing/value_builder/unimarc_field_210c_bis.pl | 2 +-
cataloguing/value_builder/unimarc_field_225a.pl | 4 ++--
cataloguing/value_builder/unimarc_field_225a_bis.pl | 2 +-
cataloguing/value_builder/unimarc_field_4XX.pl | 2 +-
cataloguing/value_builder/upload.pl | 2 +-
37 files changed, 51 insertions(+), 84 deletions(-)
--- a/cataloguing/value_builder/EXAMPLE.pl
+++ a/cataloguing/value_builder/EXAMPLE.pl
@@ -50,6 +50,9 @@ use C4::Output;
# into the event data parameter; Focus e.g. uses that one again by looking at
# the variable event.data.id.
#
+# Comments in JavaScript must be multi-line style ( /* ... */ ) in case
+# the JavaScript block is collapsed by the template
+#
# Do not use the perl variable $id to extract the field value. Use variable
# event.data.id. This makes a difference when the field is cloned or has
# been created dynamically (as in additem.js).
@@ -59,7 +62,7 @@ my $builder= sub {
my $id = $params->{id};
return qq|
-|;
};
--- a/cataloguing/value_builder/barcode.pl
+++ a/cataloguing/value_builder/barcode.pl
@@ -47,7 +47,7 @@ my $builder = sub {
warn "Barcode type = $autoBarcodeType" if $DEBUG;
if ((not $autoBarcodeType) or $autoBarcodeType eq 'OFF') {
# don't return a value unless we have the appropriate syspref set
- return q||;
+ return q||;
}
if ($autoBarcodeType eq 'annual') {
($nextnum, $scr) = C4::Barcodes::ValueBuilder::annual::get_barcode(\%args);
@@ -89,8 +89,7 @@ if (\$('#' + id).val() == '' || force) {
END_OF_JS
my $js = <
-//
function Focus$function_name(id, force) {
$scr
@@ -100,7 +99,6 @@ function Click$function_name(id) {
Focus$function_name(id, 1);
return false;
}
-//]]>
END_OF_JS
return $js;
--- a/cataloguing/value_builder/barcode_manual.pl
+++ a/cataloguing/value_builder/barcode_manual.pl
@@ -48,7 +48,7 @@ my $builder = sub {
warn "Barcode type = $autoBarcodeType" if $DEBUG;
if ((not $autoBarcodeType) or $autoBarcodeType eq 'OFF') {
# don't return a value unless we have the appropriate syspref set
- return q||;
+ return q||;
}
if ($autoBarcodeType eq 'annual') {
($nextnum, $scr) = C4::Barcodes::ValueBuilder::annual::get_barcode(\%args);
@@ -68,14 +68,12 @@ my $builder = sub {
END_OF_JS
my $js = <
- //
function Click$function_name(id) {
$scr
return false;
}
- //]]>
END_OF_JS
return $js;
--- a/cataloguing/value_builder/callnumber-KU.pl
+++ a/cataloguing/value_builder/callnumber-KU.pl
@@ -45,7 +45,7 @@ CCC QW - returns first unused number CCC QWxx starting with CCC QW01
my $builder = sub {
my ( $params ) = @_;
my $res="
-
";
return $res;
--- a/cataloguing/value_builder/dateaccessioned.pl
+++ a/cataloguing/value_builder/dateaccessioned.pl
@@ -31,7 +31,7 @@ my $builder = sub {
my $res = <
-// from: cataloguing/value_builder/dateaccessioned.pl
+/* from: cataloguing/value_builder/dateaccessioned.pl */
\$(document).ready(function(){
\$("#$function_name").datepicker({
@@ -51,7 +51,7 @@ function Click$function_name(event) {
}
function set_to_today( id, force ) {
- // The force parameter is used in Click but not in Focus !
+ /* The force parameter is used in Click but not in Focus ! */
if (! id) { alert(_("Bad id ") + id + _(" sent to set_to_today()")); return 0; }
if (\$("#" + id).val() == '' || \$("#" + id).val() == '0000-00-00' || force ) {
\$("#" + id).val("$date");
--- a/cataloguing/value_builder/macles.pl
+++ a/cataloguing/value_builder/macles.pl
@@ -30,12 +30,10 @@ my $builder = sub {
my ( $params ) = @_;
my $function_name = $params->{id};
my $res="
-
";
return $res;
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ a/cataloguing/value_builder/marc21_field_005.pl
@@ -30,18 +30,16 @@ my $builder = sub {
my $date = sprintf("%4d%02d%02d%02d%02d%04.1f",@a);
my $res = "
-
";
return $res;
};
-return { builder => $builder };
+return { builder => $builder };
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ a/cataloguing/value_builder/marc21_field_006.pl
@@ -33,15 +33,13 @@ my $builder = sub {
my ( $params ) = @_;
my $function_name = $params->{id};
my $res = "
-
";
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ a/cataloguing/value_builder/marc21_field_007.pl
@@ -32,15 +32,13 @@ my $builder = sub {
my ( $params ) = @_;
my $function_name = $params->{id};
my $res = "
-
";
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ a/cataloguing/value_builder/marc21_field_008.pl
@@ -42,8 +42,7 @@ my $builder = sub {
my $function_name = $params->{id};
my $dateentered = date_entered();
my $res = "
-
";
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ a/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -37,8 +37,7 @@ my $builder = sub {
my $dateentered = date_entered();
my $defaultval = substr( C4::Context->preference(PREF_008) || FIXLEN_DATA_ELTS, 0, 34 );
my $res="
-
";
--- a/cataloguing/value_builder/marc21_field_008_classifications.pl
+++ a/cataloguing/value_builder/marc21_field_008_classifications.pl
@@ -32,8 +32,7 @@ my $builder = sub {
my $dateentered = date_entered();
my $defaultval = FIXLEN_DATA_ELTS;
my $res="
-
";
--- a/cataloguing/value_builder/marc21_field_245h.pl
+++ a/cataloguing/value_builder/marc21_field_245h.pl
@@ -27,8 +27,7 @@ my $builder = sub {
my $function_name = $params->{id};
my $res = "
-
";
return $res;
};
-return { builder => $builder };
+return { builder => $builder };
--- a/cataloguing/value_builder/marc21_leader.pl
+++ a/cataloguing/value_builder/marc21_leader.pl
@@ -30,8 +30,7 @@ my $builder = sub {
my ( $params ) = @_;
my $function_name = $params->{id};
my $res = "
-
";
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ a/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -32,8 +32,7 @@ my $builder = sub {
my ( $params ) = @_;
my $function_name = $params->{id};
my $res = "
-
";
@@ -91,4 +89,4 @@ my $launcher = sub {
output_html_with_http_headers $input, $cookie, $template->output;
};
-return { builder => $builder, launcher => $launcher };
+return { builder => $builder, launcher => $launcher };
--- a/cataloguing/value_builder/marc21_linking_section.pl
+++ a/cataloguing/value_builder/marc21_linking_section.pl
@@ -41,7 +41,7 @@ my $builder = sub {
my ( $params ) = @_;
my $function_name = $params->{id};
my $res = "
-
HERE
};
--- a/cataloguing/value_builder/normarc_field_007.pl
+++ a/cataloguing/value_builder/normarc_field_007.pl
@@ -29,15 +29,13 @@ sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= $field_number;
my $res="
-
";
--- a/cataloguing/value_builder/normarc_field_008.pl
+++ a/cataloguing/value_builder/normarc_field_008.pl
@@ -39,8 +39,7 @@ sub plugin_javascript {
my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_;
my $function_name = $field_number;
my $res = "
-
";
--- a/cataloguing/value_builder/normarc_leader.pl
+++ a/cataloguing/value_builder/normarc_leader.pl
@@ -31,8 +31,7 @@ sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= $field_number;
my $res="
-
";
--- a/cataloguing/value_builder/stocknumber.pl
+++ a/cataloguing/value_builder/stocknumber.pl
@@ -37,8 +37,7 @@ my $builder = sub {
$nextnum = $branchcode.'_'.$nextnum;
my $js = <
-//
function Focus$function_name(id, force) {
if (\$('#' + id).val() == '' || force) {
@@ -50,7 +49,6 @@ function Click$function_name(event) {
Focus$function_name(event.data.id, 1);
return false;
}
-//]]>
END_OF_JS
return $js;
--- a/cataloguing/value_builder/stocknumberam123.pl
+++ a/cataloguing/value_builder/stocknumberam123.pl
@@ -43,7 +43,7 @@ In this case, a stocknumber has this form : "PREFIX 0009678570".
my $builder = sub {
my ( $params ) = @_;
my $res="
-