From 5175c45aaffd5900219cc6025cec001d1f4b26a4 Mon Sep 17 00:00:00 2001 From: tipaul Date: Mon, 24 Nov 2003 17:15:55 +0000 Subject: [PATCH] fix for #634 --- .../intranet-tmpl/default/en/acqui.simple/marcimport.tmpl | 4 ++-- koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl | 4 ++-- .../intranet-tmpl/default/en/parameters/z3950servers.tmpl | 2 +- misc/bulkmarcimport.pl | 4 ++-- misc/dumpmarc.pl | 5 +++-- 5 files changed, 10 insertions(+), 9 deletions(-) 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 2bc9e9487f..d36527a757 100644 --- 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 @@ - Character encoding (USMARC or UNIMARC) + Character encoding (MARC21 or UNIMARC) -
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl index f560b79cd7..c84edc393e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl @@ -39,9 +39,9 @@ - Character encoding (USMARC or UNIMARC) + Character encoding (MARC21 or UNIMARC) -
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl index b588f431e9..569beedd51 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl @@ -140,7 +140,7 @@ Syntax (z3950 can send records in various format. Choose one) diff --git a/misc/bulkmarcimport.pl b/misc/bulkmarcimport.pl index 304bc7e06f..9522c71b08 100755 --- 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 2e355e66de..cee3d48408 100755 --- 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 <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"; -- 2.39.5