From d30c4bbf80e63a23746be6e87d605efe9961237a Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 14 Dec 2010 16:41:48 +0000
Subject: [PATCH] NIHVIVO-1363 Create a separate controller to handle AJAX
 sparql queries. The calling sequence changes slightly.

---
 productMods/WEB-INF/web.xml                             | 9 +++++++++
 productMods/edit/forms/addGrantRoleToPerson.jsp         | 2 +-
 productMods/edit/forms/addPublicationToPerson.jsp       | 2 +-
 productMods/edit/forms/js/customFormWithAutocomplete.js | 6 ++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 262e5927..edee934a 100644
--- a/productMods/WEB-INF/web.xml
+++ b/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>
diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index fad62503..80bab24d 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/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">
diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp
index d165e746..2c3b0489 100644
--- a/productMods/edit/forms/addPublicationToPerson.jsp
+++ b/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">
diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js
index fb41550c..d174c730 100644
--- a/productMods/edit/forms/js/customFormWithAutocomplete.js
+++ b/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
-                // should parse the response text and return a json object.
-                customForm.setAcFilter($.parseJSON(data));
+                customForm.setAcFilter(data);
             }
         });
     },