Minor changes to keep behaviour unchanged if no marcflavour directory.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/installer/install.pl b/installer/install.pl
index ede3ecc..a587249 100755 (executable)
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -373,13 +373,15 @@ elsif ( $step && $step == 3 ) {
         my $langchoice = $query->param('fwklanguage');
         $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
         my $marcflavour = $query->param('marcflavour');
+        if ($marcflavour){    
+          my $request =
+            $dbh->prepare(
+              "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marcflavour','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');"
+            );     
+          $request->execute;
+        };    
         $marcflavour = C4::Context->preference('marcflavour') unless ($marcflavour);
         #Insert into database the selected marcflavour
-        my $request =
-          $dbh->prepare(
-            "INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marcflavour','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');"
-          );
-        $request->execute;
     
         undef $/;
         my $dir =
@@ -396,10 +398,10 @@ elsif ( $step && $step == 3 ) {
         $request->execute;
         my ($frameworksloaded) = $request->fetchrow;
         my %frameworksloaded;
-
         foreach ( split( /\|/, $frameworksloaded ) ) {
             $frameworksloaded{$_} = 1;
         }
+        
         foreach my $requirelevel (@listdir) {
             opendir( MYDIR, "$dir/$requirelevel" );
             my @listname =
@@ -447,9 +449,6 @@ elsif ( $step && $step == 3 ) {
         @listdir = sort grep { !/^\.|CVS|marcflavour/ && -d "$dir/$_" } readdir(MYDIR);
         closedir MYDIR;
         my @levellist;
-        foreach ( split( /\|/, $frameworksloaded ) ) {
-            $frameworksloaded{$_} = 1;
-        }
         foreach my $requirelevel (@listdir) {
             opendir( MYDIR, "$dir/$requirelevel" );
             my @listname =

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
index b291822..203e987 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
@@ -106,6 +106,7 @@
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="op" value="addframeworks" />
     
+    <!--TMPL_IF Name="frameworksloop"-->
     <h2>MARC Frameworks: <!--TMPL_VAR Name="marcflavour"--></h2>
     <!--TMPL_LOOP Name="frameworksloop"-->
     <div>
@@ -130,6 +131,7 @@
     </p>
     <!--/TMPL_LOOP-->
     <h2>Other data</h2>
+    <!--/TMPL_IF -->
     <!--TMPL_LOOP Name="levelloop"-->
     <div>
     <h3><!--TMPL_VAR Name="label"--></h3>