Index genre field, present it as a facet (#1348)

Author: bbpennel

etc/solr-config/access/conf/schema.xml

@@ -83,6 +83,7 @@ public void filter(DocumentIndexingPackage dip) throws IndexingException {
             this.extractIdentifiers(mods, idb);
             this.extractCitation(mods, idb);
             this.extractKeywords(mods, idb);
+            this.extractGenre(mods, idb);
         }
 
         if (idb.getTitle() == null) {
@@ -379,7 +380,6 @@ private void extractIdentifiers(Element mods, IndexDocumentBean idb) {
     }
 
     private void extractKeywords(Element mods, IndexDocumentBean idb) {
-        this.addValuesToList(idb.getKeyword(), mods.getChildren("genre", JDOMNamespaceUtil.MODS_V3_NS));
         this.addValuesToList(idb.getKeyword(), mods.getChildren("typeOfResource", JDOMNamespaceUtil.MODS_V3_NS));
         this.addValuesToList(idb.getKeyword(), mods.getChildren("note", JDOMNamespaceUtil.MODS_V3_NS));
         List<Element> physicalDescription = mods.getChildren("physicalDescription", JDOMNamespaceUtil.MODS_V3_NS);
@@ -396,14 +396,19 @@ private void extractKeywords(Element mods, IndexDocumentBean idb) {
         }
     }
 
+    private void extractGenre(Element mods, IndexDocumentBean idb) {
+        idb.setGenre(new ArrayList<>());
+        this.addValuesToList(idb.getGenre(), mods.getChildren("genre", JDOMNamespaceUtil.MODS_V3_NS));
+    }
+
     private void addValuesToList(List<String> values, List<Element> elements) {
         if (elements == null) {
             return;
         }
         for (Element elementObj: elements) {
             String value = elementObj.getValue();
             if (value != null) {
-                values.add(value);
+                values.add(value.trim());
             }
         }
     }

indexing-solr/src/main/java/edu/unc/lib/boxc/indexing/solr/filter/SetDescriptiveMetadataFilter.java

@@ -139,12 +139,14 @@ public void testInventory() throws Exception {
         List<String> keywords = idb.getKeyword();
         assertTrue(keywords.contains("abc123"));
 
-        assertTrue(keywords.contains("Dissertation"));
+        assertFalse(keywords.contains("Dissertation"));
         assertTrue(keywords.contains("text"));
         assertTrue(keywords.contains("note"));
         assertTrue(keywords.contains("phys note"));
         assertTrue(keywords.contains("Cited source"));
 
+        assertTrue(idb.getGenre().contains("Dissertation"));
+
         assertEquals("citation text", idb.getCitation());
     }