From: Frederic Demians <[email protected]> In Stage MARC Record For Import, after uploading the file to stage, a Character encoding (MARC21/UNIMARC) must be selected for the file. By default, this is MARC21. This patch defaults to marcflavour system preference.
Signed-off-by: Henri-Damien LAURENT <[email protected]> --- .../prog/en/modules/tools/stage-marc-import.tmpl | 19 +++++++++++++------ tools/stage-marc-import.pl | 8 +++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl index 8660db0..ce296e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl @@ -96,12 +96,19 @@ function CheckForm(f) { </li> <li> - <label for="syntax">Character encoding: </label> - <!-- TMPL_IF name="UNIMARC" --> - <select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC" selected="selected">UNIMARC</option></select> - <!-- TMPL_ELSE --> - <select name="syntax" id="syntax"><option value="MARC21" selected="selected">MARC21</option><option value="UNIMARC">UNIMARC</option></select> - <!-- /TMPL_IF --> + <label for="syntax">Marc Flavour: </label> + <select name="syntax" id="syntax"> + <!--TMPL_IF name="syntax_marc21" --> + <option selected="selected" value="MARC21">MARC21</option> + <!--TMPL_ELSE --> + <option value="MARC21">MARC21</option> + <!--/TMPL_IF--> + <!--TMPL_IF name="syntax_unimarc" --> + <option selected="selected" value="UNIMARC">UNIMARC</option> + <!--TMPL_ELSE --> + <option value="UNIMARC">UNIMARC</option> + <!--/TMPL_IF--> + </select> </li> </ol></fieldset> diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl index d8de905..37292de 100755 --- a/tools/stage-marc-import.pl +++ b/tools/stage-marc-import.pl @@ -64,9 +64,11 @@ my ($template, $loggedinuser, $cookie) debug => 1, }); -$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, - uploadmarc => $fileID); - +$template->param( + SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, + uploadmarc => $fileID, + "syntax_" . lc C4::Context->preference('marcflavour') => 1, + ); my %cookies = parse CGI::Cookie($cookie); my $sessionID = $cookies{'CGISESSID'}->value; if ($completedJobID) { -- 1.6.3.3 _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
