Merged in from DEV trunk...

WSA-72 "Add missing fields to document detail structure in web services" Updated. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-2730 "When adding a document, the document util's add function dies on encountering an unlink" Updated. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-49 "Add missing fields to search structure in web services" Updated. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie WSA-78 "download manager does not construct a full url for the webservice download" Fixed. Committed By: Conrad Vermeulen Reviewed By: Martin Kirsten KTS-2734 "sanitize to html removes information from data stored in the database. It was discovered that slashes were removed" Updated. Committed By: Conrad Vermeulen Reviewed By: Philip Arckoll KTS-2735 "Metadata values should not be sanitized until display on whichever interface." Updated. Committed By: Conrad Vermeulen Reviewed By: Philip Arckoll WSA-76 "Update unit tests for document detail in web service" Updated. Added missing fields. WSA-79 "cater for custom_document_no and oem_document_id in webservices" Updated. Added placeholders for future use. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.5-Release-Branch@7766 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
WSA-72 "Add missing fields to document detail structure in web services" Updated. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-2730 "When adding a document, the document util's add function dies on encountering an unlink" Updated. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-49 "Add missing fields to search structure in web services" Updated. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie WSA-78 "download manager does not construct a full url for the webservice download" Fixed. Committed By: Conrad Vermeulen Reviewed By: Martin Kirsten KTS-2734 "sanitize to html removes information from data stored in the database. It was discovered that slashes were removed" Updated. Committed By: Conrad Vermeulen Reviewed By: Philip Arckoll KTS-2735 "Metadata values should not be sanitized until display on whichever interface." Updated. Committed By: Conrad Vermeulen Reviewed By: Philip Arckoll WSA-76 "Update unit tests for document detail in web service" Updated. Added missing fields. WSA-79 "cater for custom_document_no and oem_document_id in webservices" Updated. Added placeholders for future use. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.5-Release-Branch@7766 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent e456bb95
Showing 26 changed files with 3266 additions and 166 deletions
ktapi/KTAPIDocument.inc.php
ktapi/KTAPIFolder.inc.php
ktwebservice/nunit/README
ktwebservice/nunit/authentication.cs
ktwebservice/nunit/document_add.cs
ktwebservice/nunit/document_checkout.cs
ktwebservice/nunit/document_contents.cs
ktwebservice/nunit/document_copy.cs
ktwebservice/nunit/document_detail.cs
ktwebservice/nunit/document_download.cs
ktwebservice/nunit/document_history.cs
ktwebservice/nunit/document_links.cs
ktwebservice/nunit/document_metadata.cs
ktwebservice/nunit/document_owner.cs
ktwebservice/nunit/document_rename.cs
ktwebservice/nunit/document_system_metadata.cs
ktwebservice/nunit/document_type.cs
ktwebservice/nunit/document_workflow.cs
ktwebservice/nunit/folder.cs
ktwebservice/nunit/helper.cs
-<?
+<?php
 /**
  * $Id$
  *
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
  *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
@@ -255,7 +254,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new KTAPI_Error(KTAPI_ERROR_INTERNAL_ERROR,$res);
 		}
-		$oDocumentTransaction = & new DocumentTransaction($this->document, $reason, 'ktcore.transactions.force_checkin');
+		$oDocumentTransaction = new DocumentTransaction($this->document, $reason, 'ktcore.transactions.force_checkin');
 		$res = $oDocumentTransaction->create();
 		if (($res === false) || PEAR::isError($res)) {
@@ -274,13 +273,15 @@ class KTAPI_Document extends KTAPI_FolderItem
 			dcv.size,
 			w.name as workflow,
 			ws.name as workflow_state,
-			dlt.name as link_type
+			dlt.name as link_type, dtl.name as document_type,
+			dcv.major_version, dcv.minor_version
 		FROM
 			document_link dl
 			INNER JOIN document_link_types dlt ON dl.link_type_id=dlt.id
 			INNER JOIN documents d ON dl.child_document_id=d.id
 			INNER JOIN document_metadata_version dmv ON d.metadata_version_id=dmv.id
 			INNER JOIN document_content_version dcv ON dmv.content_version_id=dcv.id
+			INNER JOIN document_types_lookup dtl ON dtl.id=dmv.document_type_id
 			LEFT OUTER JOIN workflow_documents wd ON d.id=wd.document_id
 			LEFT OUTER JOIN workflows w ON w.id=wd.workflow_id
 			LEFT OUTER JOIN workflow_states ws ON wd.state_id=ws.id
@@ -308,13 +309,20 @@ class KTAPI_Document extends KTAPI_FolderItem
 			{
 				continue;
 			}
+
+
+
 			$result[] = array(
 					'document_id'=>(int)$row['document_id'],
+					'custom_document_no'=>'n/a',
+					'oem_document_no'=>'n/a',
 					'title'=> $row['title'],
-					'size'=>(int)$row['size'],
-					'workflow'=>$row['workflow'],
-					'workflow_state'=>$row['workflow_state'],
-					'link_type'=>$row['link_type'],
+					'document_type'=> $row['document_type'],
+					'version'=> (float) ($row['major_version'] . '.' . $row['minor_version']),
+					'filesize'=>(int)$row['size'],
+					'workflow'=>empty($row['workflow'])?'n/a':$row['workflow'],
+					'workflow_state'=>empty($row['workflow_state'])?'n/a':$row['workflow_state'],
+					'link_type'=>empty($row['link_type'])?'unknown':$row['link_type'],
 				);
 		}
@@ -423,7 +431,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 			return new KTAPI_Error(KTAPI_ERROR_INTERNAL_ERROR,$res );
         }
-		$oDocumentTransaction = & new DocumentTransaction($this->document, $reason, 'ktcore.transactions.permissions_change');
+		$oDocumentTransaction = new DocumentTransaction($this->document, $reason, 'ktcore.transactions.permissions_change');
 		$res = $oDocumentTransaction->create();
 		if (($res === false) || PEAR::isError($res)) {
@@ -441,6 +449,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @param string $reason
 	 * @param string $newname
 	 * @param string $newfilename
+	 * @return KTAPI_Document
 	 */
 	function copy(&$ktapi_target_folder, $reason, $newname=null, $newfilename=null)
 	{
@@ -527,12 +536,14 @@ class KTAPI_Document extends KTAPI_FolderItem
             $oTrigger = new $sTrigger;
             $aInfo = array(
                 'document' => $new_document,
-                'old_folder' => $this->folder->get_folder(),
+                'old_folder' => $this->ktapi_folder->get_folder(),
                 'new_folder' => $target_folder,
             );
             $oTrigger->setInfo($aInfo);
             $ret = $oTrigger->postValidate();
         }
+
+        return KTAPI_Document::get($this->ktapi, $new_document->getId());
 	}
 	/**
@@ -670,6 +681,10 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 		$doctypeid = KTAPI::get_documenttypeid($documenttype);
+		if (PEAR::isError($doctypeid))
+		{
+			return $doctypeid;
+		}
 		if ($this->document->getDocumentTypeId() != $doctypeid)
 		{
@@ -760,7 +775,7 @@ class KTAPI_Document extends KTAPI_FolderItem
            return new KTAPI_Error(KTAPI_ERROR_INTERNAL_ERROR, $res);
         }
-        $oDocumentTransaction = & new DocumentTransaction($this->document, sprintf(_kt('Document archived: %s'), $reason), 'ktcore.transactions.update');
+        $oDocumentTransaction = new DocumentTransaction($this->document, sprintf(_kt('Document archived: %s'), $reason), 'ktcore.transactions.update');
         $oDocumentTransaction->create();
         DBUtil::commit();
@@ -830,7 +845,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 		$workflowid=$this->document->getWorkflowId();
-		if (!empty($workflowid))
+		if (empty($workflowid))
 		{
 			return new PEAR_Error(KTAPI_ERROR_WORKFLOW_NOT_IN_PROGRESS);
 		}
@@ -1039,6 +1054,11 @@ class KTAPI_Document extends KTAPI_FolderItem
 	function update_metadata($metadata)
 	{
 		global $default;
+		if (empty($metadata))
+		{
+			return;
+		}
+
 		 $packed = $this->get_packed_metadata($metadata);
 		 DBUtil::startTransaction();
@@ -1073,6 +1093,233 @@ class KTAPI_Document extends KTAPI_FolderItem
 	}
+	/**
+	 * This updates the system metadata on the document.
+	 *
+	 * @param array $sysdata
+	 */
+	function update_sysdata($sysdata)
+	{
+		if (empty($sysdata))
+		{
+			return;
+		}
+		$owner_mapping = array(
+						'created_by'=>'creator_id',
+						'modified_by'=>'modified_user_id',
+						'owner'=>'owner_id'
+						);
+
+		$documents = array();
+		$document_content = array();
+
+		foreach($sysdata as $rec)
+		{
+			if (is_object($rec))
+			{
+				$name = $rec->name;
+				$value = sanitizeForSQL($rec->value);
+			}
+			elseif(is_array($rec))
+			{
+				$name = $rec['name'];
+				$value = sanitizeForSQL($rec['value']);
+			}
+			else
+			{
+				// just ignore
+				continue;
+			}
+			switch($name)
+			{
+				case 'created_date':
+					$documents['created'] = $value;
+					break;
+				case 'modified_date':
+					$documents['modified'] = $value;
+					break;
+				case 'is_immutable':
+					$documents['immutable'] = in_array(strtolower($value), array('1','true','on','yes'))?'1':'0';
+					break;
+				case 'filename':
+					$document_content['filename'] = $value;
+					break;
+				case 'major_version':
+					$document_content['major_version'] = $value;
+					break;
+				case 'minor_version':
+					$document_content['minor_version'] = $value;
+					break;
+				case 'version':
+					$version = number_format($value + 0,5);
+					list($major_version, $minor_version) = explode('.', $version);
+					$document_content['major_version'] = $major_version;
+					$document_content['minor_version'] = $minor_version;
+					break;
+				case 'mime_type':
+					$sql = "select id from mime_types where mimetypes='$value'";
+					$value = DBUtil::getResultArray($sql);
+					if (PEAR::isError($value))
+					{
+						return $value;
+					}
+					if (count($value) == 0)
+					{
+						break;
+					}
+					$value = $value[0]['id'];
+					$document_content['mime_id'] = $value;
+					break;
+				case 'owner':
+				case 'created_by':
+				case 'modified_by':
+					$sql = "select id from users where name='$value'";
+					$userId = DBUtil::getResultArray($sql);
+					if (PEAR::isError($userId))
+					{
+						return $userId;
+					}
+					if (empty($userId))
+					{
+						$sql = "select id from users where username='$value'";
+						$userId = DBUtil::getResultArray($sql);
+						if (PEAR::isError($userId))
+						{
+							return $userId;
+						}
+					}
+					if (empty($userId))
+					{
+						// if not found, not much we can do
+						break;
+					}
+					$userId=$userId[0];
+					$userId=$userId['id'];
+
+					$name = $owner_mapping[$name];
+					$documents[$name] = $userId;
+					break;
+				default:
+					// TODO: we should do some logging
+					//return new PEAR_Error('Unexpected field: ' . $name);
+			}
+		}
+
+		if (count($documents) > 0)
+		{
+			$sql = "UPDATE documents SET ";
+			$i=0;
+			foreach($documents as $name=>$value)
+			{
+				if ($i++ > 0) $sql .= ",";
+				if (is_numeric($value))
+					$sql .= "$name=$value";
+				else
+					$sql .= "$name='$value'";
+			}
+			$sql .= " WHERE id=$this->documentid";
+			$result = DBUtil::runQuery($sql);
+			if (PEAR::isError($result))
+			{
+				return $result;
+			}
+		}
+		if (count($document_content) > 0)
+		{
+			$content_id = $this->document->getContentVersionId();
+			$sql = "UPDATE document_content_version SET ";
+			$i=0;
+			foreach($document_content as $name=>$value)
+			{
+				if ($i++ > 0) $sql .= ",";
+				$sql .= "$name='$value'";
+			}
+			$sql .= " WHERE id=$content_id";
+			$result = DBUtil::runQuery($sql);
+			if (PEAR::isError($result))
+			{
+				return $result;
+			}
+		}
+	}
+
+	function clearCache()
+	{
+		// TODO: we should only clear the cache for the document we are working on
+		// this is a quick fix but not optimal!!
+
+
+		$metadataid = $this->document->getMetadataVersionId();
+		$contentid = $this->document->getContentVersionId();
+
+		$cache = KTCache::getSingleton();
+
+		$cache->remove('KTDocumentMetadataVersion/id', $metadataid);
+		$cache->remove('KTDocumentContentVersion/id', $contentid);
+		$cache->remove('KTDocumentCore/id', $this->documentid);
+		$cache->remove('Document/id', $this->documentid);
+		unset($GLOBALS['_OBJECTCACHE']['KTDocumentMetadataVersion'][$metadataid]);
+		unset($GLOBALS['_OBJECTCACHE']['KTDocumentContentVersion'][$contentid]);
+		unset($GLOBALS['_OBJECTCACHE']['KTDocumentCore'][$this->documentid]);
+
+		$this->document = &Document::get($this->documentid);
+	}
+
+	function mergeWithLastMetadataVersion()
+	{
+		// keep latest metadata version
+		$metadata_version = $this->document->getMetadataVersion();
+		if ($metadata_version == 0)
+		{
+			// this could theoretically happen in the case we are updating metadata and sysdata, but no metadata fields are specified.
+			return;
+		}
+
+		$metadata_id = $this->document->getMetadataVersionId();
+
+		// get previous version
+		$sql = "SELECT id, metadata_version FROM document_metadata_version WHERE id<$metadata_id AND document_id=$this->documentid order by id desc";
+		$old = DBUtil::getResultArray($sql);
+		if (is_null($old) || PEAR::isError($old))
+		{
+			return new PEAR_Error('Previous version could not be resolved');
+		}
+		// only interested in the first one
+		$old=$old[0];
+		$old_metadata_id = $old['id'];
+		$old_metadata_version = $old['metadata_version'];
+
+		DBUtil::startTransaction();
+
+		// delete previous metadata version
+
+		$sql = "DELETE FROM document_metadata_version WHERE id=$old_metadata_id";
+		$rs = DBUtil::runQuery($sql);
+		if (PEAR::isError($rs))
+		{
+			DBUtil::rollback();
+			return $rs;
+		}
+
+		// make latest equal to previous
+		$sql = "UPDATE document_metadata_version SET metadata_version=$old_metadata_version WHERE id=$metadata_id";
+		$rs = DBUtil::runQuery($sql);
+		if (PEAR::isError($rs))
+		{
+			DBUtil::rollback();
+			return $rs;
+		}
+		$sql = "UPDATE documents SET metadata_version=$old_metadata_version WHERE id=$this->documentid";
+		$rs = DBUtil::runQuery($sql);
+		if (PEAR::isError($rs))
+		{
+			DBUtil::rollback();
+			return $rs;
+		}
+		DBUtil::commit();
+
+		$this->clearCache();
+	}
 	/**
 	 * This returns a workflow transition
@@ -1091,7 +1338,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		$workflowid=$this->document->getWorkflowId();
 		if (empty($workflowid))
 		{
-			return new PEAR_Error(KTAPI_ERROR_WORKFLOW_NOT_IN_PROGRESS);
+			return array();
 		}
 		$result = array();
@@ -1150,94 +1397,172 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 */
 	function get_detail()
 	{
+		global $default;
+		// make sure we ge tthe latest
+		$this->clearCache();
+
+		$config = KTConfig::getSingleton();
+		$wsversion = $config->get('webservice/version', LATEST_WEBSERVICE_VERSION);
+
 		$detail = array();
 		$document = $this->document;
+		// get the document id
+		$detail['document_id'] = (int) $document->getId();
+
+		$detail['custom_document_no'] = 'n/a';
+		$detail['oem_document_no'] = 'n/a';
+
+		// get the title
 		$detail['title'] = $document->getName();
+		// get the document type
 		$documenttypeid=$document->getDocumentTypeID();
+		$documenttype = '* unknown *';
 		if (is_numeric($documenttypeid))
 		{
-			$documenttype = DocumentType::get($documenttypeid);
+			$dt = DocumentType::get($documenttypeid);
-			$documenttype=$documenttype->getName();
-		}
-		else
-		{
-			$documenttype = '* unknown *';
+			if (!is_null($dt) && !PEAR::isError($dt))
+			{
+				$documenttype=$dt->getName();
+			}
 		}
 		$detail['document_type'] = $documenttype;
-		$detail['version'] = $document->getVersion();
+		// get the filename
 		$detail['filename'] = $document->getFilename();
-		$detail['created_date'] = $document->getCreatedDateTime();
+		// get the filesize
+		$detail['filesize'] = (int) $document->getFileSize();
+		// get the folder id
+		$detail['folder_id'] = (int) $document->getFolderID();
+
+		// get the creator
 		$userid = $document->getCreatorID();
+		$username='n/a';
 		if (is_numeric($userid))
 		{
+			$username = '* unknown *';
 			$user = User::get($userid);
-			$username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
+			if (!is_null($user) && !PEAR::isError($user))
+			{
+				$username = $user->getName();
+			}
+		}
+		$detail['created_by'] = $username;
+
+		// get the creation date
+		$detail['created_date'] = $document->getCreatedDateTime();
+
+		// get the checked out user
+		$userid = $document->getCheckedOutUserID();
+		$username='n/a';
+		if (is_numeric($userid))
+		{
+			$username = '* unknown *';
+			$user = User::get($userid);
+			if (!is_null($user) && !PEAR::isError($user))
+			{
+				$username = $user->getName();
+			}
+		}
+		$detail['checked_out_by'] = $username;
+
+		// get the checked out date
+		list($major, $minor, $fix) = explode('.', $default->systemVersion);
+		if ($major == 3 && $minor >= 5)
+		{
+			$detail['checked_out_date'] = $document->getCheckedOutDate();
 		}
 		else
 		{
-			$username='n/a';
+			$detail['checked_out_date'] = $detail['modified_date'];
 		}
-		$detail['created_by'] = $username;
-		$detail['updated_date'] = $document->getLastModifiedDate();
+		if (is_null($detail['checked_out_date'])) $detail['checked_out_date'] = 'n/a';
+		// get the modified user
 		$userid = $document->getModifiedUserId();
+		$username='n/a';
 		if (is_numeric($userid))
 		{
+			$username = '* unknown *';
 			$user = User::get($userid);
-			$username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
+			if (!is_null($user) && !PEAR::isError($user))
+			{
+				$username = $user->getName();
+			}
 		}
-		else
+		$detail['modified_by'] = $detail['updated_by'] = $username;
+
+		// get the modified date
+		$detail['updated_date'] = $detail['modified_date'] = $document->getLastModifiedDate();
+
+		// get the owner
+		$userid = $document->getOwnerID();
+		$username='n/a';
+		if (is_numeric($userid))
 		{
-			$username='n/a';
+			$username = '* unknown *';
+			$user = User::get($userid);
+			if (!is_null($user) && !PEAR::isError($user))
+			{
+				$username = $user->getName();
+			}
+		}
+		$detail['owned_by'] = $username;
+
+		// get the version
+		$detail['version'] = $document->getVersion();
+		if ($wsversion >= 2)
+		{
+			$detail['version'] = (float) $detail['version'];
 		}
-		$detail['updated_by'] = $username;
-		$detail['document_id'] = (int) $document->getId();
-		$detail['folder_id'] = (int) $document->getFolderID();
+		// check immutability
+		$detail['is_immutable'] = (bool) $document->getImmutable();
+
+		// check permissions
+		$detail['permissions'] = 'n/a';
+
+		// get workflow name
 		$workflowid = $document->getWorkflowId();
+		$workflowname='n/a';
 		if (is_numeric($workflowid))
 		{
 			$workflow = KTWorkflow::get($workflowid);
-			$workflowname=(is_null($workflow) || PEAR::isError($workflow))?'* unknown *':$workflow->getName();
-		}
-		else
-		{
-			$workflowname='n/a';
+			if (!is_null($workflow) && !PEAR::isError($workflow))
+			{
+				$workflowname = $workflow->getName();
+			}
 		}
 		$detail['workflow'] = $workflowname;
+		// get the workflow state
 		$stateid = $document->getWorkflowStateId();
+		$workflowstate = 'n/a';
 		if (is_numeric($stateid))
 		{
 			$state = KTWorkflowState::get($stateid);
-			$workflowstate=(is_null($state) || PEAR::isError($state))?'* unknown *':$state->getName();
-		}
-		else
-		{
-			$workflowstate = 'n/a';
+			if (!is_null($state) && !PEAR::isError($state))
+			{
+				$workflowstate = $state->getName();
+			}
 		}
 		$detail['workflow_state']=$workflowstate;
-		$userid = $document->getCheckedOutUserID();
+		// get the full path
+		$detail['full_path'] = $this->ktapi_folder->get_full_path() . '/' . $this->get_title();
-		if (is_numeric($userid))
-		{
-			$user = User::get($userid);
-			$username=(is_null($user) || PEAR::isError($user))?'* unknown *':$user->getName();
-		}
-		else
-		{
-			$username = 'n/a';
-		}
-		$detail['checkout_by'] = $username;
+		// get mime info
+		$mimetypeid = $document->getMimeTypeID();
+		$detail['mime_type'] =KTMime::getMimeTypeName($mimetypeid);
+		$detail['mime_icon_path'] =KTMime::getIconPath($mimetypeid);
+		$detail['mime_display'] =KTMime::getFriendlyNameForString($detail['mime_type']);
-		$detail['full_path'] = $this->ktapi_folder->get_full_path() . '/' . $this->get_title();
+		// get the storage path
+		$detail['storage_path'] = $document->getStoragePath();
 		return $detail;
 	}
@@ -1258,7 +1583,7 @@ class KTAPI_Document extends KTAPI_FolderItem
         $options = array();
-        $oDocumentTransaction = & new DocumentTransaction($this->document, 'Document downloaded', 'ktcore.transactions.download', $aOptions);
+        $oDocumentTransaction = new DocumentTransaction($this->document, 'Document downloaded', 'ktcore.transactions.download', $aOptions);
         $oDocumentTransaction->create();
 	}
@@ -1281,6 +1606,13 @@ class KTAPI_Document extends KTAPI_FolderItem
         	return new KTAPI_Error(KTAPI_ERROR_INTERNAL_ERROR, $transactions  );
         }
+        $config = KTConfig::getSingleton();
+		$wsversion = $config->get('webservice/version', LATEST_WEBSERVICE_VERSION);
+		foreach($transactions as $key=>$transaction)
+		{
+			$transactions[$key]['version'] = (float) $transaction['version'];
+		}
+
         return $transactions;
 	}
@@ -1293,6 +1625,9 @@ class KTAPI_Document extends KTAPI_FolderItem
 	{
 		$metadata_versions = KTDocumentMetadataVersion::getByDocument($this->document);
+		$config = KTConfig::getSingleton();
+		$wsversion = $config->get('webservice/version', LATEST_WEBSERVICE_VERSION);
+
         $versions = array();
         foreach ($metadata_versions as $version)
         {
@@ -1302,10 +1637,20 @@ class KTAPI_Document extends KTAPI_FolderItem
         	$userid = $document->getModifiedUserId();
 			$user = User::get($userid);
+			$username = 'Unknown';
+			if (!PEAR::isError($user))
+			{
+				$username = is_null($user)?'n/a':$user->getName();
+			}
-        	$version['user'] = $user->getName();
+        	$version['user'] = $username;
         	$version['metadata_version'] = $document->getMetadataVersion();
         	$version['content_version'] = $document->getVersion();
+        	if ($wsversion >= 2)
+        	{
+        		$version['metadata_version'] = (int) $version['metadata_version'];
+        		$version['content_version'] = (float) $version['content_version'];
+        	}
             $versions[] = $version;
         }
@@ -1325,7 +1670,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		}
 		DBUtil::startTransaction();
-		$transaction = & new DocumentTransaction($this->document, "Document expunged", 'ktcore.transactions.expunge');
+		$transaction = new DocumentTransaction($this->document, "Document expunged", 'ktcore.transactions.expunge');
         $transaction->create();
-<?
+<?php
 /**
  * $Id$
  *
@@ -144,14 +144,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		return (int) $this->folderid;
 	}
-	/**
-	 * This can resolve a folder relative to the current directy by name
-	 *
-	 * @access public
-	 * @param string $foldername
-	 * @return KTAPI_Folder
-	 */
-	function &get_folder_by_name($foldername)
+	function &_get_folder_by_name($ktapi, $foldername, $folderid)
 	{
 		$foldername=trim($foldername);
 		if (empty($foldername))
@@ -161,14 +154,16 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		$split = explode('/', $foldername);
-		$folderid=$this->folderid;
 		foreach($split as $foldername)
 		{
 			if (empty($foldername))
 			{
 				continue;
 			}
-			$sql = "SELECT id FROM folders WHERE name='$foldername' and parent_id=$folderid";
+			$foldername = sanitizeForSQL($foldername);
+			$sql = "SELECT id FROM folders WHERE
+					(name='$foldername' and parent_id=$folderid) OR
+					(name='$foldername' and parent_id is null and $folderid=1)";
 			$row = DBUtil::getOneResult($sql);
 			if (is_null($row) || PEAR::isError($row))
 			{
@@ -177,12 +172,26 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			$folderid = $row['id'];
 		}
-		return KTAPI_Folder::get($this->ktapi, $folderid);
+		return KTAPI_Folder::get($ktapi, $folderid);
+	}
+
+
+	/**
+	 * This can resolve a folder relative to the current directy by name
+	 *
+	 * @access public
+	 * @param string $foldername
+	 * @return KTAPI_Folder
+	 */
+	function &get_folder_by_name($foldername)
+	{
+		return KTAPI_Folder::_get_folder_by_name($this->ktapi, $foldername, $this->folderid);
 	}
 	function get_full_path()
 	{
 		$path = $this->folder->getFullPath() . '/' . $this->folder->getName();
+		if (substr($path,0,1) == '/') $path = substr($path,1);
 		return $path;
 	}
@@ -213,6 +222,21 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			$ktapi_folder = $this->get_folder_by_name($foldername);
 		}
+		$currentFolderName = $this->get_folder_name();
+
+		if (PEAR::isError($ktapi_folder) && substr($foldername, 0, strlen($currentFolderName)) == $currentFolderName)
+		{
+			if ($currentFolderName == $foldername)
+			{
+				$ktapi_folder = $this;
+			}
+			else
+			{
+				$foldername = substr($foldername, strlen($currentFolderName)+1);
+				$ktapi_folder = $this->get_folder_by_name($foldername);
+			}
+		}
+
 		if (is_null($ktapi_folder) || PEAR::isError($ktapi_folder))
 		{
 			return new KTAPI_Error(KTAPI_ERROR_FOLDER_INVALID, $ktapi_folder);
@@ -275,7 +299,6 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		return $user;
 	}
-
 	function get_listing($depth=1, $what='DF')
 	{
 		if ($depth < 1)
@@ -287,6 +310,9 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		$read_permission = &KTPermission::getByName(KTAPI_PERMISSION_READ);
 		$folder_permission = &KTPermission::getByName(KTAPI_PERMISSION_VIEW_FOLDER);
+		$config = KTConfig::getSingleton();
+
+		$wsversion = $config->get('webservice/version', LATEST_WEBSERVICE_VERSION);
 		$user = $this->ktapi->get_user();
@@ -296,23 +322,68 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		{
 			$folder_children = Folder::getList(array('parent_id = ?', $this->folderid));
-
 			foreach ($folder_children as $folder)
 			{
 				if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder))
 				{
-					$creator=$this->_resolve_user($folder->getCreatorID());
-
 					if ($depth-1 > 0)
 					{
 						$sub_folder = &$this->ktapi->get_folder_by_id($folder->getId());
-						$items = $folder->get_listing($depth-1);
+						$items = $sub_folder->get_listing($depth-1);
 					}
 					else
 					{
 						$items=array();
 					}
+					$creator=$this->_resolve_user($folder->getCreatorID());
+
+
+					if ($wsversion >= 2)
+					{
+						$contents[] = array(
+							'id' => (int) $folder->getId(),
+							'item_type' => 'F',
+
+							'custom_document_no'=>'n/a',
+							'oem_document_no'=>'n/a',
+
+							'title' => $folder->getName(),
+							'document_type' => 'n/a',
+							'filename' => $folder->getName(),
+							'filesize' => 'n/a',
+
+							'created_by' => is_null($creator)?'n/a':$creator->getName(),
+							'created_date' => 'n/a',
+
+							'checked_out_by' => 'n/a',
+							'checked_out_date' => 'n/a',
+
+							'modified_by' => 'n/a',
+							'modified_date' => 'n/a',
+
+							'owned_by' => 'n/a',
+
+							'version' => 'n/a',
+
+							'is_immutable'=> 'n/a',
+							'permissions' => 'n/a',
+
+							'workflow'=>'n/a',
+							'workflow_state'=>'n/a',
+
+							'mime_type' => 'folder',
+							'mime_icon_path' => 'folder',
+							'mime_display' => 'Folder',
+
+							'storage_path' => 'n/a',
+
+							'items'=>$items,
+
+					);
+					}
+					else
+					{
 					$contents[] = array(
 						'id' => (int) $folder->getId(),
@@ -332,8 +403,9 @@ class KTAPI_Folder extends KTAPI_FolderItem
 						'items'=>$items,
 						'workflow'=>'n/a',
 						'workflow_state'=>'n/a'
-
 					);
+					}
+
 				}
 			}
 		}
@@ -348,9 +420,19 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			{
 				if (KTPermissionUtil::userHasPermissionOnItem($user, $read_permission, $document))
 				{
-					$creator=$this->_resolve_user($document->getCreatorID());
-					$checkedoutby=$this->_resolve_user($document->getCheckedOutUserID());
-					$modifiedby=$this->_resolve_user($document->getCreatorID());
+					$created_by=$this->_resolve_user($document->getCreatorID());
+					$created_date = $document->getCreatedDateTime();
+					if (empty($created_date)) $created_date = 'n/a';
+
+					$checked_out_by=$this->_resolve_user($document->getCheckedOutUserID());
+					$checked_out_date = $document->getCheckedOutDate();
+					if (empty($checked_out_date)) $checked_out_date = 'n/a';
+
+					$modified_by=$this->_resolve_user($document->getCreatorID());
+					$modified_date = $document->getCheckedOutDate();
+					if (empty($modified_date)) $modified_date = 'n/a';
+
+					$owned_by =$this->_resolve_user($document->getOwnerID());
 					$mimetypeid=$document->getMimeTypeID();
 					if (!array_key_exists($mimetypeid, $mime_cache))
@@ -368,37 +450,81 @@ class KTAPI_Folder extends KTAPI_FolderItem
 					}
 					$mimeinfo=$mime_cache[$mimetypeid];
-					$workflow = KTWorkflowUtil::getWorkflowForDocument($document);
+					$workflow='n/a';
+					$state='n/a';
+
+					$wf = KTWorkflowUtil::getWorkflowForDocument($document);
-					if (!is_null($workflow) && !PEAR::isError($workflow))
+					if (!is_null($wf) && !PEAR::isError($wf))
 					{
-						$workflow=$workflow->getHumanName();
+						$workflow=$wf->getHumanName();
-						$state=KTWorkflowUtil::getWorkflowStateForDocument($document);
-						if (!is_null($state) && !PEAR::isError($state))
+						$ws=KTWorkflowUtil::getWorkflowStateForDocument($document);
+						if (!is_null($ws) && !PEAR::isError($ws))
 						{
 							$state=$state->getHumanName();
 						}
-						else
-						{
-							$state='n/a';
-						}
 					}
-					else
+
+					if ($wsversion >= 2)
 					{
-						$workflow='n/a';
-						$state='n/a';
+						$docTypeId = $document->getDocumentTypeID();
+						$documentType = DocumentType::get($docTypeId);
+
+
+						$contents[] = array(
+							'id' => (int) $document->getId(),
+							'item_type' => 'D',
+
+							'custom_document_no'=>'n/a',
+							'oem_document_no'=>'n/a',
+
+							'title' => $document->getName(),
+							'document_type'=>$documentType->getName(),
+							'filename' => $document->getFileName(),
+							'filesize' => $document->getFileSize(),
+
+							'created_by' => is_null($created_by)?'n/a':$created_by->getName(),
+							'created_date' => $created_date,
+
+							'checked_out_by' => is_null($checked_out_by)?'n/a':$checked_out_by->getName(),
+							'checked_out_date' => $checked_out_date,
+
+							'modified_by' => is_null($modified_by)?'n/a':$modified_by->getName(),
+							'modified_date' => $modified_date,
+
+							'owned_by' => is_null($owned_by)?'n/a':$owned_by->getName(),
+
+							'version' =>  $document->getMajorVersionNumber() . '.' . $document->getMinorVersionNumber(),
+
+							'is_immutable'=> $document->getImmutable()?'true':'false',
+							'permissions' => 'n/a',
+
+							'workflow'=> $workflow,
+							'workflow_state'=> $state,
+
+							'mime_type' => $mime_cache[$mimetypeid]['type'],
+							'mime_icon_path' => $mime_cache[$mimetypeid]['icon'],
+							'mime_display' => $mime_cache[$mimetypeid]['display'],
+
+							'storage_path' => $document->getStoragePath(),
+
+							'items'=>array(),
+
+					);
 					}
+					else
+					{
 					$contents[] = array(
 						'id' => (int) $document->getId(),
 						'item_type'=>'D',
 						'title'=>$document->getName(),
-						'creator'=>is_null($creator)?'n/a':$creator->getName(),
-						'checkedoutby'=>is_null($checkedoutby)?'n/a':$checkedoutby->getName(),
-						'modifiedby'=>is_null($modifiedby)?'n/a':$modifiedby->getName(),
-						'filename'=>$document->getName(),
+						'creator'=>is_null($created_by)?'n/a':$created_by->getName(),
+						'checkedoutby'=>is_null($checked_out_by)?'n/a':$checked_out_by->getName(),
+						'modifiedby'=>is_null($modified_by)?'n/a':$modified_by->getName(),
+						'filename'=>$document->getFileName(),
 						'size'=>$document->getFileSize(),
 						'major_version'=>$document->getMajorVersionNumber(),
 						'minor_version'=>$document->getMinorVersionNumber(),
@@ -410,6 +536,8 @@ class KTAPI_Folder extends KTAPI_FolderItem
 						'workflow'=>$workflow,
 						'workflow_state'=>$state
 					);
+
+					}
 				}
 			}
@@ -585,7 +713,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		}
 		DBUtil::startTransaction();
-		$result = KTFolderUtil::copy($this->folder, $target_folder, $user, $reason);
+		$result = KTFolderUtil::move($this->folder, $target_folder, $user, $reason);
 		if (PEAR::isError($result))
 		{
@@ -651,4 +779,4 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	}
 }
-?>
 \ No newline at end of file
+?>
+GENERAL
+-------
+
+This folder includes the Nunit unit tests to unit test web services.
+
+
+REQUIREMENTS
+------------
+
+The unit tests were written for NUnit. NUnit 2.2.0 was used during development.
+
+This framework was developed in Linux using Mono.
+
+DATABASE
+--------
+
+Review helper.cs to see the configuration settings. UnixODBC is used. Sample config files:
+
+ #  odbc.ini  
+
+[ktdms]
+Driver       = myodbcdriver
+Description  = MySQL ODBC 2.50 Driver DSN
+SERVER       = localhost
+PORT         =
+Socket 	     = /tmp/mysql.sock
+USER         = root
+Password     =
+Database     = ktdms
+OPTION       = 3
+
+ #  odbcinst.ini  
+[myodbcdriver]
+Description  = MySQL ODBC 2.50 Driver DSN
+Driver       = /usr/lib64/unixODBC/libmyodbc3.so
+
+
+The document type 'NewType' must be added to the database for the document_type.cs unit test to run.
+
+
+RUNNING THE TESTS
+-----------------
+
+Edit the makefile to ensure that the WSDL_URL is directed to the correct location.
+
+A makefile is provided which can be used as follows:
+
+- make 		// will build and run the tests
+
+- make clean 	// will remove all temporary and binary files
+
+STATE
+-----
+
+The states of the tests is very alpha. Some of the tests are quite complicated, so we can probably split them.
+
+REFERENCES
+----------
+
+For more information:
+
+http://nunit.org/
+http://www.mono-project.com/
+http://www.unixodbc.org
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class AuthenticationTest
+    	{
+
+		private String 			_session;
+		private KnowledgeTreeService 	_kt;
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._kt = new KTWebService();
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+		}
+
+		[Test]
+		public void Login()
+		{
+			kt_response response = this._kt.login("admin","admin","127.0.0.1");
+
+			Assert.AreEqual(0,response.status_code);
+			Assert.IsFalse(response.message == null);
+			Assert.IsFalse(response.message == "");
+
+			this._session = response.message;
+    		}
+
+		[Test]
+		public void Logout()
+		{
+	    		kt_response response = this._kt.logout(this._session);
+			Assert.AreEqual(0,response.status_code);
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class AddDocumentTest : KTTest
+    	{
+
+
+		private int 			_docId;
+		private int 			_folderId;
+		private String			_filename;
+		private String			_content;
+
+		public AddDocumentTest() : base()
+		{
+			this._folderId = 1;
+		}
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._filename = Helper.isUnix()?"/tmp/kt_unit_test1.txt":"c:\\kt_unit_test1.txt";
+			this._content = "hello world!";
+
+			Helper.writeFile(this._filename, this._content); 		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Helper.deleteFile(this._filename);
+		}
+
+		[Test]
+		public void FindDocumentBeforeAdd()
+		{
+			String filename = "Root Folder/kt test folder/kt unit test1";
+			if (this._verbose) System.Console.WriteLine("Finding document before add: " + filename);
+			kt_document_detail documentDetail = this._kt.get_document_detail_by_title(this._session, 1, filename, "");
+			if (0 == documentDetail.status_code)
+			{
+				if (this._verbose) System.Console.WriteLine("Found document - deleting");
+				kt_response response = this._kt.delete_document(this._session, documentDetail.document_id, "Delete - cleaning up before add");
+				Assert.AreEqual(0, response.status_code);
+			}
+			else if (this._verbose)
+			{
+				System.Console.WriteLine("document not found. that is ok!");
+			}
+		}
+
+		[Test]
+		public void FindFolderBeforeAdd()
+		{
+			String folder = "Root Folder/kt test folder";
+			if (this._verbose) System.Console.WriteLine("Finding folder before add: " + folder);
+			kt_folder_detail folderDetail = this._kt.get_folder_detail_by_name(this._session, folder);
+			if (0 == folderDetail.status_code)
+			{
+				if (this._verbose) System.Console.WriteLine("Found folder - deleting");
+				kt_response response = this._kt.delete_folder(this._session, folderDetail.id, "Delete - cleaning up before add");
+				Assert.AreEqual(0, response.status_code);
+			}
+			else
+			{
+				if (this._verbose) System.Console.WriteLine("folder not found. that is ok!");
+			}
+		}
+
+		[Test]
+		public void AddDocument()
+		{
+			String folder = "kt test folder";
+
+			if (this._verbose) System.Console.WriteLine("Creating folder : " + folder);
+			kt_folder_detail folderDetail = this._kt.create_folder(this._session, 1, folder);
+			this._folderId = folderDetail.id;
+			if (this._verbose) System.Console.WriteLine("Got folder id : " + this._folderId);
+
+			String filename = "kt unit test1";
+
+			if (this._verbose) System.Console.WriteLine("Adding document : " + filename);
+
+
+			kt_document_detail response1 = this._kt.add_base64_document(this._session, this._folderId, filename, this._filename, "Default", Helper.ConvertFileToBase64Encoding(this._filename));
+
+			Assert.AreEqual(0, response1.status_code);
+			Assert.AreEqual("kt unit test1", response1.title);
+			Assert.AreEqual("Default", response1.document_type);
+			Assert.AreEqual(0.1, response1.version);
+			Assert.AreEqual("kt_unit_test1.txt", response1.filename);
+
+			Assert.IsFalse(response1.created_date == null);
+			Assert.IsFalse(response1.created_date == "");
+
+			Assert.AreEqual("Administrator", response1.created_by);
+
+			//Assert.IsTrue(response1.updated_date == null);
+			Assert.IsTrue("" != response1.modified_date);
+
+			Assert.AreEqual("Administrator", response1.modified_by);
+
+			Assert.IsTrue(response1.document_id > 0);
+
+			Assert.AreEqual(this._folderId, response1.folder_id);
+
+
+			Assert.AreEqual("n/a",response1.workflow);
+
+
+			Assert.AreEqual("n/a",response1.workflow_state);
+
+			Assert.AreEqual("Root Folder/" + folder + "/kt unit test1", response1.full_path);
+
+			this._docId = response1.document_id;
+	    	}
+
+		[Test]
+		public void FindDocumentBeforeDelete()
+		{
+
+			if (this._verbose) System.Console.WriteLine("Find document before delete");
+			kt_document_detail documentDetail = this._kt.get_document_detail_by_name(this._session, 1, "Root Folder/kt test folder/kt unit test1", "T","");
+			Assert.AreEqual(0, documentDetail.status_code);
+			Assert.AreEqual(this._docId, documentDetail.document_id);
+
+
+
+			if (this._verbose) System.Console.WriteLine("Find document before delete without the Root Folder's explicit naming");
+			documentDetail = this._kt.get_document_detail_by_title(this._session, 1, "/kt test folder/kt unit test1", "");
+			Assert.AreEqual(0, documentDetail.status_code);
+			Assert.AreEqual(this._docId, documentDetail.document_id);
+		}
+
+		[Test]
+		public void DeleteDocument()
+		{
+			if (this._verbose) System.Console.WriteLine("Deleting document");
+			kt_response response = this._kt.delete_document(this._session, this._docId, "Delete - cleaning up after add");
+			Assert.AreEqual(0, response.status_code);
+		}
+
+		[Test]
+		public void FindDocumentAfterDelete()
+		{
+			if (this._verbose) System.Console.WriteLine("Checking that document is gone!");
+
+			kt_document_detail documentDetail = this._kt.get_document_detail_by_title(this._session, 1, "Root Folder/kt test folder/kt unit test1", "");
+			Assert.IsTrue(0 != documentDetail.status_code);
+		}
+
+
+
+
+		[Test]
+		public void Add2PhaseDocument()
+		{
+
+
+			String filename = "kt unit test31";
+
+			if (this._verbose) System.Console.WriteLine("Adding document : " + filename);
+			FileUploader uploader = new FileUploader();
+
+			uploader.upload(this._session, this._filename);
+			String tempname = uploader.getFilename();
+
+			kt_document_detail response1 = this._kt.add_document(this._session, this._folderId, filename, this._filename, "Default", tempname);
+
+			Assert.AreEqual(0, response1.status_code);
+			Assert.AreEqual(filename, response1.title);
+			Assert.AreEqual("Default", response1.document_type);
+			Assert.AreEqual(0.1, response1.version);
+			Assert.AreEqual("kt_unit_test1.txt", response1.filename);
+
+			Assert.IsFalse(response1.created_date == null);
+			Assert.IsFalse(response1.created_date == "");
+
+			Assert.AreEqual("Administrator", response1.created_by);
+
+			//Assert.IsTrue(response1.modified_date == null);
+			Assert.IsTrue("" != response1.modified_date);
+
+			Assert.AreEqual("Administrator", response1.modified_by);
+
+			Assert.IsTrue(response1.document_id > 0);
+
+			Assert.AreEqual(this._folderId, response1.folder_id);
+
+
+			Assert.AreEqual("n/a",response1.workflow);
+
+
+			Assert.AreEqual("n/a",response1.workflow_state);
+
+
+			this._docId = response1.document_id;
+
+			kt_response response = this._kt.delete_document(this._session, this._docId, "Delete - cleaning up after add");
+			Assert.AreEqual(0, response.status_code);
+	    	}
+
+		[Test]
+		public void DropFolder()
+		{
+			if (this._verbose) System.Console.WriteLine("Drop Folder!");
+
+			kt_response documentDetail = this._kt.delete_folder(this._session, this._folderId, "delete - cleaning up");
+			Assert.AreEqual(0, documentDetail.status_code);
+		}
+
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class CheckoutDocumentTest : KTTest
+    	{ 
+		private int 			_docId;
+		private int 			_folderId;
+		private String			_filename;
+		private String			_content; 
+
+
+		[SetUp]
+		public void SetUp()
+		{
+			 
+			this._filename = Helper.isUnix()?"/tmp/kt_unit_test1.txt":"c:\\kt_unit_test1.txt";
+
+			String filename = "kt unit test1";
+
+			this._content = "hello world!";
+
+			Helper.writeFile(this._filename, this._content);
+
+			 
+
+			this._folderId = 1;
+
+			kt_document_detail response1 = this._kt.add_base64_document(this._session, this._folderId, filename, this._filename, "Default", Helper.ConvertFileToBase64Encoding(this._filename));
+
+			if (this._verbose && response1.status_code != 0)
+			{
+				System.Console.WriteLine("Could not create file: " + this._filename);
+			}
+			this._docId = response1.document_id;
+
+
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+
+			Helper.deleteFile(this._filename);
+
+			kt_response response = this._kt.delete_document(this._session, this._docId, "Delete - cleaning up");
+			if (this._verbose && response.status_code != 0)
+			{
+				System.Console.WriteLine("Could not delete file: " + this._filename);
+			} 
+
+		}
+
+		[Test]
+		public void CheckoutDocument()
+		{
+			String filename = "kt unit test1";
+
+			if (this._verbose) System.Console.WriteLine("Checking out document : " + filename);
+
+			kt_document_detail response = this._kt.checkout_base64_document(this._session, this._docId, "unit test - going to checkout and then undo", false);
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Administrator",response.checked_out_by);
+			Assert.IsTrue(null != response.checked_out_date);
+
+			response = this._kt.undo_document_checkout(this._session, this._docId, "unit test - doing undo");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("n/a",response.checked_out_by);
+			Assert.AreEqual("n/a", response.checked_out_date);
+	    	}
+
+		[Test]
+		public void CheckinDocument()
+		{
+			String filename = "kt unit test1";
+
+			if (this._verbose) System.Console.WriteLine("Checking out document : " + filename);
+
+			kt_document_detail response = this._kt.checkout_base64_document(this._session, this._docId, "unit test - going to checkout and then checkin", false);
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Administrator",response.checked_out_by);
+			Assert.IsTrue(null != response.checked_out_date);
+
+
+			kt_document_detail checkin = this._kt.checkin_base64_document(this._session, this._docId, filename, "unit test - doing checkin", Helper.ConvertFileToBase64Encoding(this._filename), false);
+			Assert.AreEqual(0, checkin.status_code);
+			Assert.AreEqual("n/a",checkin.checked_out_by); 
+			Assert.AreEqual("n/a", checkin.checked_out_date);
+	    	}
+
+		[Test]
+		public void Checkin2PhaseDocument()
+		{
+			String filename = "kt unit test1";
+
+			if (this._verbose) System.Console.WriteLine("Checking out document : " + filename);
+
+			kt_document_detail response = this._kt.checkout_document(this._session, this._docId, "unit test - going to checkout and then checkin", false);
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Administrator",response.checked_out_by);
+			Assert.IsTrue(null != response.checked_out_date);
+
+			FileUploader uploader = new FileUploader();
+
+			uploader.upload(this._session, this._filename);
+			String tempname = uploader.getFilename();
+
+			kt_document_detail checkin = this._kt.checkin_document(this._session, this._docId, filename, "unit test - doing checkin", tempname, false);
+			Assert.AreEqual(0, checkin.status_code); 
+			Assert.AreEqual("n/a",checkin.checked_out_by); 
+			Assert.AreEqual("n/a", checkin.checked_out_date);
+	    	}
+
+
+
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentContentsTest : KTTest
+    	{
+ 		private int 			_folderId;
+		private Document		_doc1;
+
+
+		[SetUp]
+		public void SetUp()
+		{
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose,false);
+			this._doc1.createFile(1);
+
+			kt_folder_detail response = this._kt.create_folder(this._session, 1, "kt_unit_testabc");
+
+
+			this._folderId = response.id;
+
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+		}
+
+		[Test]
+		public void Query()
+		{
+
+			kt_folder_contents response = this._kt.get_folder_contents(this._session, 1, 1, "DF");
+
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(2, response.items.Length);
+
+			Assert.AreEqual(this._doc1.docId, response.items[1].id);
+
+			Assert.AreEqual("n/a", response.items[1].custom_document_no);
+			Assert.AreEqual("n/a", response.items[1].oem_document_no);
+
+			Assert.AreEqual("D", response.items[1].item_type);
+			Assert.AreEqual(this._doc1.title, response.items[1].title);
+			Assert.AreEqual(this._doc1.realFilename, response.items[1].filename);
+			Assert.AreEqual("Default", response.items[1].document_type);
+			Assert.AreEqual(this._doc1.filesize+1 + "", response.items[1].filesize);
+
+			Assert.AreEqual("Administrator", response.items[1].created_by);
+			Assert.AreEqual("Administrator", response.items[1].modified_by);
+			Assert.AreEqual("n/a", response.items[1].checked_out_by);
+			Assert.AreEqual("Administrator", response.items[1].owned_by);
+			Assert.AreEqual("0.1", response.items[1].version);
+			Assert.AreEqual("false", response.items[1].is_immutable);
+			Assert.AreEqual("n/a", response.items[1].permissions);
+			Assert.AreEqual("n/a", response.items[1].workflow);
+			Assert.AreEqual("n/a", response.items[1].workflow_state);
+			Assert.AreEqual("text/plain", response.items[1].mime_type);
+			Assert.AreEqual("text", response.items[1].mime_icon_path);
+			Assert.AreEqual("Plain Text", response.items[1].mime_display);
+			Assert.IsTrue("" != response.items[1].storage_path);
+
+			Assert.AreEqual(this._folderId, response.items[0].id);
+			Assert.AreEqual("F", response.items[0].item_type);
+			Assert.AreEqual("kt_unit_testabc", response.items[0].title);
+
+			Assert.AreEqual("kt_unit_testabc", response.items[0].filename);
+			Assert.AreEqual("n/a", response.items[0].document_type);
+			Assert.AreEqual("n/a", response.items[0].filesize);
+
+			Assert.AreEqual("Administrator", response.items[0].created_by);
+			Assert.AreEqual("n/a", response.items[0].modified_by);
+			Assert.AreEqual("n/a", response.items[0].checked_out_by);
+			Assert.AreEqual("n/a", response.items[0].owned_by);
+			Assert.AreEqual("n/a", response.items[0].version);
+			Assert.AreEqual("n/a", response.items[0].is_immutable);
+			Assert.AreEqual("n/a", response.items[0].permissions);
+			Assert.AreEqual("n/a", response.items[0].workflow);
+			Assert.AreEqual("n/a", response.items[0].workflow_state);
+			Assert.AreEqual("folder", response.items[0].mime_type);
+			Assert.AreEqual("folder", response.items[0].mime_icon_path);
+			Assert.AreEqual("Folder", response.items[0].mime_display);
+			Assert.AreEqual("n/a",response.items[0].storage_path);
+    		}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+
+
+	[TestFixture]
+	public class DocumentCopyTest : KTTest
+    	{ 
+		private int 			_folderId; 
+		private Document		_doc1; 
+
+
+		[SetUp]
+		public void SetUp()
+		{ 
+			this._folderId = 1; 
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose, false);
+			this._doc1.createFile(this._folderId);  
+			
+			
+			
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile(); 
+		}
+			
+		[Test]
+		public void FindDocumentBeforeCopy()
+		{
+			String filename = "Root Folder/test123";
+			if (this._verbose) System.Console.WriteLine("Finding document before add: " + filename);
+			kt_document_detail documentDetail = this._kt.get_document_detail_by_title(this._session, 1, filename, "");
+			if (0 == documentDetail.status_code)
+			{
+				if (this._verbose) System.Console.WriteLine("Found document - deleting");
+				kt_response response = this._kt.delete_document(this._session, documentDetail.document_id, "Delete - cleaning up before add");
+				Assert.AreEqual(0, response.status_code);
+			}
+			else if (this._verbose)
+			{
+				System.Console.WriteLine("document not found. that is ok!");
+			}
+		} 		
+		
+
+		[Test]
+		public void CopyTest()
+		{
+			kt_document_detail linkresp = this._kt.copy_document(this._session, this._doc1.docId, 1, "copy", "test123", "test123.txt");
+			Assert.AreEqual(0, linkresp.status_code); 
+			Assert.AreEqual("test123.txt", linkresp.filename); 
+			Assert.AreEqual("test123", linkresp.title); 
+
+			 
+
+	    	}
+		
+		[Test]
+		public void FindDocumentAfterCopy()
+		{
+			String filename = "Root Folder/test123";
+			if (this._verbose) System.Console.WriteLine("Finding document before add: " + filename);
+			kt_document_detail documentDetail = this._kt.get_document_detail_by_title(this._session, 1, filename, "");
+			Assert.AreEqual(0, documentDetail.status_code); 
+			 
+				if (this._verbose) System.Console.WriteLine("Found document - deleting");
+				kt_response response = this._kt.delete_document(this._session, documentDetail.document_id, "Delete - cleaning up before add");
+				Assert.AreEqual(0, response.status_code);
+			 
+		} 	
+		
+
+
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentDetailTest : KTTest
+    	{
+		private int 			_docId;
+		private int 			_folderId;
+		private String			_filename;
+		private String			_content;
+
+
+		[SetUp]
+		public void SetUp()
+		{
+
+			this._filename = Helper.isUnix()?"/tmp/kt_unit_test1.txt":"c:\\kt_unit_test1.txt";
+
+			String filename = "kt unit test1";
+
+			this._content = "hello world!";
+
+			Helper.writeFile(this._filename, this._content);
+			this._folderId = 1;
+
+			kt_document_detail response1 = this._kt.add_base64_document(this._session, this._folderId, filename, this._filename, "Default", Helper.ConvertFileToBase64Encoding(this._filename));
+
+			if (this._verbose && response1.status_code != 0)
+			{
+				System.Console.WriteLine("Could not create file: " + this._filename);
+			}
+			this._docId = response1.document_id;
+
+
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+
+			Helper.deleteFile(this._filename);
+
+			kt_response response = this._kt.delete_document(this._session, this._docId, "Delete - cleaning up");
+			if (this._verbose && response.status_code != 0)
+			{
+				System.Console.WriteLine("Could not delete file: " + this._filename);
+			}
+
+		}
+
+		[Test]
+		public void NonExistantDocumentTest()
+		{
+			kt_document_detail response = this._kt.get_document_detail(this._session, -1,"");
+			Assert.IsFalse(response.status_code == 0);
+	    	}
+
+		[Test]
+		public void DocumentExistanceTest()
+		{
+			kt_document_detail response = this._kt.get_document_detail(this._session, this._docId,"MLTVH");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(this._docId, response.document_id);
+			Assert.AreEqual("kt unit test1", response.title);
+			Assert.AreEqual("n/a", response.custom_document_no);
+			Assert.AreEqual("n/a", response.oem_document_no);
+			Assert.AreEqual("Default", response.document_type);
+			Assert.AreEqual("Root Folder/kt unit test1", response.full_path);
+			Assert.AreEqual("kt_unit_test1.txt", response.filename);
+			Assert.AreEqual(this._content.Length + 1, response.filesize);
+			Assert.AreEqual(this._folderId, response.folder_id);
+			Assert.AreEqual("Administrator", response.created_by);
+			Assert.IsTrue("" != response.created_date);
+			Assert.AreEqual("n/a", response.checked_out_by);
+			Assert.IsTrue("" != response.checked_out_date);
+			Assert.AreEqual("Administrator", response.modified_by);
+			Assert.IsTrue("" != response.modified_date);
+			Assert.AreEqual("Administrator", response.owned_by);
+			Assert.AreEqual(0.1, response.version);
+			Assert.AreEqual(false, response.is_immutable);
+			Assert.AreEqual("n/a", response.permissions);
+			Assert.AreEqual("n/a", response.workflow);
+			Assert.AreEqual("n/a", response.workflow_state);
+			Assert.AreEqual("text/plain", response.mime_type);
+			Assert.AreEqual("text", response.mime_icon_path);
+			Assert.AreEqual("Plain Text", response.mime_display);
+			Assert.IsTrue("" != response.storage_path);
+			Assert.AreEqual(2, response.metadata.Length);
+			Assert.AreEqual(null, response.links);
+
+			Assert.AreEqual(1, response.transaction_history.Length);
+			Assert.AreEqual("Create", response.transaction_history[0].transaction_name);
+			Assert.AreEqual("Administrator", response.transaction_history[0].username);
+			Assert.AreEqual(0.1, response.transaction_history[0].version);
+			Assert.AreEqual("Document created", response.transaction_history[0].comment);
+			Assert.IsTrue("" != response.transaction_history[0].datetime);
+
+			Assert.AreEqual(1, response.version_history.Length);
+			Assert.AreEqual("Administrator", response.version_history[0].user);
+			Assert.AreEqual(0, response.version_history[0].metadata_version);
+			Assert.AreEqual(0.1, response.version_history[0].content_version);
+
+
+
+			Assert.AreEqual(null, response.transitions);
+	    	}
+
+		//[Test]
+		public void GetDetailByTitleTest()
+		{
+			kt_document_detail response = this._kt.get_document_detail_by_name(this._session, 1, "Root Folder/kt unit test1", "T","");
+
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(this._docId, response.document_id);
+	    	}
+
+
+		//[Test]
+		public void GetDetailByTitle2Test()
+		{
+			kt_document_detail response = this._kt.get_document_detail_by_title(this._session, 1, "Root Folder/kt unit test1", "");
+
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(this._docId, response.document_id);
+	    	}
+
+		//[Test]
+		public void GetDetailByFileTest()
+		{
+			kt_document_detail response = this._kt.get_document_detail_by_name(this._session, 1, "Root Folder/kt_unit_test1.txt", "F","");
+
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(this._docId, response.document_id);
+	    	}
+		//[Test]
+		public void GetDetailByFile2Test()
+		{
+			kt_document_detail response = this._kt.get_document_detail_by_filename(this._session, 1, "Root Folder/kt_unit_test1.txt", "");
+
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(this._docId, response.document_id);
+	    	}
+
+		//[Test]
+		public void GetDetailByUnknownNameTest()
+		{
+			kt_document_detail response = this._kt.get_document_detail_by_name(this._session, 1, "Root Folder/kt_unit_test1.ssssdasdasd", "F","");
+			Assert.IsFalse(response.status_code == 0);
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+using System.Net; 
+
+namespace MonoTests.KnowledgeTree
+{ 
+	[TestFixture]
+	public class DocumentSystemMetadataTest : KTTest
+    	{
+		private int 			_folderId;
+		private Document		_doc1;
+
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose,false);
+			this._doc1.createFile(this._folderId);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+		}
+
+		[Test]
+		public void DownloadTest()
+		{
+			kt_response update_resp = this._kt.download_document(this._session, this._doc1.docId );
+			Assert.AreEqual(0, update_resp.status_code);
+
+			System.Console.WriteLine("Download...." + update_resp.message);
+
+			String uri = update_resp.message;
+
+			HttpWebRequest webrequest = (HttpWebRequest)WebRequest.Create(uri);
+
+			WebResponse response = webrequest.GetResponse();
+			StreamReader sr = new StreamReader(response.GetResponseStream());
+			String content = sr.ReadToEnd();
+
+			System.Console.WriteLine(content);
+
+
+	    	}
+
+		[Test]
+		public void SmallDownloadTest()
+		{
+			kt_response update_resp = this._kt.download_small_document(this._session, this._doc1.docId );
+			Assert.AreEqual(0, update_resp.status_code);
+
+			String filename = Helper.isUnix()?("/tmp/kt_unit_test_tmp.txt"):("c:\\kt_unit_test_tmp.txt");
+
+
+
+			long length = Helper.ConvertBase64EncodingToFile(update_resp.message, filename);
+			System.Console.WriteLine(Helper.readFile(filename));
+
+			// TODO - why???
+			Assert.AreEqual(length, this._doc1.filesize+1); 
+			
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentHistoryTest : KTTest
+    	{
+		private int 			_folderId;
+		private Document		_doc1;
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose,false);
+			this._doc1.createFile(this._folderId);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+		}
+
+		[Test]
+		public void ChangeTypeTest()
+		{
+			kt_document_version_history_response version_resp = this._kt.get_document_version_history(this._session, this._doc1.docId);
+			Assert.AreEqual(0, version_resp.status_code);
+
+			kt_document_transaction_history_response history_resp = this._kt.get_document_transaction_history(this._session, this._doc1.docId);
+			Assert.AreEqual(0, history_resp.status_code);
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+
+
+	[TestFixture]
+	public class DocumentLinkTest : KTTest
+    	{
+		private int 			_folderId;
+		private Document		_doc1;
+		private Document		_doc2;
+
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose, false);
+			this._doc1.createFile(this._folderId);
+			this._doc2 = new Document(2, this._session, this._kt, this._verbose, false);
+			this._doc2.createFile(this._folderId);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+			this._doc2.deleteFile();
+		}
+
+		[Test]
+		public void LinkingTest()
+		{
+			kt_linked_document_response linkresp = this._kt.get_document_links(this._session, this._doc1.docId);
+			Assert.AreEqual(0, linkresp.status_code);
+			Assert.AreEqual(null, linkresp.links);
+
+			kt_response response = this._kt.link_documents(this._session, this._doc1.docId, this._doc2.docId, "Reference");
+			Assert.AreEqual(0, response.status_code);
+
+			linkresp = this._kt.get_document_links(this._session, this._doc1.docId);
+			Assert.AreEqual(0, linkresp.status_code);
+			Assert.AreEqual(this._doc1.docId, linkresp.parent_document_id);
+			Assert.AreEqual(1, linkresp.links.Length);
+			Assert.AreEqual(this._doc2.docId, linkresp.links[0].document_id);
+			Assert.AreEqual(this._doc2.title, linkresp.links[0].title);
+			Assert.AreEqual("Default", linkresp.links[0].document_type);
+			Assert.AreEqual(this._doc2.filesize+1, linkresp.links[0].filesize);
+			Assert.AreEqual(0.1, linkresp.links[0].version);
+			Assert.AreEqual("n/a", linkresp.links[0].workflow);
+			Assert.AreEqual("n/a", linkresp.links[0].workflow_state);
+			Assert.AreEqual("Reference", linkresp.links[0].link_type);
+			Assert.AreEqual("n/a", linkresp.links[0].custom_document_no);
+			Assert.AreEqual("n/a", linkresp.links[0].oem_document_no);
+
+			response = this._kt.unlink_documents(this._session, this._doc1.docId, this._doc2.docId);
+			Assert.AreEqual(0, response.status_code);
+
+			linkresp = this._kt.get_document_links(this._session, this._doc1.docId);
+			Assert.AreEqual(0, linkresp.status_code);
+			Assert.AreEqual(null, linkresp.links);
+
+	    	}
+
+
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentMetadataTest : KTTest
+    	{
+		private int 			_docId;
+		private int 			_folderId;
+		private String			_filename;
+		private String			_content;
+
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._filename = Helper.isUnix()?"/tmp/kt_unit_test1.txt":"c:\\kt_unit_test1.txt";
+
+			String filename = "kt unit test1";
+
+			this._content = "hello world!";
+
+			Helper.writeFile(this._filename, this._content);
+
+			this._folderId = 1;
+
+			kt_document_detail response1 = this._kt.add_base64_document(this._session, this._folderId, filename, this._filename, "Default", Helper.ConvertFileToBase64Encoding(this._filename));
+
+			if (this._verbose && response1.status_code != 0)
+			{
+				System.Console.WriteLine("Could not create file: " + this._filename);
+			}
+			this._docId = response1.document_id;
+
+
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+
+			Helper.deleteFile(this._filename);
+
+			kt_response response = this._kt.delete_document(this._session, this._docId, "Delete - cleaning up");
+			if (this._verbose && response.status_code != 0)
+			{
+				System.Console.WriteLine("Could not delete file: " + this._filename);
+			}
+		}
+
+		[Test]
+		public void GetDocumentTypesTest()
+		{
+			kt_document_types_response doc_types = this._kt.get_document_types(this._session);
+			Assert.AreEqual(0, doc_types.status_code);
+	    	}
+
+		[Test]
+		public void GetDocumentTypeMetadataTest()
+		{
+
+			kt_metadata_response metadata = this._kt.get_document_type_metadata(this._session, "Default");
+			Assert.AreEqual(0, metadata.status_code);
+	    	}
+
+		[Test]
+		public void GetDocumentMetadataTest()
+		{
+
+			kt_metadata_response metadata = this._kt.get_document_metadata(this._session, this._docId);
+			Assert.AreEqual(0, metadata.status_code);
+	    	}
+
+		[Test]
+		public void UpdateDocumentMetadataTest()
+		{
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Technical";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[0];
+
+			kt_document_detail update_resp = this._kt.update_document_metadata(this._session, this._docId, fs, sysdata);
+			Assert.AreEqual(0, update_resp.status_code);
+			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
+
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+
+			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
+			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
+
+
+	    	}
+
+		[Test]
+		public void UpdateDocumentMetadataWithSpecialCharactersTest()
+		{
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe \\Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Tec/hn\\ical/";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text'";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[0];
+
+			kt_document_detail update_resp = this._kt.update_document_metadata(this._session, this._docId, fs, sysdata);
+			Assert.AreEqual(0, update_resp.status_code);
+			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
+
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[0].value);
+
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[1].value);
+
+			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
+			Assert.AreEqual("Text'", update_resp.metadata[1].fields[2].value);
+
+
+	    	}
+
+
+
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentOwnerTest : KTTest
+    	{
+		private int 			_folderId;
+		private Document		_doc1;
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose, false);
+			this._doc1.createFile(this._folderId);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+		}
+
+		[Test]
+		public void ChangeOwnerTest()
+		{
+			kt_document_detail response = this._kt.change_document_owner(this._session, this._doc1.docId, "anonymous", "just trying to change owner");
+			Assert.AreEqual(0, response.status_code);
+
+			// test to non existant user
+			response = this._kt.change_document_owner(this._session, this._doc1.docId, "blah", "just trying to change owner");
+			Assert.IsFalse(0 == response.status_code);
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentRenameTest : KTTest
+    	{
+		private int 			_folderId;
+		private Document		_doc1;
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose,false);
+			this._doc1.createFile(this._folderId);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+		}
+
+		[Test]
+		public void RenameTest()
+		{
+			kt_document_detail response = this._kt.rename_document_filename(this._session, this._doc1.docId, "test fname");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("test fname", response.filename);
+
+			response = this._kt.rename_document_title(this._session, this._doc1.docId, "test title");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("test title", response.title);
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+
+
+	[TestFixture]
+	public class DocumentSystemMetadataTest : KTTest
+    	{
+		private int 			_folderId;
+		private Document		_doc1;
+		private Document		_doc2;
+
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose,false);
+			this._doc1.createFile(this._folderId);
+			this._doc2 = new Document(2, this._session, this._kt, this._verbose,true);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+			this._doc2.deleteFile();
+		}
+
+//		[Test]
+		public void UpdateDocumentMetadataTest()
+		{
+
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Technical";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[3];
+			sysdata[0] = new kt_sysdata_item();
+			sysdata[0].name = "created_by";
+			sysdata[0].value = "Anonymous";
+			sysdata[1] = new kt_sysdata_item();
+			sysdata[1].name = "created_date";
+			sysdata[1].value = "2007-01-17";
+			sysdata[2] = new kt_sysdata_item();
+			sysdata[2].name = "modified_by";
+			sysdata[2].value = "admin";
+
+
+			kt_document_detail update_resp = this._kt.update_document_metadata(this._session, this._doc1.docId, fs, sysdata);
+			Assert.AreEqual(0, update_resp.status_code);
+			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
+
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+
+			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
+			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
+
+			Assert.AreEqual("Anonymous", update_resp.created_by);
+			Assert.AreEqual("2007-01-17 00:00:00", update_resp.created_date);
+			Assert.AreEqual("Administrator", update_resp.modified_by);
+			Assert.AreEqual("2007-01-17 00:00:00", update_resp.created_date);
+	    	}
+
+//		[Test]
+		public void AddSmallDocumentWithMetadataTest()
+		{
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Technical";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[2];
+			sysdata[0] = new kt_sysdata_item();
+			sysdata[0].name = "created_by";
+			sysdata[0].value = "Anonymous";
+			sysdata[1] = new kt_sysdata_item();
+			sysdata[1].name = "created_date";
+			sysdata[1].value = "2007-01-17";
+
+			this._doc2.local=false;
+			kt_document_detail update_resp = this._doc2.createFileWithMetadata(this._folderId, fs, sysdata);
+
+			Assert.AreEqual(0, update_resp.status_code);
+			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
+
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+
+			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
+			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
+
+			Assert.AreEqual("Anonymous", update_resp.created_by);
+			Assert.AreEqual("2007-01-17 00:00:00", update_resp.created_date);
+	    	}
+
+//		[Test]
+		public void CheckinSmallDocumentWithMetadataTest()
+		{
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Technical";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[2];
+			sysdata[0] = new kt_sysdata_item();
+			sysdata[0].name = "created_by";
+			sysdata[0].value = "Anonymous";
+			sysdata[1] = new kt_sysdata_item();
+			sysdata[1].name = "created_date";
+			sysdata[1].value = "2007-01-17";
+
+			kt_document_detail  resp = this._kt.checkout_base64_document(this._session, this._doc1.docId, "test checkin", false);
+			Assert.AreEqual(0, resp.status_code);
+
+
+
+			kt_document_detail update_resp = this._doc1.checkinFileWithMetadata(this._folderId, fs, sysdata);
+
+			Assert.AreEqual(0, update_resp.status_code);
+			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
+
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+
+			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
+			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
+
+			Assert.AreEqual("Anonymous", update_resp.created_by);
+			Assert.AreEqual("2007-01-17 00:00:00", update_resp.created_date);
+	    	}
+		
+		[Test]
+		public void AddDocumentWithMetadataTest()
+		{
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Technical";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[2];
+			sysdata[0] = new kt_sysdata_item();
+			sysdata[0].name = "created_by";
+			sysdata[0].value = "Anonymous";
+			sysdata[1] = new kt_sysdata_item();
+			sysdata[1].name = "created_date";
+			sysdata[1].value = "2007-01-17";
+
+
+
+			this._doc2.local = true;
+			this._doc2.createFile(this._folderId);
+
+			 
+			FileUploader uploader = new FileUploader( );
+
+			uploader.upload(this._session, this._doc2.filename);
+			
+			 System.Console.WriteLine("uploaded: " + uploader.filename);
+			kt_document_detail response1 = this._kt.add_document_with_metadata(this._session, this._folderId, this._doc2.title, this._doc2.filename, "Default", uploader.filename,fs, sysdata);
+
+			Assert.AreEqual(0, response1.status_code); 
+	    	}
+
+		[Test]
+		public void CheckinDocumentWithMetadataTest()
+		{
+			kt_metadata_fieldset[] fs = new kt_metadata_fieldset[1];
+			fs[0] = new kt_metadata_fieldset();
+			fs[0].fieldset = "General information";
+			fs[0].fields = new kt_metadata_field[3];
+			fs[0].fields[0] = new kt_metadata_field();
+			fs[0].fields[0].name = "Document Author";
+			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[1] = new kt_metadata_field();
+			fs[0].fields[1].name = "Category";
+			fs[0].fields[1].value = "Technical";
+			fs[0].fields[2] = new kt_metadata_field();
+			fs[0].fields[2].name = "Media Type";
+			fs[0].fields[2].value = "Text";
+
+			kt_sysdata_item[] sysdata = new kt_sysdata_item[2];
+			sysdata[0] = new kt_sysdata_item();
+			sysdata[0].name = "created_by";
+			sysdata[0].value = "Anonymous";
+			sysdata[1] = new kt_sysdata_item();
+			sysdata[1].name = "created_date";
+			sysdata[1].value = "2007-01-17";
+
+			kt_document_detail  resp = this._kt.checkout_base64_document(this._session, this._doc1.docId, "test checkin", false);
+			Assert.AreEqual(0, resp.status_code);
+
+			FileUploader uploader = new FileUploader( );
+
+			uploader.upload(this._session, this._doc1.filename);
+
+			kt_document_detail update_resp = this._kt.checkin_document(this._session, this._doc1.docId, this._doc1.filename, "unit test - doing checkin", uploader.filename, false); 
+			Assert.AreEqual(0, update_resp.status_code); 
+	    	}
+
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class DocumentOwnerTest : KTTest
+    	{
+ 		private int 			_folderId;
+		private Document		_doc1;
+
+		[SetUp]
+		public void SetUp()
+		{
+			this._folderId = 1;
+
+
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose,false);
+			this._doc1.createFile(this._folderId);
+
+			this._verbose = true;
+
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile();
+		}
+
+		[Test]
+		public void ChangeTypeTest()
+		{
+			// NOTE: Create the following type 'NewType' via the admin pages
+
+			kt_document_detail response = this._kt.change_document_type(this._session, this._doc1.docId, "NewType");
+			Assert.AreEqual(0, response.status_code);
+			if (0 != response.status_code)
+			{
+				System.Console.WriteLine("Please check that the document type 'NewType' exists in the database! This test should pass if it exists!");
+				System.Console.WriteLine("SQL: insert into document_types_lookup(name) values('NewType');");
+			}
+
+			// NOTE: we need to test with an unknown type as well
+
+			response = this._kt.change_document_type(this._session, this._doc1.docId, "UnknownType");
+			Assert.IsTrue(0 != response.status_code);
+
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class WorkflowTest : KTTest
+    	{ 
+		private int 			_folderId; 
+		private Document		_doc1;
+
+		[SetUp]
+		public void SetUp()
+		{ 
+			this._folderId = 1; 
+			
+			this._doc1 = new Document(1, this._session, this._kt, this._verbose, false);
+			this._doc1.createFile(this._folderId); 
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			this._doc1.deleteFile(); 
+		}
+
+		[Test]
+		public void NonExistantWorkflowTest()
+		{
+			kt_document_detail response = this._kt.start_document_workflow(this._session, this._doc1.docId, "Non Existant Workflow");
+			Assert.IsTrue(0 != response.status_code);
+		}
+
+		[Test]
+		public void StartWorkflowTest()
+		{
+			kt_document_detail response = this._kt.start_document_workflow(this._session, this._doc1.docId, "Review Process");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Review Process", response.workflow);
+		}
+
+		[Test]
+		public void StopWorkflowTest()
+		{
+			kt_document_detail response = this._kt.start_document_workflow(this._session, this._doc1.docId, "Review Process");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Review Process", response.workflow);
+
+			response = this._kt.delete_document_workflow(this._session, this._doc1.docId);
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("n/a", response.workflow);
+	    	}
+
+		[Test]
+		public void GetTransitionsTest()
+		{
+			kt_document_detail response = this._kt.start_document_workflow(this._session, this._doc1.docId, "Review Process");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Review Process", response.workflow);
+
+			kt_workflow_transitions_response trans_resp = this._kt.get_document_workflow_transitions(this._session, this._doc1.docId);
+			Assert.AreEqual(0, trans_resp.status_code);
+			Assert.AreEqual(1, trans_resp.transitions.Length);
+			Assert.AreEqual("Request Approval", trans_resp.transitions[0]);
+	    	}
+
+		[Test]
+		public void WorkflowTransitionTest()
+		{
+			kt_document_detail response = this._kt.start_document_workflow(this._session, this._doc1.docId, "Review Process");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Review Process", response.workflow);
+			Assert.AreEqual("Draft", response.workflow_state);
+
+			response = this._kt.perform_document_workflow_transition(this._session, this._doc1.docId, "Request Approval", "Please approve me");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Review Process", response.workflow);
+			Assert.AreEqual("Approval", response.workflow_state);
+
+			response = this._kt.perform_document_workflow_transition(this._session, this._doc1.docId, "Approve", "Ok!");
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual("Review Process", response.workflow);
+			Assert.AreEqual("Published", response.workflow_state);
+	    	}
+	}
+}
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class FolderTest : KTTest
+    	{
+
+		private int			_folder_id;
+		private int			_subfolder_id;
+
+		[SetUp]
+		public void SetUp()
+		{
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+		}
+
+		[Test]
+		public void GetFolderDetail()
+		{
+
+			kt_folder_detail response = this._kt.get_folder_detail(this._session, 1);
+			Assert.AreEqual(0, response.status_code);
+			Assert.AreEqual(1, response.id);
+			Assert.AreEqual("Root Folder", response.folder_name);
+			Assert.AreEqual(0, response.parent_id);
+			Assert.AreEqual("Root Folder", response.full_path);
+    		}
+
+		[Test]
+		public void AddFolder()
+		{
+
+	    		kt_folder_detail response = this._kt.create_folder(this._session, 1, "kt_unit_test");
+		       	Assert.AreEqual(0,response.status_code);
+
+			this._folder_id = response.id;
+
+	    		response = this._kt.create_folder(this._session, this._folder_id, "subfolder");
+		       	Assert.AreEqual(0,response.status_code);
+
+			this._subfolder_id = response.id;
+
+	    	}
+
+		[Test]
+		public void GetFolderByName()
+		{
+
+			kt_folder_detail response = this._kt.get_folder_detail_by_name(this._session, "/kt_unit_test");
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(this._folder_id, response.id);
+
+			response = this._kt.get_folder_detail_by_name(this._session, "kt_unit_test");
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(this._folder_id, response.id);
+
+			response = this._kt.get_folder_detail_by_name(this._session, "kt_unit_test/subfolder");
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(this._subfolder_id,response.id);
+
+			response = this._kt.get_folder_detail_by_name(this._session, "kt_unit_test/subfolder2");
+			Assert.IsFalse(response.status_code == 0);
+
+
+    		}
+
+		[Test]
+		public void GetFolderContents()
+		{
+	    	kt_folder_contents response = this._kt.get_folder_contents(this._session, this._folder_id, 1, "DF");
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(this._folder_id,response.folder_id);
+			Assert.AreEqual("kt_unit_test", response.folder_name);
+			Assert.AreEqual("Root Folder/kt_unit_test", response.full_path);
+
+	    		kt_folder_contents response2 = this._kt.get_folder_contents(this._session, this._subfolder_id, 1, "DF");
+			Assert.AreEqual(0, response2.status_code);
+			Assert.AreEqual(this._subfolder_id, response2.folder_id);
+			Assert.AreEqual("subfolder", response2.folder_name);
+			Assert.AreEqual("Root Folder/kt_unit_test/subfolder", response2.full_path);
+	    }
+
+		[Test]
+		public void RenameFolder()
+		{
+			kt_response response = this._kt.rename_folder(this._session, this._subfolder_id, "subfolde'r2");
+			Assert.AreEqual(0, response.status_code);
+
+			kt_folder_detail response2 = this._kt.get_folder_detail(this._session, this._subfolder_id);
+			Assert.AreEqual(0, response2.status_code);
+			Assert.AreEqual(this._subfolder_id, response2.id);
+			Assert.AreEqual("subfolde'r2", response2.folder_name);
+			Assert.AreEqual(this._folder_id, response2.parent_id);
+			Assert.AreEqual("Root Folder/kt_unit_test/subfolde'r2", response2.full_path);
+	    }
+
+		[Test]
+		public void RemoveFolder()
+		{
+	    	kt_response response = this._kt.delete_folder(this._session, this._folder_id, "unit testing remove");
+			Assert.AreEqual(0, response.status_code);
+	    }
+
+		[Test]
+		public void AddFolderWithSpecialCharacters()
+		{
+	    		kt_folder_detail response = this._kt.create_folder(this._session, 1, "kt.unit.test");
+		       	Assert.AreEqual(0,response.status_code);
+		       	Assert.AreEqual("kt.unit.test",response.folder_name);
+
+	    		response = this._kt.create_folder(this._session, 1, "kt ' unit \" test");
+		       	Assert.AreEqual(0,response.status_code);
+		       	Assert.AreEqual("kt ' unit \" test",response.folder_name);
+
+	    		response = this._kt.create_folder(this._session, 1, "kt - unit - test");
+		       	Assert.AreEqual(0,response.status_code);
+		       	Assert.AreEqual("kt - unit - test",response.folder_name);
+		}
+	}
+}
+using System;
+using System.Text;
+using System.Net;
+using System.IO; 
+using System.Collections;
+using System.Data;
+using System.Data.Odbc; 
+
+namespace MonoTests.KnowledgeTree
+{
+
+	
+
+	[System.Web.Services.WebServiceBinding(Name="KnowledgeTreePort", Namespace="urn:KnowledgeTree")] 
+	public class KTWebService : KnowledgeTreeService
+ 	{
+		public KTWebService() : base()
+		{
+			this.Url = Environment.GetEnvironmentVariable("KT_ROOT_URL") + "/ktwebservice/webservice.php";
+		}
+ 	}
+	
+	public class KTTest
+    	{
+		protected KTWebService 	_kt;
+		protected String 			_session;
+		protected bool	_verbose;  
+
+	
+		public KTTest()
+		{
+			this._kt = new KTWebService();
+			kt_response response = this._kt.login("admin","admin","127.0.0.1");
+			this._session = response.message;
+			this._verbose = false;   
+			this.setupDb();
+		}
+		
+		void setupDb()
+		{
+			 
+			String connectionString = "DSN=ktdms;" + "UID=root;" + "PWD=";
+			try
+	  		{
+       				IDbConnection dbcon = new OdbcConnection(connectionString);
+       				if (dbcon == null) 
+				{
+					System.Console.WriteLine("Cannot create connection");
+       				}
+				dbcon.Open();
+       				IDbCommand dbcmd = dbcon.CreateCommand();
+         			if (dbcmd == null) 
+				{
+					System.Console.WriteLine("Cannot create command");
+				}
+       				dbcmd.CommandText = "DELETE FROM folders WHERE id > 1";
+       				dbcmd.CommandType = CommandType.Text;
+        			dbcmd.ExecuteNonQuery();
+       				dbcmd.CommandText = "DELETE FROM documents";
+       				dbcmd.CommandType = CommandType.Text;
+        			dbcmd.ExecuteNonQuery();
+				dbcmd.CommandText = "DELETE FROM document_types_lookup WHERE name = 'NewType'";
+        			dbcmd.ExecuteNonQuery();
+				dbcmd.CommandText = "INSERT INTO document_types_lookup(id,name) VALUES(2,'NewType')";
+        			dbcmd.ExecuteNonQuery();
+				dbcmd.Dispose();
+       				dbcmd = null;
+       				dbcon.Close();
+       				dbcon = null;
+       			}
+       			catch(Exception ex)
+       			{
+       				System.Console.WriteLine(ex.Message);
+       			}
+		}		
+		
+		~KTTest()
+		{
+	   		this._kt.logout(this._session); 
+		}
+	}
+
+	
+
+	public class FileUploader
+	{
+		private String boundary;
+		private String uri;
+		public String filename;
+
+
+		public FileUploader(String uri)
+		{
+			this.uri = uri;
+			System.Console.WriteLine("Using upload URL: " + uri);
+			this.boundary = "----" + DateTime.Now.Ticks.ToString("x");
+		}
+		
+		public FileUploader() : this(Environment.GetEnvironmentVariable("KT_ROOT_URL") + "/ktwebservice/upload.php")
+		{
+		}
+		
+
+		public String getFilename()
+		{
+			return this.filename;
+		}
+
+
+		public void upload(String sessionid, String filename)
+		{
+			String displayname = Path.GetFileName(filename);
+			StringBuilder header = new StringBuilder();
+
+			header.Append("--" + boundary + "\r\n" + "Content-Disposition: form-data; name=\"session_id\"\r\n\r\n" + sessionid + "\r\n");
+			header.Append("--" + boundary + "\r\n" + "Content-Disposition: form-data; name=\"action\"\r\n\r\nA\r\n");
+			header.Append("--" + boundary + "\r\n" + "Content-Disposition: form-data; name=\"output\"\r\n\r\nxml\r\n");
+
+			header.Append("--" + boundary + "\r\n");
+			header.Append("Content-Disposition: form-data; name=\"name\";");
+			header.Append("filename=\"" + displayname + "\"\r\nContent-Type: application/octet-stream\r\n\r\n");
+
+
+			HttpWebRequest webrequest = (HttpWebRequest)WebRequest.Create(this.uri);
+			webrequest.ContentType = "multipart/form-data; boundary=" + boundary;
+			webrequest.Method = "POST";
+
+
+			byte[] headerArray = Encoding.UTF8.GetBytes(header.ToString());
+			byte[] boundaryArray = Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n");
+
+			FileStream file = new FileStream(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+
+			long filesize = file.Length;
+			webrequest.ContentLength = headerArray.Length + filesize + boundaryArray.Length;
+
+			Stream requestStream = webrequest.GetRequestStream();
+			requestStream.Write(headerArray, 0, headerArray.Length);
+
+			byte[] buffer = new byte[10240];
+
+			int read = 0;
+
+			while ((read = file.Read(buffer, 0, buffer.Length)) > 0)
+			{
+
+				requestStream.Write(buffer, 0, read);
+			}
+
+			requestStream.Write(boundaryArray, 0, boundaryArray.Length);
+
+
+			WebResponse response = webrequest.GetResponse();
+			StreamReader sr = new StreamReader(response.GetResponseStream());
+			String xml = sr.ReadToEnd();
+			//System.Console.WriteLine("xml: " + xml);
+
+
+
+			if (xml.IndexOf("<status_code>0</status_code>") != -1)
+			{
+				long tmp = this.tokenInt("filesize",xml);
+				if (tmp != filesize)
+				{
+					throw new Exception("Filesize should be " + filesize + " but appears to be "+ tmp);
+				}
+
+				tmp = this.tokenInt("error",xml);
+				if (tmp > 0)
+				{
+					throw new Exception("The server reported error code " + tmp + " for the file upload");
+				}
+				this.filename = this.tokenString("filename",xml);
+				// yay, all is good!
+				return;
+			}
+
+			String msg = this.tokenString("msg", xml);
+			long error = this.tokenInt("error", xml);
+			if (error > 0)
+			{
+				throw new Exception("The server reported error code " + error + " for the file upload");
+			}
+
+			throw new Exception("Upload error: " + msg);
+
+		}
+
+		private String tokenString(String token, String xml)
+		{
+			int tokStart = xml.IndexOf("<"+token+">") + token.Length+2;
+			int tokEnd = xml.IndexOf("</"+token+">");
+			if (tokEnd == -1) return "";
+
+			String value = xml.Substring(tokStart, tokEnd-tokStart);
+			//System.Console.WriteLine(token + ": " + value);
+			return value;
+		}
+
+		private long tokenInt(String token, String xml)
+		{
+			String value = this.tokenString(token, xml);
+			if (value.Equals(""))
+			{
+				return -1;
+			}
+			return long.Parse(value);
+		}
+
+	}
+	
+	 
+
+	public class Document
+	{
+		public String title;
+		public String filename;
+		public String realFilename;
+		public String content;
+		public int docId;
+		public String 			session;
+		public KnowledgeTreeService 	kt;
+		public long filesize;
+		public bool verbose;
+		public bool local;
+
+		public Document(int offset, String session, KnowledgeTreeService kt, bool verbose, bool local)
+		{
+			this.title = "kt unit test" + offset;
+			this.realFilename =  "kt_unit_test" + offset + ".txt";
+			this.filename = (Helper.isUnix()?("/tmp/"):("c:\\")) + this.realFilename;
+			this.content = "Hello World!\nThis is a test! And more!\n\n\r\n";
+			this.docId = 0;
+			this.session = session;
+			this.kt = kt;
+			this.verbose =verbose;
+			this.local = local;
+		}
+
+		public kt_document_detail createFile(int folderId)
+		{
+			Helper.writeFile(this.filename, this.content);
+			this.filesize = this.content.Length;
+
+			if (this.local)
+			{
+				return null;
+			}
+			kt_document_detail d1 = this.kt.get_document_detail_by_title(this.session, folderId, this.title, "");
+			if (d1.status_code == 1)
+			{
+				this.docId = d1.document_id;
+				this.deleteFile();
+			}
+
+			kt_document_detail response1 = this.kt.add_base64_document(this.session, folderId, this.title, this.filename, "Default", Helper.ConvertFileToBase64Encoding(this.filename));
+
+			if (response1.status_code == 0)
+			{
+				this.docId = response1.document_id;
+			}
+
+			if (this.verbose)
+			{
+				if (response1.status_code == 0)
+				{
+					System.Console.WriteLine("docid: " + this.docId + " filename: " + this.filename);
+				}
+				else
+				{
+					System.Console.WriteLine("Could not create file: " + this.filename);
+				}
+			}
+
+			return response1;
+
+		}
+
+		public kt_document_detail createFileWithMetadata(int folderId, kt_metadata_fieldset[] metadata, kt_sysdata_item[] sysdata)
+		{
+			Helper.writeFile(this.filename, this.content);
+
+			this.filesize = this.content.Length;
+
+			if (this.local)
+			{
+				return null;
+			}
+
+			kt_document_detail d1 = this.kt.get_document_detail_by_title(this.session, folderId, this.title, "");
+			if (d1.status_code == 1)
+			{
+				this.docId = d1.document_id;
+				this.deleteFile();
+			}
+
+			kt_document_detail response1 = this.kt.add_base64_document_with_metadata(this.session, folderId, this.title, this.filename, "Default", Helper.ConvertFileToBase64Encoding(this.filename), metadata, sysdata);
+
+			if (response1.status_code == 0)
+			{
+				this.docId = response1.document_id;
+			}
+
+			if (this.verbose)
+			{
+				if (response1.status_code == 0)
+				{
+					System.Console.WriteLine("docid: " + this.docId + " filename: " + this.filename);
+				}
+				else
+				{
+					System.Console.WriteLine("Could not create file: " + this.filename);
+				}
+			}
+
+			return 	response1;
+		}
+
+		public kt_document_detail checkinFileWithMetadata(int folderId, kt_metadata_fieldset[] metadata, kt_sysdata_item[] sysdata)
+		{
+			Helper.writeFile(this.filename, this.content);
+			this.filesize = this.content.Length;
+
+			if (this.local)
+			{
+				return null;
+			}
+
+			kt_document_detail d1 = this.kt.get_document_detail_by_title(this.session, folderId, this.title, "");
+			if (d1.status_code == 1)
+			{
+				this.docId = d1.document_id;
+				this.deleteFile();
+			}
+
+			kt_document_detail response1 = this.kt.checkin_base64_document_with_metadata(this.session, this.docId, this.filename, "checkin reason", Helper.ConvertFileToBase64Encoding(this.filename), false, metadata, sysdata);
+
+			if (response1.status_code == 0)
+			{
+				this.docId = response1.document_id;
+			}
+
+			if (this.verbose)
+			{
+				if (response1.status_code == 0)
+				{
+					System.Console.WriteLine("docid: " + this.docId + " filename: " + this.filename);
+				}
+				else
+				{
+					System.Console.WriteLine("Could not create file: " + this.filename);
+				}
+			}
+
+			return 	response1;
+		}
+
+
+
+		public void deleteFile()
+		{
+			Helper.deleteFile(this.filename);
+
+			if (this.local)
+			{
+				return;
+			 }
+
+			if (this.docId > 0)
+			{
+
+				kt_response response = this.kt.delete_document(this.session, this.docId, "Delete - cleaning up");
+				if (this.verbose && response.status_code != 0)
+				{
+					System.Console.WriteLine("Could not delete file: " + this.filename);
+				}
+			}
+		}
+	}
+
+
+	public class Helper
+    	{
+		public static bool isUnix()
+		{
+			// found reference on: http://www.mono-project.com/FAQ:_Technical
+			int platform = (int) Environment.OSVersion.Platform;
+			return (platform == 4) || (platform == 128);
+		}
+
+		public static void writeFile(String filename, String text)
+		{
+			try
+			{
+		 		TextWriter tw = new StreamWriter(filename);
+			 	tw.WriteLine(text );
+			 	tw.Close();
+			}
+			catch (System.Exception exp)
+			{
+				System.Console.WriteLine("{0}", exp.Message);
+				throw;
+			}
+		}
+
+		public static String readFile(String filename)
+		{
+			String text = null;
+			try
+			{
+				FileStream inFile = new FileStream(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+				StreamReader sr = new StreamReader(inFile);
+				text = sr.ReadToEnd();
+				inFile.Close();
+			}
+			catch (System.Exception exp)
+			{
+				System.Console.WriteLine("{0}", exp.Message);
+				throw;
+			}
+
+			return text;
+		}
+
+		public static void deleteFile(string filename)
+		{
+			try
+			{
+				File.Delete(filename);
+			}
+			catch(System.Exception)
+			{
+				// we are using this to cleanup, so don't handle
+			}
+		}
+
+		public static string ConvertFileToBase64Encoding(string filename)
+		{
+			System.IO.FileStream inFile;
+
+			byte[] binaryData;
+			string base64String = "";
+
+			try
+			{
+				inFile = new System.IO.FileStream(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+				binaryData = new Byte[inFile.Length];
+				inFile.Read(binaryData, 0, (int)inFile.Length);
+				inFile.Close();
+
+				base64String = System.Convert.ToBase64String(binaryData, 0, binaryData.Length);
+			}
+			catch (System.Exception exp)
+			{
+				System.Console.WriteLine("{0}", exp.Message);
+				throw;
+			}
+
+			return base64String;
+		}
+
+		public static long ConvertBase64EncodingToFile(String encoding, string filename)
+		{
+			System.IO.FileStream inFile;
+
+			byte[] binaryData;
+
+			try
+			{
+				binaryData = Convert.FromBase64String (encoding);
+
+				inFile = new System.IO.FileStream(filename, System.IO.FileMode.Create);
+
+				inFile.Write(binaryData, 0, (int)binaryData.Length);
+				inFile.Close();
+			}
+			catch (System.Exception exp)
+			{
+				System.Console.WriteLine("{0}", exp.Message);
+				throw;
+			}
+			return binaryData.Length;
+		}
+
+	}
+}
+authentication.cs
+=================
+*login
+*logout
+
+document_add.cs
+===============
+
+*add_base64_document
+*delete_document
+*delete_folder
+*get_document_detail_by_name
+*get_folder_detail_by_name
+
+document_checkout.cs
+====================
+
+*checkin_base64_document
+*checkout_base64_document
+*undo_document_checkout
+
+document_detail.cs
+==================
+
+*get_document_detail
+*get_document_detail_by_name
+
+document_links.cs
+=================
+
+*get_document_links
+*link_documents
+*unlink_documents
+
+document_owner.cs
+=================
+
+*change_document_owner
+
+
+document_type.cs
+================
+
+*change_document_type
+
+document_history.cs
+===================
+
+*get_document_version_history
+*get_document_transaction_history
+
+document_rename.cs
+==================
+
+*rename_document_filename
+*rename_document_title
+
+document_workflow.cs
+====================
+
+*start_document_workflow
+*stop_document_workflow
+*perform_document_workflow_transition
+*get_document_workflow_transitions
+
+document_metadata.cs
+====================
+
+*get_document_types
+*get_document_type_metadata
+*get_document_metadata
+*update_document_metadata
+
+folder.cs
+=========
+
+*get_folder_detail
+*create_folder
+*get_folder_detail_by_name
+*get_folder_contents
+*delete_folder
+
+document_system_metadata.cs
+===========================
+
+*update_document_metadata
+RESULTS= authentication.result document_detail.result document_contents.result document_history.result folder.result document_metadata.result document_add.result document_checkout.result document_type.result document_links.result document_owner.result document_rename.result  document_workflow.result document_copy.result   document_system_metadata.result  document_download.result
+PROXY=KTproxy.cs
+WSDL=ktdms.wsdl
+ROOT_URL=http://ktdms.trunk
+WSDL_URL=${ROOT_URL}/ktwebservice/index.php?wsdl
+
+all:  ${RESULTS}
+
+results: clean-results ${RESULTS}
+
+KTproxy.dll: KTproxy.cs helper.cs 
+	mcs -r:System.Web.Services -r:System.Data.dll /target:library KTproxy.cs helper.cs
+
+KTproxy.cs: ktdms.wsdl
+	wsdl -out:${PROXY} ${WSDL}
+
+ktdms.wsdl:
+	curl ${WSDL_URL} > ${WSDL}
+
+clean:
+	rm -f *.dll *.exe ${WSDL} ${PROXY} TestResult.xml *.dll.mdb *.result
+
+clean-results:
+	rm -f ${RESULTS}
+
+%.dll: %.cs  KTproxy.dll 
+	mcs -r:System.Web.Services -r:nunit.framework /r:KTproxy.dll   -debug /target:library -out:$@ $<
+
+%.result: %.dll
+	(export KT_ROOT_URL=${ROOT_URL}; nunit-console $<)
+	mv TestResult.xml $@
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.KnowledgeTree
+{
+	[TestFixture]
+	public class QueryTest : KTTest
+    	{
+
+
+		[SetUp]
+		public void SetUp()
+		{
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+		}
+
+		[Test]
+		public void Query()
+		{
+			Document doc = new Document(0,this._session, this._kt, false, false);
+			doc.createFile(1);
+			int filesize = doc.content.Length+1;
+			kt_search_response response = this._kt.search(this._session, "Filesize = \""+filesize+"\"", "");
+
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual("n/a", response.hits[0].custom_document_no);
+			Assert.AreEqual("n/a", response.hits[0].oem_document_no);
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
+			Assert.AreEqual(doc.title,response.hits[0].title);
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
+			response = this._kt.search(this._session, "DocumentId = \""+ response.hits[0].document_id +"\"", "");
+
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
+			Assert.AreEqual(doc.title,response.hits[0].title);
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
+			response = this._kt.search(this._session, "Title = \""+ response.hits[0].title +"\"", "");
+
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
+			Assert.AreEqual(doc.title,response.hits[0].title);
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
+
+			response = this._kt.search(this._session, "Filename = \""+ response.hits[0].filename +"\"", "");
+
+			Assert.AreEqual(0,response.status_code);
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
+			Assert.AreEqual(doc.title,response.hits[0].title);
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
+			doc.deleteFile();
+    		}
+	}
+}
@@ -33,7 +33,7 @@
 require_once(KT_LIB_DIR . "/util/sanitize.inc");
 class DocumentFieldLink extends KTEntity {
-	
+
 	/** document field link primary key */
 	var $iId;
 	/** primary key of document to which field is linked */
@@ -49,9 +49,9 @@ class DocumentFieldLink extends KTEntity {
         'iDocumentFieldId' => 'document_field_id',
         'sValue' => 'value',
     );
-	
+
 	/**
-	* Default constructor 
+	* Default constructor
 	*
 	* @param 	Primary key of document to which field is linked
 	* @param 	Primary key of field to which document is linked
@@ -65,7 +65,7 @@ class DocumentFieldLink extends KTEntity {
 		$this->iDocumentFieldId = $iNewDocumentFieldId;
 		$this->sValue = $sNewValue;
 	}
-	
+
 	/**
 	* Get the document field link primary key
 	*
@@ -75,7 +75,7 @@ class DocumentFieldLink extends KTEntity {
 	function getId() {
 		return $this->iId;
 	}
-	
+
 	/**
 	* Get the primary key of the document to which the field is linked
 	*
@@ -85,7 +85,7 @@ class DocumentFieldLink extends KTEntity {
 	function getMetadataVersionId() {
 		return $this->iMetadataVersionId;
 	}
-	
+
 	/**
 	* Set the primary key of the document to which the field is linked
 	*
@@ -95,7 +95,7 @@ class DocumentFieldLink extends KTEntity {
 	function setMetadataVersionId($iNewValue) {
 		$this->iMetadataVersionId = $iNewValue;
 	}
-	
+
 	/**
 	* Get the primary key of the field to which the document is linked
 	*
@@ -105,7 +105,7 @@ class DocumentFieldLink extends KTEntity {
 	function getDocumentFieldId() {
 		return $this->iDocumentFieldId;
 	}
-	
+
 	/**
 	* Set the primary key of the field to which the document is related
 	*
@@ -115,7 +115,7 @@ class DocumentFieldLink extends KTEntity {
 	function setDocumentFieldId($iNewVale) {
 		$this->iDocumentFieldId = $iNewValue;
 	}
-	
+
 	/**
 	* Get the value of the field
 	*
@@ -123,9 +123,9 @@ class DocumentFieldLink extends KTEntity {
 	*
 	*/
 	function getValue() {
-		return sanitizeForSQLtoHTML($this->sValue);
+		return $this->sValue;
 	}
-	
+
 	/**
 	* Set the value of the field
 	*
@@ -139,7 +139,7 @@ class DocumentFieldLink extends KTEntity {
     function _table () {
         return KTUtil::getTableName('document_fields_link');
     }
-	
+
 	/**
 	*
 	* Static function.  Given a document fields link primary key will create
@@ -106,7 +106,7 @@ class KTDocumentUtil {
         }
         // create the document transaction record
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, $sCheckInComment, 'ktcore.transactions.check_in');
+        $oDocumentTransaction = new DocumentTransaction($oDocument, $sCheckInComment, 'ktcore.transactions.check_in');
         $oDocumentTransaction->create();
         $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
@@ -122,6 +122,11 @@ class KTDocumentUtil {
             }
         }
+        // NEW SEARCH
+
+        Indexer::index($oDocument);
+
+        /*
         $aTriggers = $oKTTriggerRegistry->getTriggers('content', 'transform');
         foreach ($aTriggers as $aTrigger) {
             $sTrigger = $aTrigger[0];
@@ -132,6 +137,7 @@ class KTDocumentUtil {
             $oTrigger->setDocument($oDocument);
             $oTrigger->transform();
         }
+        */
         // fire subscription alerts for the checked in document
         $oSubscriptionEvent = new SubscriptionEvent();
@@ -169,10 +175,10 @@ class KTDocumentUtil {
             }
         }
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, $sCheckoutComment, 'ktcore.transactions.check_out');
+        $oDocumentTransaction = new DocumentTransaction($oDocument, $sCheckoutComment, 'ktcore.transactions.check_out');
         $oDocumentTransaction->create();
-        // fire subscription alerts for the checked in document
+        // fire subscription alerts for the downloaded document
         $oSubscriptionEvent = new SubscriptionEvent();
         $oFolder = Folder::get($oDocument->getFolderID());
         $oSubscriptionEvent->CheckOutDocument($oDocument, $oFolder);
@@ -180,6 +186,45 @@ class KTDocumentUtil {
         return true;
     }
+    function archive($oDocument, $sReason) {
+
+        $this->startTransaction();
+        $oDocument->setStatusID(ARCHIVED);
+        $res = $oDocument->update();
+
+        if (PEAR::isError($res) || ($res === false)) {
+            return PEAR::raiseError(_kt('There was a database error while trying to archive this file'));
+        }
+
+        $oDocumentTransaction = & new DocumentTransaction($oDocument, sprintf(_kt('Document archived: %s'), $sReason), 'ktcore.transactions.update');
+        $oDocumentTransaction->create();
+
+        $this->commitTransaction();
+
+        $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+        $aTriggers = $oKTTriggerRegistry->getTriggers('archive', 'postValidate');
+        foreach ($aTriggers as $aTrigger) {
+            $sTrigger = $aTrigger[0];
+            $oTrigger = new $sTrigger;
+            $aInfo = array(
+                'document' => $oDocument,
+            );
+            $oTrigger->setInfo($aInfo);
+            $ret = $oTrigger->postValidate();
+            if (PEAR::isError($ret)) {
+                $oDocument->delete();
+                return $ret;
+            }
+        }
+
+        // fire subscription alerts for the archived document
+        $oSubscriptionEvent = new SubscriptionEvent();
+        $oFolder = Folder::get($oDocument->getFolderID());
+        $oSubscriptionEvent->ArchivedDocument($oDocument, $oFolder);
+
+        return true;
+    }
+
     function &_add($oFolder, $sFilename, $oUser, $aOptions) {
         global $default;
@@ -204,9 +249,6 @@ class KTDocumentUtil {
             'creatorid' => $oUser->getID(),
             'documenttypeid' => $iDocumentTypeId,
         ));
-        if (PEAR::isError($oDocument)) {
-            return $oDocument;
-        }
 //        if (is_null($oContents)) {
 //            $res = KTDocumentUtil::setIncomplete($oDocument, 'contents');
@@ -244,6 +286,81 @@ class KTDocumentUtil {
         return $oDocument;
     }
+    // Overwrite the document
+    function overwrite($oDocument, $sFilename, $sTempFileName, $oUser, $aOptions) {
+        //$oDocument, $sFilename, $sCheckInComment, $oUser, $aOptions = false
+        $oStorage =& KTStorageManagerUtil::getSingleton();
+        $iFileSize = filesize($sTempFileName);
+
+        // Check that document is not checked out
+        if($oDocument->getIsCheckedOut()) {
+            return PEAR::raiseError(_kt('Document is checkout and cannot be overwritten'));
+        }
+
+        if (!$oStorage->upload($oDocument, $sTempFileName)) {
+            return PEAR::raiseError(_kt('An error occurred while storing the new file'));
+        }
+
+        $oDocument->setLastModifiedDate(getCurrentDateTime());
+        $oDocument->setModifiedUserId($oUser->getId());
+
+        $oDocument->setFileSize($iFileSize);
+
+        $sOriginalFilename = $oDocument->getFileName();
+
+        if($sOriginalFilename != $sFilename){
+            if(strlen($sFilename)) {
+        	global $default;
+        	$oDocument->setFileName($sFilename);
+        	$default->log->info('renamed document ' . $oDocument->getId() . ' to ' . $sFilename);
+            }
+            $oDocument->setMinorVersionNumber($oDocument->getMinorVersionNumber()+1);
+        }
+
+        $sType = KTMime::getMimeTypeFromFile($sFilename);
+        $iMimeTypeId = KTMime::getMimeTypeID($sType, $oDocument->getFileName());
+        $oDocument->setMimeTypeId($iMimeTypeId);
+
+        $bSuccess = $oDocument->update();
+        if ($bSuccess !== true) {
+            if (PEAR::isError($bSuccess)) {
+                return $bSuccess;
+            }
+            return PEAR::raiseError(_kt('An error occurred while storing this document in the database'));
+        }
+/*
+        // create the document transaction record
+        $oDocumentTransaction = new DocumentTransaction($oDocument, $sCheckInComment, 'ktcore.transactions.check_in');
+        $oDocumentTransaction->create();
+
+        $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+        $aTriggers = $oKTTriggerRegistry->getTriggers('content', 'scan');
+        foreach ($aTriggers as $aTrigger) {
+            $sTrigger = $aTrigger[0];
+            $oTrigger = new $sTrigger;
+            $oTrigger->setDocument($oDocument);
+            $ret = $oTrigger->scan();
+            if (PEAR::isError($ret)) {
+                $oDocument->delete();
+                return $ret;
+            }
+        }
+
+        // NEW SEARCH
+
+        Indexer::index($oDocument);
+
+
+        // fire subscription alerts for the checked in document
+        $oSubscriptionEvent = new SubscriptionEvent();
+        $oFolder = Folder::get($oDocument->getFolderID());
+        $oSubscriptionEvent->CheckinDocument($oDocument, $oFolder);
+
+        KTDocumentUtil::updateSearchableText($oDocument);
+*/
+        return true;
+    }
+
     // {{{ validateMetadata
     function validateMetadata(&$oDocument, $aMetadata) {
         $aFieldsets =& KTFieldset::getGenericFieldsets();
@@ -425,34 +542,15 @@ class KTDocumentUtil {
     // {{{ _in_add
     function &_in_add($oFolder, $sFilename, $oUser, $aOptions) {
         $aOrigOptions = $aOptions;
-        if (KTDocumentUtil::fileExists($oFolder, $sFilename)) {
-	    $oDoc = Document::getByFilenameAndFolder($sFilename, $oFolder->getId());
-	    if (PEAR::isError($oDoc)) {
-                return PEAR::raiseError(_kt('Document with that filename already exists in this folder, and appears to be invalid.  Please contact the system administrator.'));
-	    } else {
-		if ($oDoc->getStatusID() != LIVE) {
-		    $sError = _kt('Document with that filename already exists in this folder, but it has been archived or deleted and is still available for restoration.  To prevent it being overwritten, you are not allowed to add a document with the same title or filename.');
-		} else {
-		    $sError = _kt('Document with that filename already exists in this folder.');
-		}
-
-		$sError .= _kt(' Document') . ': ' . $oDoc->getName() . ' (ID:' . $oDoc->getId() . ')';
-		return PEAR::raiseError($sError);
-	    }
+        while(KTDocumentUtil::fileExists($oFolder, $sFilename)) {
+          $oDoc = Document::getByFilenameAndFolder($sFilename, $oFolder->getId());
+          $sFilename = KTDocumentUtil::generateNewDocumentFilename($oDoc->getFileName());
         }
         $sName = KTUtil::arrayGet($aOptions, 'description', $sFilename);
-        if (KTDocumentUtil::nameExists($oFolder, $sName)) {
-	    $oDoc = Document::getByNameAndFolder($sName, $oFolder->getId());
-	    if (PEAR::isError($oDoc)) {
-                return PEAR::raiseError(_kt('Document with that title already exists in this folder, and appears to be invalid.  Please contact the system administrator.'));
-	    } else {
-		if ($oDoc->getStatusID != LIVE) {
-                    return PEAR::raiseError(_kt('Document with that title already exists in this folder, but it has been archived or deleted and is still available for restoration.  To prevent it being overwritten, you are not allowed to add a document with the same title or filename.'));
-		} else {
-		    return PEAR::raiseError(_kt('Document with that title already exists in this folder.'));
-		}
-	    }
-
+        while(KTDocumentUtil::nameExists($oFolder, $sName)) {
+          $oDoc = Document::getByNameAndFolder($sName, $oFolder->getId());
+          $aOptions['description'] = KTDocumentUtil::generateNewDocumentName($oDoc->getName());
+          $sName = KTDocumentUtil::generateNewDocumentName($oDoc->getName());
         }
         $oUploadChannel =& KTUploadChannel::getSingleton();
@@ -479,6 +577,10 @@ class KTDocumentUtil {
             }
         }
+        // NEW SEARCH
+
+        Indexer::index($oDocument);
+        /*
         $oUploadChannel->sendMessage(new KTUploadGenericMessage(_kt('Transforming file')));
         $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
         $aTriggers = $oKTTriggerRegistry->getTriggers('content', 'transform');
@@ -491,12 +593,12 @@ class KTDocumentUtil {
             $oTrigger->setDocument($oDocument);
             // $oUploadChannel->sendMessage(new KTUploadGenericMessage(sprintf(_kt("    (trigger %s)"), $sTrigger)));
             $oTrigger->transform();
-        }
+        }*/
         // $oUploadChannel->sendMessage(new KTUploadGenericMessage(_kt('Creating transaction')));
         $aOptions = array('user' => $oUser);
         //create the document transaction record
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, _kt('Document created'), 'ktcore.transactions.create', $aOptions);
+        $oDocumentTransaction = new DocumentTransaction($oDocument, _kt('Document created'), 'ktcore.transactions.create', $aOptions);
         $res = $oDocumentTransaction->create();
         if (PEAR::isError($res)) {
             $oDocument->delete();
@@ -531,6 +633,45 @@ class KTDocumentUtil {
     }
     // }}}
+	function generateNewDocumentFilename($sDocFilename){
+		if(preg_match("/\([0-9]+\)(\.[^\.]+){1,}$/", $sDocFilename)){
+		  preg_match("/\([0-9]+\)\./", $sDocFilename, $matches);
+		  $new_one = substr($matches[0], 1);
+		  $new_two = explode(')', $new_one);
+		  $new = $new_two[0]+1;
+
+		  $pattern[0] = '/\([0-9]+\)\./';
+		  $replacement[0] = ' ('.$new.').';
+		  $sFilename = preg_replace($pattern, $replacement, $sDocFilename);
+		}else{
+		  $matches = explode('.', $sDocFilename);
+		  $prefix = $matches[0].' (2)';
+		  for($i = 1; $i < count($matches); $i++ ){
+		    $suffix .= '.'.$matches[$i];
+		  }
+		  $sFilename = $prefix.$suffix;
+		}
+
+		return $sFilename;
+	}
+
+	function generateNewDocumentName($sDocName){
+		if(preg_match("/\([0-9]+\)$/", $sDocName)){
+		  preg_match("/\([0-9]+\)$/", $sDocName, $matches);
+		  $new_one = substr($matches[0], 1);
+		  $new_two = explode(')', $new_one);
+		  $new = $new_two[0]+1;
+
+		  $pattern[0] = '/\([0-9]+\)$/';
+		  $replacement[0] = '('.$new.')';
+		  $sName = preg_replace($pattern, $replacement, $sDocName);
+		}else{
+		  $sName =  $sDocName.' (2)';
+		}
+
+		return $sName;
+	}
+
     // {{{ fileExists
     function fileExists($oFolder, $sFilename) {
         return Document::fileExists($sFilename, $oFolder->getID());
@@ -571,7 +712,7 @@ class KTDocumentUtil {
         $iMimeTypeId = KTMime::getMimeTypeID($sType, $oDocument->getFileName());
         $oDocument->setMimeTypeId($iMimeTypeId);
-        $res = $oStorage->upload($oDocument, $sFilename);
+        $res = $oStorage->upload($oDocument, $sFilename, $aOptions);
         if ($res === false) {
             return PEAR::raiseError(sprintf(_kt("Couldn't store contents: %s"), _kt('No reason given')));
         }
@@ -590,6 +731,11 @@ class KTDocumentUtil {
     // {{{ updateTransactionText
     function updateTransactionText($oDocument) {
+
+        // NEW SEARCH
+
+        return;
+
         $iDocumentId = KTUtil::getId($oDocument);
         $aTransactions = DocumentTransaction::getByDocument($iDocumentId);
         foreach ($aTransactions as $oTransaction) {
@@ -612,6 +758,10 @@ class KTDocumentUtil {
     // {{{ updateSearchableText
     function updateSearchableText($oDocument, $bOverride = false) {
+
+        // NEW SEARCH
+        return;
+
         if (isset($GLOBALS['_IN_ADD']) && empty($bOverride)) {
             return;
         }
@@ -716,7 +866,7 @@ class KTDocumentUtil {
             return PEAR::raiseError(_kt('There was a problem deleting the document from storage.'));
         }
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, _kt('Document deleted: ') . $sReason, 'ktcore.transactions.delete');
+        $oDocumentTransaction = new DocumentTransaction($oDocument, _kt('Document deleted: ') . $sReason, 'ktcore.transactions.delete');
         $oDocumentTransaction->create();
         $oDocument->setFolderID(1);
@@ -752,6 +902,14 @@ class KTDocumentUtil {
     // }}}
     function reindexDocument($oDocument) {
+
+        // NEW SEARCH
+
+        Indexer::index($oDocument);
+
+        return;
+
+        /*
         $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
         $aTriggers = $oKTTriggerRegistry->getTriggers('content', 'transform');
         foreach ($aTriggers as $aTrigger) {
@@ -763,7 +921,7 @@ class KTDocumentUtil {
             $oTrigger->setDocument($oDocument);
             $oTrigger->transform();
         }
-        KTDocumentUtil::updateSearchableText($oDocument);
+        KTDocumentUtil::updateSearchableText($oDocument);*/
     }
@@ -778,7 +936,7 @@ class KTDocumentUtil {
     }
-    function copy($oDocument, $oDestinationFolder, $sReason = null) {
+    function copy($oDocument, $oDestinationFolder, $sReason = null, $sDestinationDocName = null) {
         // 1. generate a new triad of content, metadata and core objects.
         // 2. update the storage path.
 		//print '--------------------------------- BEFORE';
@@ -797,23 +955,36 @@ class KTDocumentUtil {
         // we still have a bogus md_version, but integrity holds, so fix it now.
         $oCore = KTDocumentCore::get($id);
+        // Get the metadata version for the source document
         $sTable = KTUtil::getTableName('document_metadata_version');
         $sQuery = 'SELECT * FROM ' . $sTable . ' WHERE id = ?';
         $aParams = array($oDocument->getMetadataVersionId());
         $aMDRow = DBUtil::getOneResult(array($sQuery, $aParams));
         unset($aMDRow['id']);
+
+        // Copy the source metadata into the destination document
         $aMDRow['document_id'] = $oCore->getId();
+        if(!empty($sDestinationDocName)){
+            $aMDRow['name'] = $sDestinationDocName;
+            $aMDRow['description'] = $sDestinationDocName;
+        }
         $id = DBUtil::autoInsert($sTable, $aMDRow);
         if (PEAR::isError($id)) { return $id; }
         $oCore->setMetadataVersionId($id);
         $oMDV = KTDocumentMetadataVersion::get($id);
+        // Get the content version for the source document
         $sTable = KTUtil::getTableName('document_content_version');
         $sQuery = 'SELECT * FROM ' . $sTable . ' WHERE id = ?';
         $aParams = array($oDocument->_oDocumentContentVersion->getId());
         $aContentRow = DBUtil::getOneResult(array($sQuery, $aParams));
         unset($aContentRow['id']);
+
+        // Copy the source content into the destination document
         $aContentRow['document_id'] = $oCore->getId();
+        if(!empty($sDestinationDocName)){
+            $aContentRow['filename'] = $sDestinationDocName;
+        }
         $id = DBUtil::autoInsert($sTable, $aContentRow);
         if (PEAR::isError($id)) { return $id; }
         $oMDV->setContentVersionId($id);
@@ -835,6 +1006,10 @@ class KTDocumentUtil {
         $res = KTDocumentUtil::copyMetadata($oNewDocument, $oDocument->getMetadataVersionId());
         if (PEAR::isError($res)) { return $res; }
+        // Ensure the copied document is not checked out
+        $oNewDocument->setIsCheckedOut(false);
+        $oNewDocument->setCheckedOutUserID(-1);
+
         // finally, copy the actual file.
         $oStorage =& KTStorageManagerUtil::getSingleton();
         $res = $oStorage->copy($oDocument, $oNewDocument);
@@ -851,6 +1026,11 @@ class KTDocumentUtil {
         $res = $oNewDocument->update();
         if (PEAR::isError($res)) { return $res; }
+        // NEW SEARCH
+
+
+        /*
+
         $sTable = KTUtil::getTableName('document_text');
         $aQuery = array("SELECT document_text FROM $sTable WHERE document_id = ?", array($oDocument->getId()));
         $sData = DBUtil::getOneResultKey($aQuery, 'document_text');
@@ -860,6 +1040,8 @@ class KTDocumentUtil {
             'document_text' => $contents,
         );
         DBUtil::autoInsert($sTable, $aInsertValues, array('noid' => true));
+
+        */
         KTDocumentUtil::updateSearchableText($oNewDocument);
         KTPermissionUtil::updatePermissionLookup($oNewDocument);
@@ -867,14 +1049,36 @@ class KTDocumentUtil {
             $sReason = '';
         }
-
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, sprintf(_kt("Copied to folder \"%s\". %s"), $oDestinationFolder->getName(), $sReason), 'ktcore.transactions.copy');
+        $oDocumentTransaction = new DocumentTransaction($oDocument, sprintf(_kt("Copied to folder \"%s\". %s"), $oDestinationFolder->getName(), $sReason), 'ktcore.transactions.copy');
         $oDocumentTransaction->create();
         $oSrcFolder = Folder::get($oDocument->getFolderID());
-        $oDocumentTransaction = & new DocumentTransaction($oNewDocument, sprintf(_kt("Copied from original in folder \"%s\". %s"), $oSrcFolder->getName(), $sReason), 'ktcore.transactions.copy');
+        $oDocumentTransaction = new DocumentTransaction($oNewDocument, sprintf(_kt("Copied from original in folder \"%s\". %s"), $oSrcFolder->getName(), $sReason), 'ktcore.transactions.copy');
         $oDocumentTransaction->create();
+
+        $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+        $aTriggers = $oKTTriggerRegistry->getTriggers('copyDocument', 'postValidate');
+        foreach ($aTriggers as $aTrigger) {
+            $sTrigger = $aTrigger[0];
+            $oTrigger = new $sTrigger;
+            $aInfo = array(
+                'document' => $oNewDocument,
+                'old_folder' => $oSrcFolder,
+                'new_folder' => $oDestinationFolder,
+            );
+            $oTrigger->setInfo($aInfo);
+            $ret = $oTrigger->postValidate();
+            if (PEAR::isError($ret)) {
+                return $ret;
+            }
+        }
+
+        // fire subscription alerts for the copied document
+        $oSubscriptionEvent = new SubscriptionEvent();
+        $oFolder = Folder::get($oDocument->getFolderID());
+        $oSubscriptionEvent->MoveDocument($oDocument, $oDestinationFolder, $oSrcFolder, 'CopiedDocument');
+
         return $oNewDocument;
     }
@@ -907,7 +1111,7 @@ class KTDocumentUtil {
         }
         // create the document transaction record
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, _kt('Document renamed'), 'ktcore.transactions.update');
+        $oDocumentTransaction = new DocumentTransaction($oDocument, _kt('Document renamed'), 'ktcore.transactions.update');
         $oDocumentTransaction->create();
         // fire subscription alerts for the checked in document
@@ -959,7 +1163,7 @@ class KTDocumentUtil {
         // create the document transaction record
-        $oDocumentTransaction = & new DocumentTransaction($oDocument, $sMoveMessage, 'ktcore.transactions.move');
+        $oDocumentTransaction = new DocumentTransaction($oDocument, $sMoveMessage, 'ktcore.transactions.move');
         $oDocumentTransaction->create();
@@ -980,15 +1184,79 @@ class KTDocumentUtil {
             }
         }
+        // fire subscription alerts for the moved document
+        $oSubscriptionEvent = new SubscriptionEvent();
+        $oSubscriptionEvent->MoveDocument($oDocument, $oFolder, $oOriginalFolder);
+
         return KTPermissionUtil::updatePermissionLookup($oDocument);
     }
+    /**
+    * Delete a selected version of the document.
+    */
+    function deleteVersion($oDocument, $iVersionID, $sReason){
+
+        $oDocument =& KTUtil::getObject('Document', $oDocument);
+        $oVersion =& KTDocumentMetadataVersion::get($iVersionID);
+
+        $oStorageManager =& KTStorageManagerUtil::getSingleton();
+
+        global $default;
+
+        if (empty($sReason)) {
+            return PEAR::raiseError(_kt('Deletion requires a reason'));
+        }
+
+        if (PEAR::isError($oDocument) || ($oDocument == false)) {
+            return PEAR::raiseError(_kt('Invalid document object.'));
+        }
+
+        if (PEAR::isError($oVersion) || ($oVersion == false)) {
+            return PEAR::raiseError(_kt('Invalid document version object.'));
+        }
+
+        $iContentId = $oVersion->getContentVersionId();
+        $oContentVersion = KTDocumentContentVersion::get($iContentId);
+
+        if (PEAR::isError($oContentVersion) || ($oContentVersion == false)) {
+            DBUtil::rollback();
+            return PEAR::raiseError(_kt('Invalid document content version object.'));
+        }
+
+        DBUtil::startTransaction();
+
+        // now delete the document version
+        $res = $oStorageManager->deleteVersion($oVersion);
+        if (PEAR::isError($res) || ($res == false)) {
+            //could not delete the document version from the file system
+            $default->log->error('Deletion: Filesystem error deleting the metadata version ' .
+                $oVersion->getMetadataVersion() . ' of the document ' .
+                $oDocument->getFileName() . ' from folder ' .
+                Folder::getFolderPath($oDocument->getFolderID()) .
+                ' id=' . $oDocument->getFolderID());
+
+            // we use a _real_ transaction here ...
+
+            DBUtil::rollback();
+
+            return PEAR::raiseError(_kt('There was a problem deleting the document from storage.'));
+        }
+
+        // change status for the metadata version
+        $oVersion->setStatusId(VERSION_DELETED);
+        $oVersion->update();
+
+        // set the storage path to empty
+//        $oContentVersion->setStoragePath('');
+
+        DBUtil::commit();
+    }
 }
 class KTMetadataValidationError extends PEAR_Error {
     function KTMetadataValidationError ($aFailed) {
         $this->aFailed = $aFailed;
-        $message = _kt('Validation Failed');
+        $message = _kt('Please be sure to enter information for all the Required fields below');
         parent::PEAR_Error($message);
     }
 }
@@ -51,13 +51,13 @@ function sanitize($string) {
 }
 function sanitizeForSQL($string, $min='', $max='') {
-    
+
     $string = trim($string);
 	if(get_magic_quotes_gpc()) $string = stripslashes($string);
-    
+
     $len = strlen($string);
     if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max))) return false;
-    
+
     if(function_exists("mysql_real_escape_string")) {
         return mysql_real_escape_string($string);
     } else {
@@ -65,12 +65,10 @@ function sanitizeForSQL($string, $min=&#39;&#39;, $max=&#39;&#39;) {
     }
 }
-function sanitizeForSQLtoHTML($string, $min='', $max='') {
-    
-	$string = str_ireplace("\r", "", $string);
-	$string = str_ireplace("\n", "", $string);
-    return stripslashes(trim($string));
-    
+function sanitizeForSQLtoHTML($string, $min='', $max='')
+{
+	$string = str_replace(array("\r","\n"), array('',''), $string);
+    return $string;
 }
 function sanitizeForHTML($string, $min='', $max='')
@@ -80,7 +78,7 @@ function sanitizeForHTML($string, $min=&#39;&#39;, $max=&#39;&#39;)
     $len = strlen($string);
     if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max))) return false;
-    
+
     if(function_exists("htmlspecialchars")) {
     	return htmlspecialchars($string);
     } else {
@@ -117,8 +115,8 @@ function sanitizeForSYSTEM($string, $min=&#39;&#39;, $max=&#39;&#39;)
     $len = strlen($string);
     if((($min != '') && ($len < $min)) || (($max != '') && ($len > $max))) return false;
-    
-    $pattern = '/( ;|\||`|>|<|&|^|"|'."\n|\r|'".'|{|}|[|]|\)|\( )/i'; 
+
+    $pattern = '/( ;|\||`|>|<|&|^|"|'."\n|\r|'".'|{|}|[|]|\)|\( )/i';
     $string = preg_replace( $pattern, '', $string);
     return '"'.preg_replace( '/\$/', '\\\$', $string).'"';
 }