Peter M. Groen / knowledgetree

Commit acd0539e06fd8046e3e2629b371fc641a3012a51

Authored by Jarrett Jordaan
1 parent 23a3796d

And some more path issues 

Committed by: Jarrett Jordaan

Reviewed by: Prince Mbekwa
Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
setup/wizard/installUtil.php
  View file @acd0539
... ... @@ -768,12 +768,11 @@ class InstallUtil {
768 768 $sysdir = explode(DS, SYSTEM_DIR);
769 769 array_pop($sysdir);
770 770 array_pop($sysdir);
771   - array_pop($sysdir);
772 771 $zendsys = '';
773 772 foreach ($sysdir as $v) {
774 773 $zendsys .= $v.DS;
775 774 }
776   - $jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll";
  775 + $jvm = $zendsys."java".DS."jre".DS."bin".DS."java.exe";
777 776 if(file_exists($jvm))
778 777 return $jvm;
779 778 } else {
... ...
setup/wizard/lib/services/windowsLucene.php
  View file @acd0539
... ... @@ -348,6 +348,8 @@ class windowsLucene extends windowsService {
348 348 * @return void
349 349 */
350 350 private function setJavaJVM() {
  351 + $this->javaJVM = SYSTEM_ROOT . "java\jre\bin\client\jvm.dll";
  352 + /*
351 353 if(file_exists($this->getJavaBin().DS."client".DS."jvm.dll")) {
352 354 $this->javaJVM = $this->getJavaBin().DS."client".DS."jvm.dll";
353 355 } elseif (file_exists($this->getJavaBin().DS."server".DS."jvm.dll")) {
... ... @@ -362,6 +364,7 @@ class windowsLucene extends windowsService {
362 364 $this->javaJVM = $javaJVM;
363 365 }
364 366 }
  367 + */
365 368 }
366 369  
367 370 public function useZendJVM() {
... ... @@ -392,6 +395,7 @@ class windowsLucene extends windowsService {
392 395 * @return string
393 396 */
394 397 public function getJavaJVM() {
  398 + $this->javaJVM = SYSTEM_ROOT . "java\jre\bin\client\jvm.dll";
395 399 return SYSTEM_ROOT . "java\jre\bin\client\jvm.dll"; // Hard code
396 400 //return $this->javaJVM; // TODO: PUT BACK!!!
397 401 }
... ... @@ -413,7 +417,7 @@ class windowsLucene extends windowsService {
413 417 */
414 418 public function install() {
415 419 $state = $this->status();
416   - if($state == '') {
  420 +// if($state == '') {
417 421 $luceneExe = $this->getLuceneExe();
418 422 $luceneSource = $this->getLuceneSource();
419 423 $luceneDir = $this->getluceneDir();
... ... @@ -428,7 +432,7 @@ class windowsLucene extends windowsService {
428 432 // return $response;
429 433 // }
430 434 return $state;
431   - }
  435 +// }
432 436  
433 437 return $state;
434 438 }
... ...