Merge remote branch 'kc/new/enh/bug_5106' into kcmaster

[koha.git] / installer / data / mysql / update22to30.pl

diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl
index 9d2b9ef..76bb3c2 100755 (executable)
--- a/installer/data/mysql/update22to30.pl
+++ b/installer/data/mysql/update22to30.pl
@@ -4,7 +4,7 @@
 # Database Updater
 # This script checks for required updates to the database.
 
-# Part of the Koha Library Software www.koha.org
+# Part of the Koha Library Software www.koha-community.org
 # Licensed under the GPL.
 
 # Bugs/ToDo:
@@ -12,6 +12,7 @@
 
 # NOTE:  If you do something more than once in here, make it table driven.
 use strict;
+#use warnings; FIXME - Bug 2505
 
 # CPAN modules
 use DBI;
@@ -445,10 +446,10 @@ my $DBversion = "3.00.00.000";
         {
                 uniquefieldrequired => 'variable',
                 variable            => 'OpacTopissue',
-                value               => '1',
+                value               => '0',
                 forceupdate         => { 'explanation' => 1,
                                         'type' => 1},
-                explanation         => 'Enable / Disable the top issue link on OPAC',
+                explanation         => 'If ON, enables the \'most popular items\' link on OPAC. Warning, this is an EXPERIMENTAL feature, turning ON may overload your server',
                 type                => 'YesNo',
             },
         {
@@ -3500,7 +3501,7 @@ my $DBversion = "3.00.00.000";
     
     # at last, remove useless fields
     foreach $table ( keys %uselessfields ) {
-        my @fields = split /,/,$uselessfields{$table};
+        my @fields = split (/,/,$uselessfields{$table});
         my $fields;
         my $exists;
         foreach my $fieldtodrop (@fields) {
@@ -3526,20 +3527,23 @@ my $DBversion = "3.00.00.000";
     #
     $sth=$dbh->prepare("ALTER TABLE `aqbookfund` DROP PRIMARY KEY , ADD PRIMARY KEY ( `bookfundid` , `branchcode` ) ;");
     $sth->execute;
+    $sth->finish;
    
     # drop extra key on borrowers.borrowernumber
     $dbh->do("ALTER TABLE borrowers DROP KEY borrowernumber"); 
-
-    $sth->finish;
+    
+    # update enrolmentperiod
+    $dbh->do("UPDATE categories SET enrolmentperiod = enrolmentperiod * 12");
+    
     print "upgrade to Koha 3.0 done\n";
     SetVersion ($DBversion);
 
-
-=item GetDefaultClause
+=head1 GetDefaultClause
 
 Generate a default clause (for an ALTER TABLE command)
 
 =cut
+
 sub GetDefaultClause {
     my $default = shift;
 
@@ -3550,11 +3554,11 @@ sub GetDefaultClause {
     return "default " . $dbh->quote($default);
 }
 
-=item TransformToNum
+=head1 TransformToNum
+
+Transform the Koha version from a 4 parts string
+to a number, with just 1.
 
-  Transform the Koha version from a 4 parts string
-  to a number, with just 1 .
-  
 =cut
 
 sub TransformToNum {
@@ -3564,8 +3568,10 @@ sub TransformToNum {
     return $version;
 }
 
-=item SetVersion
-    set the DBversion in the systempreferences
+=head1 SetVersion
+
+set the DBversion in the systempreferences
+
 =cut
 
 sub SetVersion {