Peter M. Groen / knowledgetree

Commit b8f16bc1c7d39751b71bf967f13238b90cf9f802

Authored by Kevin Fourie
1 parent 2c5e80a0

KTS-3337?"Text extractors using incorrect Python binary because of config.ini op… 

…tion"?Updated. Added all the extenal binaries.??Committed by: Kevin Fourie?Reviewed by: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8494 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 81 additions and 4 deletions
lib/util/ktutil.inc
  View file @b8f16bc
@@ -774,14 +774,64 @@ class KTUtil { @@ -774,14 +774,64 @@ class KTUtil {
774 774
775 switch ($configCommand) 775 switch ($configCommand)
776 { 776 {
777 - case 'externalBinary/php': 777 + case 'externalBinary/xls2cvs':
  778 + if (OS_WINDOWS)
  779 + {
  780 + $script = $stackPath . '/bin/catdoc/xls2csv.exe';
  781 + }
  782 + else
  783 + {
  784 + $script = $stackPath . '/common/bin/xls2csv';
  785 + }
  786 + break;
  787 + case 'externalBinary/pdftotext':;
778 if (OS_WINDOWS) 788 if (OS_WINDOWS)
779 { 789 {
780 - $script = $stackPath . '/php/php.exe'; 790 + $script = $stackPath . '/bin/xpdf/pdftotext.exe';
781 } 791 }
782 else 792 else
783 { 793 {
784 - $script = $stackPath . '/php/bin/php'; 794 + $script = $stackPath . '/common/bin/pdftotext';
  795 + }
  796 + break;
  797 + case 'externalBinary/catppt':
  798 + if (OS_WINDOWS)
  799 + {
  800 + $script = $stackPath . '/bin/catdoc/catppt.exe';
  801 + }
  802 + else
  803 + {
  804 + $script = $stackPath . '/common/bin/catppt';
  805 + }
  806 + break;
  807 + case 'externalBinary/pstotext':
  808 + if (OS_WINDOWS)
  809 + {
  810 + $script = $stackPath . '/bin/pstotext/pstotext.exe';
  811 + }
  812 + else
  813 + {
  814 + $script = $stackPath . '/common/bin/pstotext';
  815 + }
  816 + break;
  817 + case 'externalBinary/catdoc':
  818 + if (OS_WINDOWS)
  819 + {
  820 + $script = $stackPath . '/bin/catdoc/catdoc.exe';
  821 + }
  822 + else
  823 + {
  824 + $script = $stackPath . '/common/bin/catdoc';
  825 + }
  826 + break;
  827 + case 'externalBinary/antiword':
  828 + if (OS_WINDOWS)
  829 + {
  830 + $script = $stackPath . '/bin/antiword/antiword.exe';
  831 + }
  832 + else
  833 + {
  834 + $script = $stackPath . '/common/bin/antiword';
785 } 835 }
786 break; 836 break;
787 case 'externalBinary/python': 837 case 'externalBinary/python':
@@ -795,7 +845,34 @@ class KTUtil { @@ -795,7 +845,34 @@ class KTUtil {
795 } 845 }
796 break; 846 break;
797 case 'externalBinary/java': 847 case 'externalBinary/java':
798 - $script = $stackPath . '/j2re/bin/java'; 848 + if (OS_WINDOWS)
  849 + {
  850 + $script = $stackPath . '/java/jre/bin/java.exe';
  851 + }
  852 + else
  853 + {
  854 + $script = $stackPath . '/java/jre/bin/java';
  855 + }
  856 + break;
  857 + case 'externalBinary/df':
  858 + if (OS_WINDOWS)
  859 + {
  860 + $script = $stackPath . '/bin/gnuwin32/df.exe';
  861 + }
  862 + else
  863 + {
  864 + $script = $stackPath . '/common/bin/df';
  865 + }
  866 + break;
  867 + case 'externalBinary/php':
  868 + if (OS_WINDOWS)
  869 + {
  870 + $script = $stackPath . '/php/php.exe';
  871 + }
  872 + else
  873 + {
  874 + $script = $stackPath . '/php/bin/php';
  875 + }
799 break; 876 break;
800 default: 877 default:
801 return null; 878 return null;