You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2013/02/18 08:37:20 UTC
svn commit: r1447140 -
/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
Author: rwesten
Date: Mon Feb 18 07:37:19 2013
New Revision: 1447140
URL: http://svn.apache.org/r1447140
Log:
STANBOL-935: applied the patch provided by Sergio Fernández
Modified:
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
Modified: stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java?rev=1447140&r1=1447139&r2=1447140&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java (original)
+++ stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/BaseGoogleRefineReconcileResource.java Mon Feb 18 07:37:19 2013
@@ -164,7 +164,7 @@ public abstract class BaseGoogleRefineRe
} else if(queries != null){
log.debug("multi-query: {}",queries);
try {
- jResult = reoncile(ReconcileQuery.parseQueries(queries,nsPrefixService));
+ jResult = reconcile(ReconcileQuery.parseQueries(queries,nsPrefixService));
} catch (JSONException e) {
throw new WebApplicationException(
Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
@@ -178,7 +178,7 @@ public abstract class BaseGoogleRefineRe
}
} else {
if(MediaTypeUtil.isAcceptableMediaType(header,MediaType.TEXT_HTML_TYPE)){
- ResponseBuilder rb = Response.ok(new Viewable("index", this));
+ ResponseBuilder rb = Response.ok(new Viewable("index", this, BaseGoogleRefineReconcileResource.class));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML+"; charset=utf-8");
addCORSOrigin(servletContext, rb, header);
return rb.build();
@@ -195,7 +195,7 @@ public abstract class BaseGoogleRefineRe
}
- private JSONObject reoncile(Map<String,ReconcileQuery> parsedQueries) throws JSONException, EntityhubException {
+ private JSONObject reconcile(Map<String,ReconcileQuery> parsedQueries) throws JSONException, EntityhubException {
JSONObject container = new JSONObject();
for(Entry<String,ReconcileQuery> query : parsedQueries.entrySet()){
container.put(query.getKey(), reconcile(query.getValue()));