[Koha-patches] [PATCH] Use marcflavour in Stage MARC Records For Import

[Frederic Demians]

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.
---
 .../prog/en/modules/tools/stage-marc-import.tmpl   |    5 ++++-
 tools/stage-marc-import.pl                         |    8 +++++---
 2 files changed, 9 insertions(+), 4 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 46ea5d8..0ef8361 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
@@ -97,7 +97,10 @@ function CheckForm(f) {
 	</li>
 	<li>
 		<label for="syntax">Character encoding: </label>
-		<select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
+		<select name="syntax" id="syntax">
+        <option<!--TMPL_IF name="syntax_marc21" --> selected="selected"<!-- /TMPL_IF -->>MARC21</option>
+        <option <!--TMPL_IF name="syntax_unimarc" --> selected="selected"<!-- /TMPL_IF -->>UNIMARC</option>
+        </select>
 		
 	</li>
 </ol></fieldset>
diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index 9c09d8c..899bac8 100755
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -65,9 +65,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.5.5.GIT