From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 4 Apr 2012 04:09:05 +0000 (-0700)
Subject: CSPACE-4814: Attempt to improve usefulness of reporting of records successfully imported.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=662b60faf68330517f65f98ca83e6325b2c64de4;p=tmp%2Fjakarta-migration.git

CSPACE-4814: Attempt to improve usefulness of reporting of records successfully imported.
---

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-1objectexit-post-form.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-1objectexit-post-form.xml
new file mode 100644
index 000000000..209ad37af
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-1objectexit-post-form.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<imports>
+  <import service="ObjectExit" type="ObjectExit">
+    <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
+      name="objectexit_common">
+      <exitNote>Sebastián &amp; Barnes</exitNote>
+      <exitNumber>OE2010.2</exitNumber>
+    </schema>
+  </import>
+</imports>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
index f18748973..c19fd849e 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
@@ -15,12 +15,30 @@
             <uri>/cspace-services/imports</uri>
             <filename>imports/import-1objectexit-post.xml</filename>
             <response>
-                <expected level="TEXT" />
+                <expected level="TREE" />
                 <filename>imports/res/import-1objectexit-post.res.xml</filename>
              </response>
         </test>
-                
+        
         <!-- FIXME: Add forms-based import test -->
+        <test ID="import-post-form">
+            <expectedCodes>200</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/imports?type=xml</uri>
+            <filename>imports/import-1objectexit-post-form.xml</filename>
+            <response>
+                <expected level="TREE" />
+                <filename>imports/res/import-1objectexit-post.res.xml</filename>
+             </response>
+        </test>
+        
+        <!-- FIXME: Add tests with non-UTF-8 chars in request payloads -->
+        <!-- (CSPACE-3923 and see also CSPACE-4866), via each imports path -->
+
+        <!-- FIXME: Add test with special chars in request payloads -->
+        <!-- (CSPACE-3923), via each imports path -->
+
+        <!-- FIXME: Add tests with invalid payloads, via each imports path -->
         
     </testGroup>
 </xmlReplay>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-1objectexit-post.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-1objectexit-post.res.xml
index 7a312408d..294dbc5ae 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-1objectexit-post.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-1objectexit-post.res.xml
@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<document name="collectionobjects">
-  <ns2:collectionobjects_common
-    xmlns:ns2="http://collectionspace.org/services/collectionobject">
-    <objectNumber>6.0221415</objectNumber>
-  </ns2:collectionobjects_common>
-</document>
+<?xml version="1.0"?><import><msg>SUCCESS</msg><report>READ: Variable path value here
+/ObjectExit/Variable CSID value here
+</report></import>
\ No newline at end of file
diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
index 6fc0db06c..abdf68af4 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
@@ -147,7 +147,7 @@ public class ImportsResource extends ResourceBase {
             String inputFilename = payloadToFilename(xmlPayload);
             result = createFromFilename(inputFilename);
             rb = javax.ws.rs.core.Response.ok();
-	    } catch (Exception e) {
+	} catch (Exception e) {
             result = Tools.errorToString(e, true);
             rb = javax.ws.rs.core.Response.status(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR);
         }
@@ -334,7 +334,7 @@ public class ImportsResource extends ResourceBase {
     	} catch (Exception e) {
     		throw bigReThrow(e, ServiceMessages.CREATE_FAILED);
     	}
-		return response;
+	return response;
     }
 
     String page = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
index a8097fc3f..9204102fe 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
@@ -1,13 +1,21 @@
 package org.collectionspace.services.imports.nuxeo;
 
 import java.io.File;
+import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
+import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.nuxeo.client.java.NuxeoClientEmbedded;
 import org.collectionspace.services.nuxeo.client.java.NuxeoConnectorEmbedded;
+import org.collectionspace.services.nuxeo.util.NuxeoUtils;
+import org.nuxeo.ecm.core.api.DocumentModel;
+import org.nuxeo.ecm.core.api.DocumentRef;
 import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
 import org.nuxeo.ecm.core.io.DocumentPipe;
 import org.nuxeo.ecm.core.io.DocumentReader;
+import org.nuxeo.ecm.core.io.DocumentTranslationMap;
 import org.nuxeo.ecm.core.io.DocumentWriter;
 import org.nuxeo.ecm.core.io.impl.DocumentPipeImpl;
 import org.nuxeo.ecm.core.io.impl.plugins.DocumentModelWriter;
@@ -24,34 +32,70 @@ public class ImportCommand {
         RepositoryInstance  repoSession = client.openRepository();
         try {
             return importTree(repoSession, file, dest);
+        } catch (Exception e) {
+            throw e;
         } finally {
 //            repository.close();
             client.releaseRepository(repoSession);
         }
     }
 
-    String importTree(RepositoryInstance repository, File file, String toPath) throws Exception {
+    String importTree(RepositoryInstance repoSession, File file, String toPath) throws Exception {
         DocumentReader reader = null;
         DocumentWriter writer = null;
-        String dump = "NO RESULTS";
+        DocumentModel docModel = null;
+        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
+        StringBuffer dump = new StringBuffer("NO RESULTS");
         try {
             System.out.println("importTree reading file: "+file+(file!=null ? " exists? "+file.exists() : " file param is null"));
             reader = new LoggedXMLDirectoryReader(file);  //our overload of XMLDirectoryReader.
-            writer = new DocumentModelWriter(repository, toPath, 10);
+            writer = new DocumentModelWriter(repoSession, toPath, 10);
             DocumentPipe pipe = new DocumentPipeImpl(10);
             // pipe.addTransformer(transformer);
             pipe.setReader(reader);
             pipe.setWriter(writer);
-            pipe.run();
+            DocumentTranslationMap dtm = pipe.run();
+            DocumentRef keyDocRef, valueDocRef;
+            String docType;
+            Map<DocumentRef,DocumentRef> documentRefs = dtm.getDocRefMap();
+            if (documentRefs.size() > 0) {
+                dump.setLength(0);
+            }
+            dump.append("<importedRecords>");
+            for (Map.Entry entry: documentRefs.entrySet()) {
+                keyDocRef = (DocumentRef) entry.getKey();
+                valueDocRef = (DocumentRef) entry.getValue();
+                if (keyDocRef == null || valueDocRef == null) {
+                    continue;
+                }
+                // System.out.println("value="+entry.getValue());
+                // System.out.println("key="+entry.getKey());
+                
+                docModel = repoSession.getDocument((DocumentRef) entry.getValue());
+                // System.out.println("value doctype="+docModel.getDocumentType().toString());
+
+                dump.append("<importedRecord>");
+                docModel = repoSession.getDocument(valueDocRef);
+                docType = docModel.getDocumentType().getName();
+                // System.out.println(docType);
+                dump.append("<doctype>"+docType+"</doctype>");
+                dump.append("<csid>"+keyDocRef.toString()+"</id>");
+                dump.append("</importedRecord>");
+                // System.out.println(dump.toString());
+
+            }
+            dump.append("</importedRecords>");
+        } catch (Exception e) {
+            throw e;
         } finally {
             if (reader != null) {
+                dump.append("<fullReport>"+(((LoggedXMLDirectoryReader)reader).report())+"</fullReport>");
                 reader.close();
-                dump = ((LoggedXMLDirectoryReader)reader).report();
             }
             if (writer != null) {
                 writer.close();
             }
         }
-        return dump;
+        return dump.toString();
     }
 }
\ No newline at end of file