From 3e4feff3f0361c4de7f6a1dd25a64909ef1cb8a2 Mon Sep 17 00:00:00 2001 From: knightmarehs Date: Fri, 28 Dec 2018 01:16:50 +0800 Subject: [PATCH] fix ganswer handler --- src/application/GanswerHandler.java | 11 +++++------ src/application/GanswerHttp.java | 2 +- src/application/GanswerHttpConnector.java | 4 ++-- src/application/GinfoHandler.java | 2 +- src/application/HelloHandler.java | 25 ------------------------- src/application/HelloWorld.java | 16 ---------------- 6 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 src/application/HelloHandler.java delete mode 100644 src/application/HelloWorld.java diff --git a/src/application/GanswerHandler.java b/src/application/GanswerHandler.java index 377fe54..803bab6 100644 --- a/src/application/GanswerHandler.java +++ b/src/application/GanswerHandler.java @@ -22,7 +22,7 @@ public class GanswerHandler extends AbstractHandler{ try { exobj.put("status", status); exobj.put("message", message); - exobj.put("questions", question); + exobj.put("query", question); if(qlog!=null&&qlog.rankedSparqls!=null&&qlog.rankedSparqls.size()>0){ exobj.put("sparql", qlog.rankedSparqls.get(0).toStringForGStore2()); } @@ -68,7 +68,6 @@ public class GanswerHandler extends AbstractHandler{ //step2 construct response JSONObject resobj = new JSONObject(); resobj.put("status", "200"); - resobj.put("id","test"); resobj.put("query",jsonobj.getString("questions")); JSONObject tmpobj = new JSONObject(); if(needAnswer > 0){ @@ -116,12 +115,12 @@ public class GanswerHandler extends AbstractHandler{ bindingobj = new JSONObject(); for(String var:qlog.sparql.variables){ JSONObject bidobj = new JSONObject(); - if(qlog.match.answers[i][j].startsWith("\"")) - bidobj.put("type", "literal"); - else - bidobj.put("type", "uri"); String[] ansRiv = qlog.match.answers[i][j].split(":"); bidobj.put("value", ansRiv[ansRiv.length-1]); + if(ansRiv[ansRiv.length-1].startsWith("<")) + bidobj.put("type", "uri"); + else + bidobj.put("type", "literal"); System.out.println(qlog.match.answers[i][j]); j += 1; bindingobj.put(var, bidobj); diff --git a/src/application/GanswerHttp.java b/src/application/GanswerHttp.java index 88e0966..1d1f785 100644 --- a/src/application/GanswerHttp.java +++ b/src/application/GanswerHttp.java @@ -31,7 +31,7 @@ public class GanswerHttp { server.start(); server.dumpStdErr(); Globals.init(); - server.join(); System.out.println("Server ready!"); + server.join(); } } diff --git a/src/application/GanswerHttpConnector.java b/src/application/GanswerHttpConnector.java index f8f3d70..6d7900e 100644 --- a/src/application/GanswerHttpConnector.java +++ b/src/application/GanswerHttpConnector.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; public class GanswerHttpConnector { - public static final String defaultServerIP = "59.108.48.19"; + public static final String defaultServerIP = "127.0.0.1"; public static final int defaultServerPort = 9999; private String serverIP; @@ -99,7 +99,7 @@ public class GanswerHttpConnector { public static void main(String[] args){ GanswerHttpConnector ghc = new GanswerHttpConnector(); - String data = "{\"dictionary\":{\"id\":\"test\"},\"log\":\"1\",\"maxAnswerNum\":\"3\",\"needSparql\":\"2\",\"questions\":\"\"}"; + String data = "{\"maxAnswerNum\":\"3\",\"needSparql\":\"2\",\"questions\":\"Who is the wife of Barack Obama?\"}"; ghc.gInfo(); ghc.gSolve(data); } diff --git a/src/application/GinfoHandler.java b/src/application/GinfoHandler.java index ac4e36b..8d6d867 100644 --- a/src/application/GinfoHandler.java +++ b/src/application/GinfoHandler.java @@ -20,7 +20,7 @@ public class GinfoHandler extends AbstractHandler{ try { exobj.put("status", status); exobj.put("message", message); - exobj.put("questions", question); + exobj.put("query", question); if(qlog!=null&&qlog.rankedSparqls!=null&&qlog.rankedSparqls.size()>0){ exobj.put("sparql", qlog.rankedSparqls.get(0).toStringForGStore2()); } diff --git a/src/application/HelloHandler.java b/src/application/HelloHandler.java deleted file mode 100644 index b420609..0000000 --- a/src/application/HelloHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package application; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - - -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.handler.AbstractHandler; - -public class HelloHandler extends AbstractHandler { - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - - response.setContentType("text/html;charset=utf-8"); - response.setStatus(HttpServletResponse.SC_OK); - baseRequest.setHandled(true); - String data = request.getParameter("data"); - response.getWriter().println("

Hello World

"); - response.getWriter().println("Request url: " + target); - response.getWriter().println(data); - } -} \ No newline at end of file diff --git a/src/application/HelloWorld.java b/src/application/HelloWorld.java deleted file mode 100644 index 22e467d..0000000 --- a/src/application/HelloWorld.java +++ /dev/null @@ -1,16 +0,0 @@ -package application; - -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.ContextHandler; - -public class HelloWorld { - public static void main(String[] args) throws Exception { - Server server = new Server(8888); - ContextHandler context = new ContextHandler(); - context.setContextPath("/hello"); - context.setHandler(new HelloHandler()); - server.setHandler(context); - server.start(); - server.join(); - } -}