CollectionSpace 8.3 Updates

.gitignore

@@ -24,3 +24,4 @@ bin
 *.diff
 logged_schemas
 logs
+.mvn

3rdparty/nuxeo/build.xml

@@ -109,12 +109,16 @@
 
     <target name="deploy" depends="package"
         description="deploy nuxeo server libs to ${jee.server.cspace}">
+        <ant antfile="nuxeo-server/build.xml" target="deploy" inheritall="false" />
         <copy todir="${jee.server.cspace}/nuxeo-server">
             <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}">
                 <exclude name="**/config/proto-*-config.xml"/>
                 <exclude name="**/config/proto-*-extension.xml"/>
+                <exclude name="**/bundles/*.jar"/>
+                <exclude name="**/lib/*.jar"/>
             </fileset>
         </copy>
+
         <echo message="Copying Nuxeo prototype repo config file ..."/>
         <copy todir="${jee.server.cspace}/cspace/config/services" overwrite="true">
             <fileset file="${basedir}/nuxeo-server/${nuxeo.release}/config/proto-repo-config.xml"/>

3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java

@@ -78,6 +78,13 @@ public ObjectNode getDenormValues(DocumentModel doc) {
 			List<Map<String, Object>> prodDateGroupList = (List<Map<String, Object>>) doc.getProperty("collectionobjects_common", "objectProductionDateGroupList");
 
 			denormValues.putArray("prodYears").addAll(structDatesToYearNodes(prodDateGroupList));
+		} else if ("Media".equals(docType) && isMediaPublished(doc)) {
+			CoreSession session = doc.getCoreSession();
+			String csid = doc.getName();
+			String tenantId = (String) doc.getProperty("collectionspace_core", "tenantId");
+
+			// Add media-specific denormalized fields
+			denormRelatedObjects(session, csid, tenantId, denormValues);
 		}
 
 		return denormValues;
@@ -135,6 +142,31 @@ private void denormMediaRecords(CoreSession session, String csid, String tenantI
 		denormValues.put("hasMedia", mediaCsids.size() > 0);
 	}
 
+	private void denormRelatedObjects(CoreSession session, String csid, String tenantId, ObjectNode denormValues) {
+		// Store the objectCsid of objects that are related to this media.
+
+		String relatedRecordQuery = String.format(
+				"SELECT * FROM Relation WHERE relations_common:objectCsid = '%s' AND relations_common:subjectDocumentType = 'CollectionObject' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'",
+				csid, tenantId);
+		DocumentModelList relationDocs = session.query(relatedRecordQuery);
+		List<JsonNode> objectCsids = new ArrayList<JsonNode>();
+
+		if (relationDocs.size() > 0) {
+			Iterator<DocumentModel> iterator = relationDocs.iterator();
+
+			while (iterator.hasNext()) {
+				DocumentModel relationDoc = iterator.next();
+				String objectCsid = (String) relationDoc.getProperty("relations_common", "subjectCsid");
+
+				if (objectCsid != null) {
+					objectCsids.add(new TextNode(objectCsid));
+				}
+			}
+		}
+
+		denormValues.putArray("objectCsid").addAll(objectCsids);
+	}
+
 	private void denormAcquisitionRecords(CoreSession session, String csid, String tenantId, ObjectNode denormValues) {
 		// Store the credit lines of acquisition records that are related to this object.
 
@@ -266,6 +298,7 @@ private void denormConceptFields(final DocumentModel doc, final ObjectNode denor
 		final List<String> fields = Arrays.asList("contentConcepts",
 			"contentEvents",
 			"contentPersons",
+			"contentPlaces",
 			"contentOrganizations");
 
 		for (String field : fields) {
@@ -274,7 +307,18 @@ private void denormConceptFields(final DocumentModel doc, final ObjectNode denor
 			for (String content  : contentList) {
 				if (content != null) {
 					final ObjectNode node = objectMapper.createObjectNode();
-					node.put("subject", RefNameUtils.getDisplayName(content));
+					String subjectValue;
+
+					if (RefNameUtils.isTermRefname(content)) {
+						try {
+							subjectValue = RefNameUtils.getDisplayName(content);
+						} catch (Exception e) {
+							subjectValue = content;
+						}
+					} else {
+						subjectValue = content;
+					}
+					node.put("subject", subjectValue);
 					denormContentSubject.add(node);
 				}
 			}

3rdparty/nuxeo/nuxeo-server/build.xml

@@ -0,0 +1,34 @@
+<project name="nuxeo-server" default="deploy" basedir=".">
+    <description>Collectionspace Services - Nuxeo Server</description>
+    <property environment="env" />
+
+    <target name="deploy" depends="deploy-bundles,deploy-libs" />
+
+    <target name="check-env">
+        <fail unless="env.CSPACE_JEESERVER_HOME" message="CSPACE_JEESERVER_HOME is not set" />
+    </target>
+
+    <target name="deploy-bundles" depends="check-env">
+        <property name="nuxeo.bundles" value="${env.CSPACE_JEESERVER_HOME}/nuxeo-server/bundles" />
+
+        <!-- use includeGroupIds in order to only deploy nuxeo dependencies -->
+        <exec executable="mvn" failonerror="true">
+            <arg value="dependency:copy-dependencies" />
+            <arg value="-DoutputDirectory=${nuxeo.bundles}" />
+            <arg value="-DincludeScope=runtime" />
+            <arg value="-DincludeGroupIds=org.nuxeo" />
+        </exec>
+    </target>
+
+    <target name="deploy-libs" depends="check-env">
+        <property name="nuxeo.lib" value="${env.CSPACE_JEESERVER_HOME}/nuxeo-server/lib" />
+
+        <!-- use excludeGroupIds in order ignore nuxeo, logging, and other misc dependencies -->
+        <exec executable="mvn" failonerror="true">
+            <arg value="dependency:copy-dependencies" />
+            <arg value="-DoutputDirectory=${nuxeo.lib}" />
+            <arg value="-DincludeScope=runtime" />
+            <arg value="-DexcludeGroupIds=org.nuxeo,junit,org.sl4j,log4j,org.apache.logging.log4j" />
+        </exec>
+    </target>
+</project>