Merged in from STABLE trunk...

KTS-3596 "Remove old search plugins when upgrading from 3.4.6 to 3.5.3" Fixed. Added removal during upgrade. Committed by: Kevin Fourie Reviewed by: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@9093 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTS-3596 "Remove old search plugins when upgrading from 3.4.6 to 3.5.3" Fixed. Added removal during upgrade. Committed by: Kevin Fourie Reviewed by: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@9093 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 222d2bb9
Showing 3 changed files with 27 additions and 5 deletions
lib/upgrades/UpgradeFunctions.inc.php
sql/mysql/install/data.sql
sql/mysql/upgrade/3.5.3/del_oldsearch_plugins.sql
@@ -61,7 +61,7 @@ class UpgradeFunctions {
             '3.1.6.3' => array('cleanupGroupMembership'),
             '3.5.0' => array('cleanupOldKTAdminVersionNotifier', 'updateConfigFile35', 'registerIndexingTasks'),
             '3.5.2' => array('setStorageEngine','dropForeignKeys','dropPrimaryKeys','dropIndexes','createPrimaryKeys','createForeignKeys','createIndexes', 'removeSlashesFromObjects'),
-            '3.5.3' => array('moveConfigSettingsToDB','removeAdminVersionNotifier','addAutoIncrementToTables')
+            '3.5.3' => array('moveConfigSettingsToDB','removeAdminVersionNotifier','removeOldSearchPlugins','addAutoIncrementToTables')
             );
     var $descriptions = array(
@@ -94,6 +94,7 @@ class UpgradeFunctions {
             'removeSlashesFromObjects'=>'Remove slashes from documents and folders',
             'moveConfigSettingsToDB' => 'Move the configuration settings from the config.ini file into the new database table.',
             'removeAdminVersionNotifier' => 'Remove the old Admin Version Notifier Plugin.',
+            'removeOldSearchPlugins' => 'Remove the old Search Plugins.',
             'addAutoIncrementToTables' => 'Update all db tables to use auto_increment.'
             );
     var $phases = array(
@@ -1307,6 +1308,21 @@ class UpgradeFunctions {
         if(file_exists($oldPath)) return rmdir($oldPath);
     }
     // }}}
+    
+    // {{{  removeOldSearchPlugins
+    function removeOldSearchPlugins() {
+        global $default;
+        $oldPath1 = KT_DIR . "/templates/ktstandard/searchdashlet";
+        if(file_exists($oldPath1)) return rmdir($oldPath1);
+        $oldPath2 = KT_DIR . "/plugins/generalmetadata";
+        if(file_exists($oldPath2)) return rmdir($oldPath2);
+        
+        $oldFile1 = KT_DIR . "/plugins/ktstandard/SearchDashletPlugin.php";
+        if(file_exists($oldFile1)) return unlink($oldFile1);
+        $oldFile2 = KT_DIR . "/plugins/ktstandard/SearchDashlet.php";
+        if(file_exists($oldFile2)) return unlink($oldFile2);
+    }
+    // }}}
 }
 ?>
@@ -1707,9 +1707,11 @@ INSERT INTO `upgrades` VALUES
 (192,'sql*3.5.3*0*3.5.3/db_optimizations.sql','Database optimizations.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
 (193,'sql*3.5.3*0*3.5.3/del_adminversion_plugin.sql','Remove the old Admin Version Notifier.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
 (194,'func*3.5.3*0*removeAdminVersionNotifier','Remove the old Admin Version Notifier files','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
-(195,'sql*3.5.3*0*3.5.3/add_autoinc.sql','Add auto increment to tables SQL.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
-(196,'func*3.5.3*0*addAutoIncrementToTables','Add auto increment.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
-(197,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-03-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3');
+(195,'sql*3.5.3*0*3.5.3/del_oldsearch_plugins.sql','Remove the old Search Plugins SQL.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
+(196,'func*3.5.3*0*removeOldSearchPlugins','Remove the old Search Plugins files','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
+(197,'sql*3.5.3*0*3.5.3/add_autoinc.sql','Add auto increment to tables SQL.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
+(198,'func*3.5.3*0*addAutoIncrementToTables','Add auto increment.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
+(199,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-03-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -2640,7 +2642,7 @@ UNLOCK TABLES;
 LOCK TABLES `zseq_upgrades` WRITE;
 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
 INSERT INTO `zseq_upgrades` VALUES
-(197);
+(199);
 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
+-- Remove from plugins table
+DELETE FROM plugins WHERE namespace = 'ktstandard.searchdashlet.plugin';
+DELETE FROM plugins WHERE namespace = 'ktcore.generalmetadata.plugin';
+