#2 more simplification of md template object

DICE-UNC · Apr 26, 2017 · 43ae7d8 · 43ae7d8
1 parent 1c41d73
commit 43ae7d8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 51 deletions.
diff --git a/...ata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataExporter.java b/...ata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataExporter.java
@@ -51,33 +51,11 @@ public void saveTemplateToSystemMetadataOnObject(final MetadataTemplate template
 		if (!irodsObject.exists()) {
 			throw new FileNotFoundException("pathToObject does not resolve to an iRODS object");
 		}
-		/*
-		 * FileCatalogObjectAO objectAO = null;
-		 *
-		 * if (irodsObject.isFile()) { objectAO =
-		 * irodsAccessObjectFactory.getDataObjectAO(irodsAccount); } else if
-		 * (irodsObject.isDirectory()) { objectAO =
-		 * irodsAccessObjectFactory.getCollectionAO(irodsAccount); } else {
-		 * throw new IllegalArgumentException( "object at " + pathToObject +
-		 * " is neither a data object nor a collection - the JargonMetadataResolver currently only supports these types of objects"
-		 * ); }
-		 */
-		if (template.getType() == TemplateTypeEnum.FORM_BASED) {
-			for (MetadataElement me : template.getElements()) {
-				saveElementToSystemMetadataOnObject(me, pathToObject);
-				/*
-				 * if (!me.getCurrentValue().isEmpty()) { for (String s :
-				 * me.getCurrentValue()) { AvuData avuData = AvuData .instance(
-				 * me.getName(), s,
-				 * JargonMetadataTemplateConstants.AVU_UNIT_PREFIX +
-				 * template.getUuid() .toString()); if (irodsObject.isFile()) {
-				 * ((DataObjectAO) objectAO).addAVUMetadata( pathToObject,
-				 * avuData); } else if (irodsObject.isDirectory()) {
-				 * ((CollectionAO) objectAO).addAVUMetadata( pathToObject,
-				 * avuData); } } }
-				 */
-			}
-		} // TODO else if for different TemplateTypeEnum types
+
+		for (MetadataElement me : template.getElements()) {
+			saveElementToSystemMetadataOnObject(me, pathToObject);
+
+		}
 	}
 
 	@Override

diff --git a/...ata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java b/...ata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java
@@ -666,20 +666,18 @@ MetadataMergeResult mergeTemplateListAndAVUs(final Map<String, MetadataTemplate>
 					log.info("avu belongs to a template already in the map");
 					tempMt = templateMap.get(uuid);
 
-					if (tempMt.getType() == TemplateTypeEnum.FORM_BASED) {
-						MetadataTemplate tempFbmt = tempMt;
-						for (MetadataElement me : tempFbmt.getElements()) {
-							if (avu.getAvuAttribute().equalsIgnoreCase(me.getName())) {
-								// Not a REF_IRODS_QUERY type, set current
-								// value to raw value
-								me.getCurrentValue().add(avu.getAvuValue());
-								me.getDisplayValue().add(avu.getAvuValue());
-
-								matched = true;
-								break;
-							}
+					MetadataTemplate tempFbmt = tempMt;
+					for (MetadataElement me : tempFbmt.getElements()) {
+						if (avu.getAvuAttribute().equalsIgnoreCase(me.getName())) {
+							// Not a REF_IRODS_QUERY type, set current
+							// value to raw value
+							me.getCurrentValue().add(avu.getAvuValue());
+							me.getDisplayValue().add(avu.getAvuValue());
+
+							matched = true;
+							break;
 						}
-					} // XXX else if (tempMt is a different kind of template)
+					}
 
 					if (!matched) {
 						log.info("AVU claims to be from template {}, but name not matched", uuid);
@@ -690,7 +688,7 @@ MetadataMergeResult mergeTemplateListAndAVUs(final Map<String, MetadataTemplate>
 					tempMt = this.findTemplateByUUID(uuid);
 					if (tempMt == null) {
 						log.info("no template found for UUID {}", uuid);
-					} else if (tempMt.getType() == TemplateTypeEnum.FORM_BASED) {
+					} else {
 						MetadataTemplate tempFbmt = tempMt;
 						for (MetadataElement me : tempFbmt.getElements()) {
 							if (avu.getAvuAttribute().equalsIgnoreCase(me.getName())) {
@@ -731,12 +729,11 @@ MetadataMergeResult mergeTemplateListAndAVUs(final Map<String, MetadataTemplate>
 		returnList.addAll(templateMap.values());
 
 		for (MetadataTemplate mt : returnList) {
-			if (mt.getType() == TemplateTypeEnum.FORM_BASED) {
-				for (MetadataElement me : mt.getElements()) {
-					if (me.getType() == ElementTypeEnum.REF_IRODS_QUERY) {
-						me.getDisplayValue().add(getValueFromRefQuery(me.getCurrentValue().get(0), irodsAbsolutePath));
-					}
+			for (MetadataElement me : mt.getElements()) {
+				if (me.getType() == ElementTypeEnum.REF_IRODS_QUERY) {
+					me.getDisplayValue().add(getValueFromRefQuery(me.getCurrentValue().get(0), irodsAbsolutePath));
 				}
+
 			}
 		}
 
@@ -885,11 +882,9 @@ private MetadataTemplate processFileToMetadataTemplate(final IRODSFile inFile)
 		// UUID
 		returnTemplate.setUuid(uuid);
 
-		if (returnTemplate.getType() == TemplateTypeEnum.FORM_BASED) {
-			MetadataTemplate fbmt = returnTemplate;
-			for (MetadataElement me : fbmt.getElements()) {
-				me.setTemplateUuid(uuid);
-			}
+		MetadataTemplate fbmt = returnTemplate;
+		for (MetadataElement me : fbmt.getElements()) {
+			me.setTemplateUuid(uuid);
 		}
 
 		// Date created, dateModified