Merge branch 'feature/service-metadata-overwrites' into develop

publisher-commons/src/main/java/nl/idgis/publisher/metadata/MetadataDocument.java

@@ -522,7 +522,6 @@ protected String getResponsiblePartyPath(Topic topic, String role) {
 		return getIdentificationPath(topic) +
 			"/gmd:pointOfContact" +
 			"/gmd:CI_ResponsibleParty" + 
-
 			"[gmd:role" +
 			"/gmd:CI_RoleCode" +
 			"/@codeListValue" +
@@ -642,7 +641,13 @@ protected String getMetaDataPointOfContactPath(String role) {
 			;
 	}
 
-	protected String getMetaDataPointOfContactNamePath(String role) {
+	protected String getMetaDataPointOfContactIndividualNamePath(String role) {
+		return getMetaDataPointOfContactPath(role) + 
+			"/gmd:individualName" +
+			"/gco:CharacterString";
+	}
+
+	protected String getMetaDataPointOfContactOrganisationNamePath(String role) {
 		return getMetaDataPointOfContactPath(role) + 
 			"/gmd:organisationName" +
 			"/gco:CharacterString";
@@ -658,23 +663,70 @@ protected String getMetaDataPointOfContactEmailPath(String role) {
 			"/gco:CharacterString";
 	}
 
-	public String getMetaDataPointOfContactName(String role) throws NotFound{
-		return isoMetadata.getString(namespaces, getMetaDataPointOfContactNamePath(role));
+	public String getMetaDataPointOfContactIndividualName(String role) throws NotFound{
+		return isoMetadata.getString(namespaces, getMetaDataPointOfContactIndividualNamePath(role));
+	}
+
+	public String getMetaDataPointOfContactOrganisationName(String role) throws NotFound{
+		return isoMetadata.getString(namespaces, getMetaDataPointOfContactOrganisationNamePath(role));
 	}
 
 	public String getMetaDataPointOfContactEmail(String role) throws Exception{
 		return isoMetadata.getString(namespaces, getMetaDataPointOfContactEmailPath(role));
 	}
 
-	public void setMetaDataPointOfContactName(String role, String name) throws Exception{
-		isoMetadata.updateString(namespaces, getMetaDataPointOfContactNamePath(role), name);
+	public void setMetaDataPointOfContactIndividualName(String role, String name) throws Exception{
+		isoMetadata.updateString(namespaces, getMetaDataPointOfContactIndividualNamePath(role), name);
+	}
+
+	public void setMetaDataPointOfContactOrganisationName(String role, String name) throws Exception{
+		isoMetadata.updateString(namespaces, getMetaDataPointOfContactOrganisationNamePath(role), name);
 	}
 
 	public void setMetaDataPointOfContactEmail(String role, String email) throws Exception{
 		isoMetadata.updateString(namespaces, getMetaDataPointOfContactEmailPath(role), email);
 	}
 
-
+	/*
+	 * Metadata Distributor
+	 */
+
+	protected String getDistributorPath(String role) {
+		return 
+			"/gmd:MD_Metadata" +
+			"/gmd:distributionInfo" +
+			"/gmd:MD_Distribution" +
+			"/gmd:distributor" +
+			"/gmd:MD_Distributor" +
+			"/gmd:distributorContact" +
+			"/gmd:CI_ResponsibleParty" +
+			"[gmd:role" +
+			"/gmd:CI_RoleCode" +
+			"/@codeListValue" +
+				"='" + role + "']"
+			;
+	}
+
+	protected String getDistributorIndividualNamePath(String role) {
+		return getDistributorPath(role) + 
+			"/gmd:individualName" +
+			"/gco:CharacterString";
+	}
+
+	protected String getDistributorOrganisationNamePath(String role) {
+		return getDistributorPath(role) + 
+			"/gmd:organisationName" +
+			"/gco:CharacterString";
+	}
+
+	public void setDistributorIndividualName(String role, String name) throws Exception{
+		isoMetadata.updateString(namespaces, getDistributorIndividualNamePath(role), name);
+	}
+
+	public void setDistributorOrganisationName(String role, String name) throws Exception{
+		isoMetadata.updateString(namespaces, getDistributorOrganisationNamePath(role), name);
+	}
+
 	/*
 	 * Metadata creation date
 	 */

publisher-commons/src/test/java/nl/idgis/publisher/metadata/MetadataDocumentTest.java

@@ -227,17 +227,17 @@ public void testDatasetMetadataPointOfContact() throws Exception{
 		String email = "emailaddress";
 
 		// check current values
-		String result = document.getMetaDataPointOfContactName("owner");
+		String result = document.getMetaDataPointOfContactOrganisationName("owner");
 		assertFalse("unexpected responsibleparty", result.indexOf(name) >= 0);
 		result = document.getMetaDataPointOfContactEmail("owner");
 		assertFalse("unexpected email", result.indexOf(email) >= 0);
 
 		// set new values
-		document.setMetaDataPointOfContactName("owner", name);
+		document.setMetaDataPointOfContactOrganisationName("owner", name);
 		document.setMetaDataPointOfContactEmail("owner", email);
 
 		// check new values again
-		result = document.getMetaDataPointOfContactName("owner");
+		result = document.getMetaDataPointOfContactOrganisationName("owner");
 		assertEquals("wrong responsibleparty", name, result);		
 		result = document.getMetaDataPointOfContactEmail("owner");
 		assertEquals("wrong email", email, result);
@@ -277,17 +277,17 @@ public void testServiceMetadataPointOfContact() throws Exception{
 		String email = "someaddress";
 
 		// check current values
-		String result = document.getMetaDataPointOfContactName("pointOfContact");
+		String result = document.getMetaDataPointOfContactOrganisationName("pointOfContact");
 		assertFalse("unexpected responsibleparty", result.indexOf(name) >= 0);
 		result = document.getMetaDataPointOfContactEmail("pointOfContact");
 		assertFalse("unexpected email", result.indexOf(email) >= 0);
 
 		// set new values
-		document.setMetaDataPointOfContactName("pointOfContact", name);
+		document.setMetaDataPointOfContactOrganisationName("pointOfContact", name);
 		document.setMetaDataPointOfContactEmail("pointOfContact", email);
 
 		// check new values again
-		result = document.getMetaDataPointOfContactName("pointOfContact");
+		result = document.getMetaDataPointOfContactOrganisationName("pointOfContact");
 		assertEquals("wrong responsibleparty", name, result);		
 		result = document.getMetaDataPointOfContactEmail("pointOfContact");
 		assertEquals("wrong email", email, result);

publisher-metadata/app/controllers/DatasetMetadataDCAT.java

@@ -295,7 +295,7 @@ private Map<String, Object> mapDcat(Tuple ds) {
 			Map<String, String> contactPoint = new HashMap<>();
 			contactPoint.put("@type", "vcard:Contact");
 			try {
-				contactPoint.put("fn", metadataDocument.getMetaDataPointOfContactName("pointOfContact"));
+				contactPoint.put("fn", metadataDocument.getMetaDataPointOfContactOrganisationName("pointOfContact"));
 				contactPoint.put("hasEmail", metadataDocument.getMetaDataPointOfContactEmail("pointOfContact"));	
 			} catch (NotFound nf) {
 				contactPoint.put("fn", null);

publisher-metadata/app/controllers/ServiceMetadata.java

@@ -183,12 +183,18 @@ public Optional<Resource> resource(String name) {
 				"http://www.isotc211.org/2005/resources/codeList.xml#CI_DateTypeCode", 
 				"publication");
 
-			String role = "pointOfContact";		
+			String role = "pointOfContact";
+
 			metadataDocument.setServiceResponsiblePartyName(role, serviceTuple.get(constants.organization));
 			metadataDocument.setServiceResponsiblePartyEmail(role, serviceTuple.get(constants.email));		
-			metadataDocument.setMetaDataPointOfContactName(role, serviceTuple.get(constants.organization));
+
+			metadataDocument.setMetaDataPointOfContactIndividualName(role, serviceTuple.get(constants.contact));
+			metadataDocument.setMetaDataPointOfContactOrganisationName(role, serviceTuple.get(constants.organization));
 			metadataDocument.setMetaDataPointOfContactEmail(role, serviceTuple.get(constants.email));
 
+			metadataDocument.setDistributorIndividualName(role, serviceTuple.get(constants.contact));
+			metadataDocument.setDistributorOrganisationName(role, serviceTuple.get(constants.organization));
+
 			metadataDocument.removeOperatesOn();
 
 			Integer lastDatasetIdForOperatesOn = null;