updates for returning array of most specific types and incorporating that check in removeConceptSubclasses in the client-side code VIVO-826

webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java

@@ -4,6 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.search.controller;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -121,9 +123,13 @@ public class AutocompleteController extends VitroAjaxController {
                 try {                
                     String uri = doc.getStringValue(VitroSearchTermNames.URI);
                     String name = doc.getStringValue(VitroSearchTermNames.NAME_RAW);
+                    //There may be multiple most specific types, sending them all back
                     String mst = doc.getStringValue(VitroSearchTermNames.MOST_SPECIFIC_TYPE_URIS);
-
+                    //Assuming these will get me string values
-                    SearchResult result = new SearchResult(name, uri, mst, hasMultipleTypes, vreq);
+                    Collection<Object> mstObjValues = doc.getFieldValues(VitroSearchTermNames.MOST_SPECIFIC_TYPE_URIS);
+                    String[] mstStringValues = mstObjValues.toArray(new String[mstObjValues.size()]);
+                    List<String> mstValues = Arrays.asList(mstStringValues);
+                    SearchResult result = new SearchResult(name, uri, mst, mstValues, hasMultipleTypes, vreq);
                     results.add(result);
                     log.debug("results = " + results.toString());
                 } catch(Exception e){
@@ -138,7 +144,8 @@ public class AutocompleteController extends VitroAjaxController {
 
             JSONArray jsonArray = new JSONArray();
             for (SearchResult result : results) {
-                jsonArray.put(result.toMap());
+                //jsonArray.put(result.toMap());
+            	jsonArray.put(result.toJSONObject());
             }
             response.getWriter().write(jsonArray.toString());
 
@@ -303,9 +310,10 @@ public class AutocompleteController extends VitroAjaxController {
         private String label;
         private String uri;
         private String msType;
+        private List<String> allMsTypes;
 		private boolean hasMultipleTypes;
 
-        SearchResult(String label, String uri, String msType, boolean hasMultipleTypes, VitroRequest vreq) {
+        SearchResult(String label, String uri, String msType, List<String> allMsTypes, boolean hasMultipleTypes, VitroRequest vreq) {
 			if ( hasMultipleTypes ) {
 	            this.label = label + " (" + getMsTypeLocalName(msType, vreq) + ")";
 			}
@@ -314,6 +322,7 @@ public class AutocompleteController extends VitroAjaxController {
 			}
             this.uri = uri;
             this.msType = msType;
+            this.allMsTypes = allMsTypes;
         }
 		
         public String getLabel() {
@@ -336,6 +345,10 @@ public class AutocompleteController extends VitroAjaxController {
             return msType;
         }
         
+        public List<String> getAllMsTypes() {
+        	return allMsTypes;
+        }
+
 		public String getMsTypeLocalName(String theUri, VitroRequest vreq) {
 			VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
 			VClass vClass = vcDao.getVClassByURI(theUri);
@@ -346,12 +359,25 @@ public class AutocompleteController extends VitroAjaxController {
         public String getJsonMsType() {
             return JSONObject.quote(msType);
         }
-        Map<String, String> toMap() {
+        
-            Map<String, String> map = new HashMap<String, String>();
+        
-            map.put("label", label);
+        //Simply passing in the array in the map converts it to a string and not to an array
-            map.put("uri", uri);
+        //which is what we want so need to convert to an object instad
-            map.put("msType", msType);
+        JSONObject toJSONObject() {
-            return map;
+        	JSONObject jsonObj = new JSONObject();
+        	try {
+        	 jsonObj.put("label", label);
+             jsonObj.put("uri", uri);
+             //Leaving this in for now, in case there is code out there that depends on this single string version
+             //But this should really be changed so that the entire array is all that should be returned
+             jsonObj.put("msType", msType);
+             //map.put("allMsTypes", allMsTypes);
+             JSONArray allMsTypesArray = new JSONArray(allMsTypes);
+             jsonObj.put("allMsTypes", allMsTypesArray);
+        	} catch(Exception ex) {
+        		log.error("Error occurred in converting values to JSON object", ex);
+        	}
+        	return jsonObj;
         }
 
         public int compareTo(Object o) throws ClassCastException {

webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js

@@ -429,8 +429,26 @@ var customForm = {
         
     removeConceptSubclasses: function(array) {
        $(array).each(function(i) {
-          if(this["msType"] != "http://www.w3.org/2004/02/skos/core#Concept") {
+    	   var allMsTypes = this["allMsTypes"];
+    	   var removeElement = false;
+          if(allMsTypes.length == 1 && this["msType"] != "http://www.w3.org/2004/02/skos/core#Concept") {
               //Remove from array
+              removeElement = true;
+          }  else if(allMsTypes.length > 1) {
+        	  //If there are multiple most specific types returned, check if none of them equals concept
+        	  removeElement = true;
+        	  var j;
+        	  for(j = 0; j < allMsTypes.length; j++) {
+        		  //this refers to the element itself
+        		 if(allMsTypes[j] == "http://www.w3.org/2004/02/skos/core#Concept") {
+        			 //don't remove this element if one of the most specific types is a concept
+        			 removeElement = false;
+        			 break;
+        		 }
+        	  }
+          }
+          
+          if(removeElement) {
         	  array.splice(i, 1);
           }
        });