NIHVIVO-1363 Create a separate controller to handle AJAX sparql queries. The calling sequence changes slightly.

productMods/WEB-INF/web.xml

@@ -1320,6 +1320,15 @@
   </servlet-mapping>
   -->
     
+  <servlet>
+    <servlet-name>ajaxSparqlQuery</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlQueryAjaxController</servlet-class>    
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ajaxSparqlQuery</servlet-name>
+    <url-pattern>/ajax/sparqlQuery</url-pattern>    
+  </servlet-mapping>
+   
   <!-- ============================== servlet-mappings ======================== -->
   <servlet-mapping>
     <servlet-name>fetch</servlet-name>

productMods/edit/forms/addGrantRoleToPerson.jsp

@@ -311,7 +311,7 @@ PREFIX core: <${vivoCore}>
 
 
 <c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
-<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
+<c:url var="sparqlQueryUrl" value="/ajax/sparqlQuery" />
 
 <%-- Must be all one line for JavaScript. --%>
 <c:set var="sparqlForAcFilter">

productMods/edit/forms/addPublicationToPerson.jsp

@@ -253,7 +253,7 @@ SPARQL queries for existing values. --%>
 </form>
 
 <c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
-<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
+<c:url var="sparqlQueryUrl" value="/ajax/sparqlQuery" />
 
 <%-- Must be all one line for JavaScript. --%>
 <c:set var="sparqlForAcFilter">

productMods/edit/forms/js/customFormWithAutocomplete.js

@@ -282,14 +282,12 @@ var customForm = {
         this.acFilter = [];
         $.ajax({
             url: customForm.sparqlQueryUrl,
+            dataType: "json",
             data: {
-                resultFormat: 'RS_JSON',
                 query: customForm.sparqlForAcFilter
             },
             success: function(data, status, xhr) {
-                // Not sure why, but we need an explicit json parse here. jQuery
+                customForm.setAcFilter(data);
-                // should parse the response text and return a json object.
-                customForm.setAcFilter($.parseJSON(data));
             }
         });
     },