Introduce BriefObjectMetadata#getLabel, which returns the label of an…

… object - Update ExportController to use getLabel
UNC-Libraries · Mar 16, 2015 · 977340e · 977340e
1 parent 74447c4
commit 977340e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/admin/src/main/java/edu/unc/lib/dl/admin/controller/ExportController.java b/admin/src/main/java/edu/unc/lib/dl/admin/controller/ExportController.java
@@ -101,10 +101,10 @@ private void printObject(CSVPrinter printer, BriefObjectMetadata object) throws
 		printer.print(object.getTitle());
 		printer.print(object.getAncestorNames());
 
-		List<String> labelRelations = object.getRelation("label");
+		String label = object.getLabel();
 
-		if (labelRelations.size() > 0) {
-			printer.print(labelRelations.get(0));
+		if (label != null) {
+			printer.print(label);
 		} else {
 			printer.print("");
 		}

diff --git a/solr-search/src/main/java/edu/unc/lib/dl/search/solr/model/BriefObjectMetadata.java b/solr-search/src/main/java/edu/unc/lib/dl/search/solr/model/BriefObjectMetadata.java
@@ -102,6 +102,8 @@ public interface BriefObjectMetadata {
 
 	public List<String> getIdentifier();
 
+	public String getLabel();
+
 	public String getTitle();
 
 	public List<String> getOtherTitle();

diff --git a/solr-search/src/main/java/edu/unc/lib/dl/search/solr/model/BriefObjectMetadataBean.java b/solr-search/src/main/java/edu/unc/lib/dl/search/solr/model/BriefObjectMetadataBean.java
@@ -230,6 +230,16 @@ public List<String> getRelation(String relationName) {
 		return this.relationsMap.get(relationName);
 	}
 
+	@Override
+	public String getLabel() {
+		List<String> labelRelations = this.getRelation("label");
+		if (labelRelations == null || labelRelations.size() == 0) {
+			return null;
+		} else {
+			return labelRelations.get(0);
+		}
+	}
+
 	@Override
 	public Datastream getDefaultWebData() {
 		if (this.relationsMap == null)