fix for #634

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl
index 2bc9e94..d36527a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl
@@ -39,9 +39,9 @@
                </td>
        </tr>
        <tr valign="top">
-               <td>Character encoding (USMARC or UNIMARC)</td>
+               <td>Character encoding (MARC21 or UNIMARC)</td>
                <td>
-                       <select name="syntax"/><option value="USMARC">USMARC</option><option value="UNIMARC">UNIMARC</option></select><br/>
+                       <select name="syntax"/><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
                </td>
        </tr>
        <tr valign="top">

diff --git a/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl
index f560b79..c84edc3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl
@@ -39,9 +39,9 @@
                </td>
        </tr>
        <tr valign="top">
-               <td>Character encoding (USMARC or UNIMARC)</td>
+               <td>Character encoding (MARC21 or UNIMARC)</td>
                <td>
-                       <select name="syntax"><option value="USMARC">USMARC</option><option value="UNIMARC">UNIMARC</option></select><br/>
+                       <select name="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
                </td>
        </tr>
        <tr valign="top">

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
index b588f43..569beed 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
@@ -140,7 +140,7 @@
                        <td>Syntax (z3950 can send records in various format. Choose one)</td>
                        <td>
                                <select name="syntax">
-                                       <option value="USMARC">USMARC</option>
+                                       <option value="MARC21">MARC21</option>
                                        <option value="UNIMARC">UNIMARC</option>
                                </select>
                        </td>

diff --git a/misc/bulkmarcimport.pl b/misc/bulkmarcimport.pl
index 304bc7e..9522c71 100755 (executable)
--- a/misc/bulkmarcimport.pl
+++ b/misc/bulkmarcimport.pl
@@ -33,7 +33,7 @@ parameters :
 \tv : verbose mode. 1 means "some infos", 2 means "MARC dumping"
 \tn : the number of the record to import. If missing, all the file is imported
 \tt : test mode : parses the file, saying what he would do, but doing nothing.
-\tc : the char encoding. At the moment, only USMARC and UNIMARC supported. USMARC by default.
+\tc : the char encoding. At the moment, only MARC21 and UNIMARC supported. MARC21 by default.
 \d : delete EVERYTHING related to biblio in koha-DB before import  :tables :
 \t\tbiblio, \t\tbiblioitems, \t\tsubjects,\titems
 \t\tadditionalauthors, \tbibliosubtitles, \tmarc_biblio,
@@ -65,7 +65,7 @@ if ($delete) {
 if ($test_parameter) {
        print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
 }
-$char_encoding = 'USMARC' unless ($char_encoding);
+$char_encoding = 'MARC21' unless ($char_encoding);
 print "CHAR : $char_encoding\n" if $verbose;
 my $starttime = gettimeofday;
 my $batch = MARC::Batch->new( 'USMARC', $input_marc_file );

diff --git a/misc/dumpmarc.pl b/misc/dumpmarc.pl
index 2e355e6..cee3d48 100755 (executable)
--- a/misc/dumpmarc.pl
+++ b/misc/dumpmarc.pl
@@ -14,10 +14,11 @@ my ( $input_marc_file,$number) = ('',0);
 my $version;
 GetOptions(
     'file:s'    => \$input_marc_file,
-    'n' => \$number,
+    'n:s' => \$number,
     'v' => \$version
 );
 
+warn "NUM : $number\n";
 if ($version || ($input_marc_file eq '')) {
        print <<EOF
 small script to dump an iso2709 file.
@@ -36,7 +37,7 @@ $batch->warnings_off();
 $batch->strict_off();
 my $i=1;
 while ( my $record = $batch->next() ) {
-       print "\n".$record->as_formatted() if ($i eq $number || $number eq 0);
+       print "\nNUMBER $i =>\n".$record->as_formatted() if ($i eq $number || $number eq 0);
        $i++;
 }
 print "\n==================\n$i record parsed\n";