From 839b5f72f6c5be30034746fc5c78fed9c15a1b0b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Sep 2016 12:48:43 +0200
Subject: [PATCH] fix import of transmittal items

---
 utils/xmlimport.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 5611ccb52..466508baa 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -962,6 +962,7 @@ function insert_transmittal($transmittal) { /* {{{ */
 	if(in_array('transmittals', $sections)) {
 		if(!$newTransmittal = $dms->addTransmittal($transmittal['attributes']['name'], $transmittal['attributes']['comment'], $owner)) {
 			$logger->err("Could not add transmittal");
+			$logger->debug($dms->getDB()->getErrorMsg());
 			return false;
 		}
 		foreach($transmittal['items'] as $item) {
@@ -985,7 +986,7 @@ function insert_transmittal($transmittal) { /* {{{ */
 
 	if($newTransmittal)
 		$objmap['transmittals'][$transmittal['id']] = $newTransmittal->getID();
-	return $newCategory;
+	return $newTransmittal;
 } /* }}} */
 
 function resolve_links() { /* {{{ */
@@ -1155,7 +1156,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_transmittal['attributes'] = array();
 			$cur_transmittal['items'] = array();
 			break;
-		case "TRANSMITTALITEM":
+		case "ITEM":
 			$cur_transmittalitem = array();
 			$cur_transmittalitem['id'] = (int) $attrs['ID'];
 			$cur_transmittalitem['attributes'] = array();
@@ -1269,7 +1270,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_link['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'TRANSMITTAL') {
 				$cur_transmittal['attributes'][$attrs['NAME']] = '';
-			} elseif($parent['name'] == 'TRANSMITTALITEM') {
+			} elseif($parent['name'] == 'ITEM') {
 				$cur_transmittalitem['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'WORKFLOW') {
 				$cur_workflow['attributes'][$attrs['NAME']] = '';
@@ -1513,7 +1514,7 @@ function endElement($parser, $name) { /* {{{ */
 				$cur_document['links'][] = $cur_link;
 			}
 			break;
-		case "TRANSMITTALITEM":
+		case "ITEM":
 			$cur_transmittal['items'][] = $cur_transmittalitem;
 			break;
 		case 'TRANSMITTAL':
@@ -1709,7 +1710,7 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_transmittal['attributes'][$current['attributes']['NAME']] = $data;
 					break;
-				case 'TRANSMITTALITEM':
+				case 'ITEM':
 					if(isset($cur_transmittalitem['attributes'][$current['attributes']['NAME']]))
 						$cur_transmittalitem['attributes'][$current['attributes']['NAME']] .= $data;
 					else