From 26710a4f00432290103b7eb934392430c67ff35f Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Fri, 27 Nov 2009 17:07:41 +0200
Subject: [PATCH] Windows service update.

---
 setup/wizard/lib/services/unixLucene.php    |  2 +-
 setup/wizard/lib/services/windowsLucene.php | 44 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php
index 4a488c8..ea5c97d 100644
--- a/setup/wizard/lib/services/unixLucene.php
+++ b/setup/wizard/lib/services/unixLucene.php
@@ -255,7 +255,7 @@ class unixLucene extends unixService {
 		$content .= "indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer\n";
 		fwrite($fp, $content);
 		fclose($fp);
-		@chmod($fileLoc, 0644);
+		chmod($fileLoc, 0644);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php
index a370651..4a8c4a2 100644
--- a/setup/wizard/lib/services/windowsLucene.php
+++ b/setup/wizard/lib/services/windowsLucene.php
@@ -421,15 +421,16 @@ class windowsLucene extends windowsService {
  	*/
 	public function install() {
 		$state = $this->status();
-			$luceneExe = $this->getLuceneExe();
-			$luceneSource = $this->getLuceneSource();
-			$luceneDir = $this->getluceneDir();
-			$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
-        	if(DEBUG) {
-        		echo "$cmd<br/>";
-        		return false;
-        	}
-        	$this->writeLuceneInstall($cmd);
+		$this->writeLuceneProperties();
+		$luceneExe = $this->getLuceneExe();
+		$luceneSource = $this->getLuceneSource();
+		$luceneDir = $this->getluceneDir();
+		$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
+    	if(DEBUG) {
+    		echo "$cmd<br/>";
+    		return false;
+    	}
+    	$this->writeLuceneInstall($cmd);
 		return $state;
 	}
 
@@ -471,5 +472,30 @@ class windowsLucene extends windowsService {
 	public function getStopMsg($installDir) {
 		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
 	}
+	
+	/**
+	* Write Lucene Service property file
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return string
+	*/
+	private function writeLuceneProperties() {
+		// Check if bin is readable and writable
+		$fileLoc = $this->getluceneDir()."KnowledgeTreeIndexer.properties";
+		$fp = fopen($fileLoc, "w+");
+		$content = "server.port=8875\n";
+		$content .= "server.paranoid=false\n";
+		$content .= "server.accept=127.0.0.1\n";
+		$content .= "server.deny=\n";
+		$conf = $this->util->getDataFromSession('configuration');
+		$varDirectory = $conf['paths']['varDirectory']['path'];
+		$content .= "indexer.directory=$varDirectory\n";
+		$content .= "indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer\n";
+		fwrite($fp, $content);
+		fclose($fp);
+		chmod($fileLoc, 0644);
+	}
 }
 ?>
\ No newline at end of file
--
libgit2 0.21.4