Merged in from DEV trunk...

BBS-1036 "Option to turn off request for metadata on document upload" Added a function to the web services API to retrieve KTtools configuration from the server. Committed By: Isaac Lundall Reviewed By: Martin Kirsten git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7107 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
BBS-1036 "Option to turn off request for metadata on document upload" Added a function to the web services API to retrieve KTtools configuration from the server. Committed By: Isaac Lundall Reviewed By: Martin Kirsten git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7107 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 7c0e44e3
Showing 4 changed files with 67 additions and 6 deletions
config/config.ini
config/dmsDefaults.php
ktapi/ktapi.inc.php
ktwebservice/webservice.php
@@ -290,3 +290,9 @@ safemode = on
 ; Identify the location of the mysql.exe and mysqldump.exe
 ;mysqlDirectory=c:/program files/ktdms/mysql/bin
+
+[KTtoolsSettings]
+;These two settings control whether or not the client is prompted for metadata when a 
+;document is added to knowledgetree via KTtools. They default to true.
+explorerMetadataCapture = true
+officeMetadataCapture = true
@@ -450,6 +450,10 @@ class KTInit {
             $oKTConfig->setdefaultns('webservice', 'uploadExpiry', '30');
             $oKTConfig->setdefaultns('webservice', 'downloadExpiry', '30');
             $oKTConfig->setdefaultns('webservice', 'randomKeyText', 'bkdfjhg23yskjdhf2iu');
+	    
+            $oKTConfig->setdefaultns('KTtoolsSettings', 'explorerMetadataCapture', true);
+            $oKTConfig->setdefaultns('KTtoolsSettings', 'officeMetadataCapture', true);
+
             $res = $this->readConfig();
             if (PEAR::isError($res)) { return $res; }
-<?
+<?php
 /**
  * $Id$
  *
@@ -575,7 +575,13 @@ class KTAPI
 		}
 		return $results;
 	}
+	
+	function get_dms_defaults()
+	{
+		global $default;
+		return $default;
+	}
 }
-?>
 \ No newline at end of file
+?>
-<?
+<?php
 /**
  *
@@ -323,6 +323,19 @@ class KTWebService
             	'document_types' => "{urn:$this->namespace}kt_document_types_array"
             );
+        $this->__typedef["{urn:$this->namespace}kt_server_settings"] =
+			array(
+            	'explorer_metadata_capture' => 'boolean',
+            	'office_metadata_capture' => 'boolean'
+            );
+
+	$this->__typedef["{urn:$this->namespace}kt_server_settings_response"] =
+			array(
+            	'status_code' => 'int',
+            	'message' => 'string',
+            	'settings' => "{urn:$this->namespace}kt_server_settings"
+            );
+
          /* methods */
          // login
@@ -420,19 +433,19 @@ class KTWebService
           //  checkin_document
          $this->__dispatch_map['checkin_document'] =
             array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','tempfilename' =>'string', 'major_update'=>'boolean' ),
-             'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
             );
           //  checkin_small_document
          $this->__dispatch_map['checkin_small_document'] =
             array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','base64' =>'string', 'major_update'=>'boolean' ),
-             'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
             );
           //  checkin_base64_document
          $this->__dispatch_map['checkin_base64_document'] =
             array('in' => array('session_id'=>'string','document_id'=>'int','filename'=>'string','reason' =>'string','base64' =>'string', 'major_update'=>'boolean' ),
-             'out' => array( 'return' => "{urn:$this->namespace}kt_response" ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_document_detail" ),
               'alias' => 'checkin_small_document'
             );
@@ -615,12 +628,19 @@ class KTWebService
             array('in' => array('session_id'=>'string' ),
              'out' => array( 'return' => "{urn:$this->namespace}kt_document_types_response" ),
             );
+	    
          // get_document_link_types
          $this->__dispatch_map['get_document_link_types'] =
             array('in' => array('session_id'=>'string' ),
              'out' => array( 'return' => "{urn:$this->namespace}kt_document_types_response" ),
             );
+         // get_server_settings
+         $this->__dispatch_map['get_server_settings'] =
+            array('in' => array('session_id'=>'string' ),
+             'out' => array( 'return' => "{urn:$this->namespace}kt_server_settings_response" ),
+            );
+
     }
@@ -2954,6 +2974,31 @@ class KTWebService
     	return $response;
 	}
+	/**
+	 * Retrieves the server settings for this server
+	 *
+	 * @param string $session_id
+	 * @return kt_server_settings_response
+	 */
+	function get_server_settings($session_id)
+	{
+		$kt = &$this->get_ktapi($session_id );
+		if (is_array($kt))
+		{
+			return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $kt);
+		}
+		
+		$dms_defaults = $kt->get_dms_defaults();
+		$response['settings'] = array(
+						'explorer_metadata_capture' => $dms_defaults->explorerMetadataCapture,
+						'office_metadata_capture' => $dms_defaults->officeMetadataCapture
+						);
+		$response['message'] = 'Knowledgetree server settings retrieval succeeded.';
+		$response['status_code'] = KTWS_SUCCESS;
+
+		return $response;
+	}
+
     /**
      * This runs the web service
      *