Merge pull request #4038 from IQSS/4036-getrealval

change values sent to solr to be dataset field values instead of disp…
IQSS · Aug 9, 2017 · a1792ad · a1792ad
2 parents 7e9a09d + 1b9ebf6
commit a1792ad
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
@@ -272,6 +272,9 @@ public String getCompoundDisplayValue() {
         return returnString;
     }
 
+    /**
+     * despite the name, this returns a list of display values; not a list of values
+     */
     public List<String> getValues() {
         List<String> returnList = new ArrayList<>();
         if (!datasetFieldValues.isEmpty()) {
@@ -287,9 +290,33 @@ public List<String> getValues() {
         }
         return returnList;
     }
+    /**
+     * list of values (as opposed to display values).
+     * used for passing to solr for indexing
+     */
+    public List<String> getValues_nondisplay()
+    {
+        List returnList = new ArrayList();
+        if (!datasetFieldValues.isEmpty()) {
+            for (DatasetFieldValue dsfv : datasetFieldValues) {
+                returnList.add(dsfv.getValue());
+            }
+        } else {
+            for (ControlledVocabularyValue cvv : controlledVocabularyValues) {
+                if (cvv != null && cvv.getStrValue() != null) {
+                    returnList.add(cvv.getStrValue());
+                }
+            }
+        }
+        return returnList;
+    }
 
+    /**
+     * appears to be only used for sending info to solr; changed to return values
+     * instead of display values
+     */
     public List<String> getValuesWithoutNaValues() {
-        List<String> returnList = getValues();
+        List<String> returnList = getValues_nondisplay();
         returnList.removeAll(Arrays.asList(NA_VALUE));
         return returnList;
     }

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java
@@ -367,10 +367,8 @@ public IndexResponse indexPermissionsForOneDvObject(DvObject dvObject) {
 
     private void persistToSolr(Collection<SolrInputDocument> docs) throws SolrServerException, IOException {
         if (docs.isEmpty()) {
-            /**
-             * @todo Throw an exception here? "DvObject id 9999 does not exist."
-             */
-            logger.info("nothing to persist");
+            // This method is routinely called with an empty list of docs.
+            logger.fine("nothing to persist");
             return;
         }
         logger.fine("persisting to Solr...");