fix ganswer handler

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);

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();  
     }  
 }

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);
     }

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());
 			}

src/application/HelloHandler.java

@@ -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("<h1>Hello World</h1>");  
-        response.getWriter().println("Request url: " + target); 
-        response.getWriter().println(data);  
-    }  
-}  

src/application/HelloWorld.java

@@ -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();  
-    }  
-}