Commit 9ac69ad3100787b914f02fd777889fc708c17097

Authored by kevin_fourie
1 parent fdead555

KTS-3166

"On certain systems the external binaries are not found after upgrade"
Fixed. Added full path to upgrade installer function. NOTE: This will only work for pre 3.5.2 upgrades.

Committed By: Kevin Fourie
Reviewed By: Philip Arkcoll

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8254 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/upgrades/UpgradeFunctions.inc.php
@@ -60,6 +60,7 @@ class UpgradeFunctions { @@ -60,6 +60,7 @@ class UpgradeFunctions {
60 '3.1.6.3' => array('cleanupGroupMembership'), 60 '3.1.6.3' => array('cleanupGroupMembership'),
61 '3.5.0' => array('cleanupOldKTAdminVersionNotifier', 'updateConfigFile35', 'registerIndexingTasks'), 61 '3.5.0' => array('cleanupOldKTAdminVersionNotifier', 'updateConfigFile35', 'registerIndexingTasks'),
62 '3.5.2' => array('setStorageEngine','dropForeignKeys','dropPrimaryKeys','dropIndexes','createPrimaryKeys','createForeignKeys','createIndexes', 'removeSlashesFromObjects'), 62 '3.5.2' => array('setStorageEngine','dropForeignKeys','dropPrimaryKeys','dropIndexes','createPrimaryKeys','createForeignKeys','createIndexes', 'removeSlashesFromObjects'),
  63 + '3.5.2a' => array('updateConfigFile35'),
63 ); 64 );
64 65
65 var $descriptions = array( 66 var $descriptions = array(
@@ -1055,16 +1056,16 @@ class UpgradeFunctions { @@ -1055,16 +1056,16 @@ class UpgradeFunctions {
1055 $ini->addItem('externalBinary', 'df', KT_STACK_DIR . '/bin/gnuwin32/df.exe'); 1056 $ini->addItem('externalBinary', 'df', KT_STACK_DIR . '/bin/gnuwin32/df.exe');
1056 1057
1057 } else { 1058 } else {
1058 - $ini->addItem('externalBinary', 'xls2csv', 'xls2csv', '', 'The following are external binaries that may be used by various parts of knowledgeTree.');  
1059 - $ini->addItem('externalBinary', 'pdftotext', 'pdftotext');  
1060 - $ini->addItem('externalBinary', 'catppt', 'catppt');  
1061 - $ini->addItem('externalBinary', 'pstotext', 'pstotext');  
1062 - $ini->addItem('externalBinary', 'catdoc', 'catdoc');  
1063 - $ini->addItem('externalBinary', 'antiword', 'antiword');  
1064 - $ini->addItem('externalBinary', 'python', 'python');  
1065 - $ini->addItem('externalBinary', 'java', 'java');  
1066 - $ini->addItem('externalBinary', 'php', 'php');  
1067 - $ini->addItem('externalBinary', 'df', 'df'); 1059 + $ini->addItem('externalBinary', 'xls2csv', KT_STACK_DIR . '/common/bin/xls2csv', '', 'The following are external binaries that may be used by various parts of knowledgeTree.');
  1060 + $ini->addItem('externalBinary', 'pdftotext', KT_STACK_DIR . '/common/bin/pdftotext');
  1061 + $ini->addItem('externalBinary', 'catppt', KT_STACK_DIR . '/common/bin/catppt');
  1062 + $ini->addItem('externalBinary', 'pstotext', KT_STACK_DIR . '/common/bin/pstotext');
  1063 + $ini->addItem('externalBinary', 'catdoc', KT_STACK_DIR . '/common/bin/catdoc');
  1064 + $ini->addItem('externalBinary', 'antiword', KT_STACK_DIR . '/common/bin/antiword');
  1065 + $ini->addItem('externalBinary', 'python', KT_STACK_DIR . '/openoffice/program/python');
  1066 + $ini->addItem('externalBinary', 'java', KT_STACK_DIR . '/java/jre/bin/java');
  1067 + $ini->addItem('externalBinary', 'php', KT_STACK_DIR . '/php/bin/php');
  1068 + $ini->addItem('externalBinary', 'df', KT_STACK_DIR . '/common/bin/df');
1068 } 1069 }
1069 1070
1070 // search Section 1071 // search Section