From 6c2a011a9af1fa8b0941a6202418dc3fcc1beb2b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 06:17:44 +0100
Subject: [PATCH 1/3] move block to parse categories after dms has been
 initialized

---
 utils/adddoc.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 035fd2763..5453dd099 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -84,19 +84,6 @@ if(isset($options['k'])) {
 	$keywords = $options['k'];
 }
 
-$categories = array();
-if(isset($options['K'])) {
-	$categorynames = explode(',', $options['K']);
-	foreach($categorynames as $categoryname) {
-		$cat = $dms->getDocumentCategoryByName($categoryname);
-		if($cat) {
-			$categories[] = $cat->getID();
-		} else {
-			echo "Category '".$categoryname."' not found\n";
-		}
-	}
-}
-
 $sequence = 0;
 if(isset($options['s'])) {
 	$sequence = $options['s'];
@@ -143,6 +130,20 @@ if(!$dms->checkVersion()) {
 	exit;
 }
 
+/* Parse categories */
+$categories = array();
+if(isset($options['K'])) {
+	$categorynames = explode(',', $options['K']);
+	foreach($categorynames as $categoryname) {
+		$cat = $dms->getDocumentCategoryByName($categoryname);
+		if($cat) {
+			$categories[] = $cat->getID();
+		} else {
+			echo "Category '".$categoryname."' not found\n";
+		}
+	}
+}
+
 /* Parse document attributes.  */
 $document_attributes = array();
 if (isset($options['a'])) {

From 6bef6824c232a871ca79602937910bbceeebc05f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 06:35:16 +0100
Subject: [PATCH 2/3] pass list of category objects to addDocument instead of
 cat ids

---
 utils/adddoc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 5453dd099..80c92386a 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -137,7 +137,7 @@ if(isset($options['K'])) {
 	foreach($categorynames as $categoryname) {
 		$cat = $dms->getDocumentCategoryByName($categoryname);
 		if($cat) {
-			$categories[] = $cat->getID();
+			$categories[] = $cat;
 		} else {
 			echo "Category '".$categoryname."' not found\n";
 		}

From 71ac5428ca294d4496120d0ab4021ba8999373c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 06:35:48 +0100
Subject: [PATCH 3/3] fix wrong parameter comment of addDocument()

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 951c27579..d715ed6de 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -728,7 +728,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *        expiration date
 	 * @param object $owner owner of the new document
 	 * @param string $keywords keywords of new document
-	 * @param array $categories list of category ids
+	 * @param array $categories list of category objects
 	 * @param string $tmpFile the path of the file containing the content
 	 * @param string $orgFileName the original file name
 	 * @param string $fileType usually the extension of the filename