diff --git a/search2/indexing/lib/XmlRpcLucene.inc.php b/search2/indexing/lib/XmlRpcLucene.inc.php
new file mode 100755
index 0000000..eb20b27
--- /dev/null
+++ b/search2/indexing/lib/XmlRpcLucene.inc.php
@@ -0,0 +1,213 @@
+<?php
+require_once('xmlrpc.inc');
+
+class XmlRpcLucene
+{
+	var $client;
+
+	/**
+	 * The constructoor for the lucene XMLRPC client.
+	 *
+	 * @param string $url
+	 * @param int $port
+	 */
+	public function __construct($url)
+	{
+		$this->client=new xmlrpc_client("$url/xmlrpc");
+		$this->client->request_charset_encoding = 'UTF-8';
+		$GLOBALS['xmlrpc_internalencoding'] = 'UTF-8';
+	}
+
+	/**
+	 * Set a level for debugging.
+	 *
+	 * @param int $level
+	 */
+	function debug($level)
+	{
+		$this->client->setDebug($level);
+	}
+
+	/**
+	 * Logs errors to the log file
+	 *
+	 * @param xmlrpcresult $result
+	 * @param string $function
+	 */
+	function error($result, $function)
+	{
+		global $default;
+		$default->log->error('XMLRPC Lucene - ' . $function . ' - Code: ' . htmlspecialchars($result->faultCode()));
+		$default->log->error('XMLRPC Lucene - ' . $function . ' - Reason: ' . htmlspecialchars($result->faultString()));
+	}
+
+	/**
+	 * Optimise the lucene index.
+	 *
+	 * @return boolean
+	 */
+	function optimise()
+	{
+		$function=new xmlrpcmsg('indexer.optimise', array());
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'optimise');
+			return false;
+		}
+		return php_xmlrpc_decode($result->value()) == 0;
+	}
+
+	/**
+	 * Add a document to lucene
+	 *
+	 * @param int $documentid
+	 * @param string $contentFile
+	 * @param string $discussion
+	 * @param string $title
+	 * @param string $version
+	 * @return boolean
+	 */
+	function addDocument($documentid, $contentFile, $discussion, $title, $version)
+	{
+		$function=new xmlrpcmsg('indexer.addDocument',
+			array(
+				php_xmlrpc_encode((int) $documentid),
+				php_xmlrpc_encode((string) $contentFile),
+				php_xmlrpc_encode((string) $discussion),
+				php_xmlrpc_encode((string) $title),
+				php_xmlrpc_encode((string) $version)
+			));
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'addDocument');
+			return false;
+		}
+		return php_xmlrpc_decode($result->value()) == 0;
+	}
+
+	/**
+	 * Remove the document from the index.
+	 *
+	 * @param int $documentid
+	 * @return boolean
+	 */
+	function deleteDocument($documentid)
+	{
+		$function=new xmlrpcmsg('indexer.deleteDocument',array(php_xmlrpc_encode((int) $documentid)));
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'deleteDocument');
+			return false;
+		}
+		return php_xmlrpc_decode($result->value()) == 0;
+	}
+
+	/**
+	 * Does the document exist?
+	 *
+	 * @param int $documentid
+	 * @return boolean
+	 */
+	function documentExists($documentid)
+	{
+		$function=new xmlrpcmsg('indexer.documentExists',array(php_xmlrpc_encode((int) $documentid)));
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'deleteDocument');
+			return false;
+		}
+		return php_xmlrpc_decode($result->value());
+	}
+
+	/**
+	 * Get statistics from the indexer
+	 *
+	 * @return array
+	 */
+	function getStatistics()
+	{
+		$function=new xmlrpcmsg('indexer.getStatistics',array());
+
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'getStatistics');
+			return false;
+		}
+
+		$result = php_xmlrpc_decode($result->value());
+
+		//print $result;
+
+		return json_decode($result);
+	}
+
+	/**
+	 * Run a query on the lucene index
+	 *
+	 * @param string $query
+	 * @return boolean
+	 */
+	function query($query)
+	{
+		$function=new xmlrpcmsg('indexer.query',array(php_xmlrpc_encode((string) $query)));
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'query');
+			return false;
+		}
+
+		$result = php_xmlrpc_decode($result->value());
+		return json_decode($result);
+	}
+
+	/**
+	 * Updates the discussion text on a given document.
+	 *
+	 * @param int $docid
+	 * @param string $discussion
+	 * @return boolean
+	 */
+	function updateDiscussion($docid, $discussion)
+	{
+		$function=new xmlrpcmsg('indexer.updateDiscussion',array(
+					php_xmlrpc_encode((int) $docid),
+					php_xmlrpc_encode((string) $discussion)));
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'updateDiscussion');
+			return false;
+		}
+		return php_xmlrpc_decode($result->value()) == 0;
+	}
+
+	function shutdown()
+	{
+		$function=new xmlrpcmsg('indexer.shutdown',array());
+
+		$result=&$this->client->send($function);
+		if($result->faultCode())
+		{
+			$this->error($result, 'shutdown');
+			return false;
+		}
+		return true;
+	}
+
+
+}
+
+?>
\ No newline at end of file