View | Details | Raw Unified | Return to bug 5997
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl (-6 / +13 lines)
Lines 96-107 function CheckForm(f) { Link Here
96
96
97 
	</li>
 97 
	</li>
98 
	<li>
 98 
	<li>
99 
		<label for="syntax">Character encoding: </label>
 99 
		<label for="syntax">Marc Flavour: </label>
100 
        <!-- TMPL_IF name="UNIMARC" -->
 100 
		<select name="syntax" id="syntax">
101 
            <select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC" selected="selected">UNIMARC</option></select>
 101 
        <!--TMPL_IF name="syntax_marc21" -->
102 
        <!-- TMPL_ELSE -->
 102 
        <option selected="selected" value="MARC21">MARC21</option>
103 
            <select name="syntax" id="syntax"><option value="MARC21" selected="selected">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
 103 
        <!--TMPL_ELSE -->
104 
        <!-- /TMPL_IF -->
 104 
        <option value="MARC21">MARC21</option>
105 
        <!--/TMPL_IF-->
106 
        <!--TMPL_IF name="syntax_unimarc" -->
107 
        <option selected="selected" value="UNIMARC">UNIMARC</option>
108 
        <!--TMPL_ELSE -->
109 
        <option value="UNIMARC">UNIMARC</option>
110 
        <!--/TMPL_IF-->
111 
        </select>
105
112
106 
	</li>
 113 
	</li>
107 
</ol></fieldset>
 114 
</ol></fieldset>
(-)a/tools/stage-marc-import.pl (-4 / +5 lines)
Lines 65-73 my ($template, $loggedinuser, $cookie) Link Here
65 
					debug => 1,
 65 
					debug => 1,
66 
					});
 66 
					});
67 

          67
          

        

          
            

              68
              
$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},


              68
              
$template->param(

            

            

              69
              
						uploadmarc => $fileID);


              69
              
    SCRIPT_NAME => $ENV{'SCRIPT_NAME'},

            

            

              70
              


              70
              
    uploadmarc  => $fileID,

            

            

              
              

              71
              
    "syntax_" . lc C4::Context->preference('marcflavour') => 1,

            

            


              72
              
    );

            

        

          71
          
my %cookies = parse CGI::Cookie($cookie);

          73
          
my %cookies = parse CGI::Cookie($cookie);

        

        

          72
          
my $sessionID = $cookies{'CGISESSID'}->value;

          74
          
my $sessionID = $cookies{'CGISESSID'}->value;

        

        

          73
          
if ($completedJobID) {

          75
          
if ($completedJobID) {

        

            

              74
              
- 

              
              
            






  

  Return to bug 5997