Changes for sqo 1.3

Author: hvarg

server/src/main/java/org/diskproject/server/adapters/GraphDBAdapter.java

@@ -68,8 +68,29 @@ private boolean login () {
         return false;
     }
 
+    public List<DataResult> getDataResultFromJsonString (String jsonString) {
+        JsonObject json = (JsonObject) jsonParser.parse(jsonString);
+        JsonArray variables = json.get("head").getAsJsonObject().get("vars").getAsJsonArray();
+        JsonArray bindings = json.get("results").getAsJsonObject().get("bindings").getAsJsonArray();
+
+        List<DataResult> results = new ArrayList<DataResult>();
+
+        for (JsonElement binding : bindings) {
+            DataResult curResult = new DataResult();
+            for (JsonElement variable : variables) {
+                String varName = variable.getAsString();
+                JsonElement valueJson = binding.getAsJsonObject().get(varName);
+                String value = valueJson == null ? null : valueJson.getAsJsonObject().get("value").getAsString();
+                curResult.addValue(varName, value);
+            }
+            results.add(curResult);
+        }
+        return results;
+    }
+
     @Override
     public List<DataResult> query(String queryString) throws Exception {
+        // queryString is not being checked
         String queryUrl = getEndpointUrl() + "repositories/" + this.repository;
         URIBuilder builder = new URIBuilder(queryUrl);
         builder.setParameter("query", queryString);
@@ -82,35 +103,18 @@ public List<DataResult> query(String queryString) throws Exception {
         try (CloseableHttpResponse response = httpClient.execute(request)) {
             HttpEntity entity = response.getEntity();
 			String strResponse = EntityUtils.toString(entity);
-
 		    EntityUtils.consume(entity);
-            try {
-                JsonObject json = (JsonObject) jsonParser.parse(strResponse);
-                JsonArray variables = json.get("head").getAsJsonObject().get("vars").getAsJsonArray();
-                JsonArray bindings = json.get("results").getAsJsonObject().get("bindings").getAsJsonArray();
-
-                List<DataResult> results = new ArrayList<DataResult>();
-
-                for (JsonElement binding : bindings) {
-                    DataResult curResult = new DataResult();
-                    for (JsonElement variable : variables) {
-                        String varName = variable.getAsString();
-                        JsonElement valueJson = binding.getAsJsonObject().get(varName);
-                        String value = valueJson == null ? null : valueJson.getAsJsonObject().get("value").getAsString();
-                        curResult.addValue(varName, value);
-                    }
-                    results.add(curResult);
-                }
-                return results;
-            } catch (Exception e) {
-                System.err.println("Error decoding " + strResponse);
-                e.printStackTrace();
-                throw new RuntimeException(e);
+
+            if (strResponse.startsWith("MALFORMED QUERY")) {
+                System.out.println(strResponse);
+                System.out.println(queryString);
+                throw new RuntimeException("MALFORMED QUERY");
+            } else {
+                return getDataResultFromJsonString(strResponse);
             }
         } catch (IOException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -128,26 +132,18 @@ public List<DataResult> queryOptions(String varname, String constraintQuery) thr
             query += "\n  OPTIONAL { " + varname + " rdfs:label " + labelVar + " . }";
         query += "\n}";
 
-        System.out.println("Q: " + query);
-
         List<DataResult> solutions = this.query(query);
         List<DataResult> fixedSolutions = new ArrayList<DataResult>();
 
         for (DataResult solution : solutions) {
             DataResult cur = new DataResult();
-            String valUrl = solution.getValue(name);
-            String valName = solution.getName(name);
+            String uri = solution.getValue(name);
             String label = solution.getValue(name + "Label");
-            if (label == null && valName != null) {
-                label = valName;
-            } else if (label == null) {
-                label = valUrl.replaceAll("^.*\\/", "");
-                // Try to remove mediawiki stuff
-                label = label.replaceAll("Property-3A", "");
-                label = label.replaceAll("-28E-29", "");
-                label = label.replaceAll("_", " ");
+            if (label == null) { //Theres no label, create one with the def value or extract it from the URI
+                String defName = solution.getName(name);
+                label = defName != null ? defName : uri.replaceAll("^.*\\/", "").replaceAll("_", " ");
             }
-            cur.addValue(VARURI, valUrl);
+            cur.addValue(VARURI, uri);
             cur.addValue(VARLABEL, label);
             fixedSolutions.add(cur);
         }

server/src/main/java/org/diskproject/server/adapters/SparqlAdapter.java

@@ -65,7 +65,7 @@ public static Set<String> interceptVariables(final String queryA, final String q
 
     @Override
     public List<DataResult> query(String queryString) throws Exception, QueryParseException, QueryExceptionHTTP {
-        //System.out.println("SparqlAdapter.query: " + queryString);
+        System.out.println("SparqlAdapter.query: " + queryString);
         ArrayList<ArrayList<SparqlQuerySolution>> solutions = null;
         try {
             String user = this.getUsername(), pass = this.getPassword();

server/src/main/java/org/diskproject/server/api/impl/DiskResource.java

@@ -29,6 +29,7 @@
 import org.diskproject.shared.classes.loi.LineOfInquiry;
 import org.diskproject.shared.classes.loi.TriggeredLOI;
 import org.diskproject.shared.classes.question.Question;
+import org.diskproject.shared.classes.question.VariableOption;
 import org.diskproject.shared.classes.util.DataAdapterResponse;
 import org.diskproject.shared.classes.util.ExternalDataRequest;
 import org.diskproject.shared.classes.util.QuestionOptionsRequest;
@@ -124,7 +125,7 @@ public Hypothesis addHypothesis(
   @GET
   @Path("hypotheses")
   @Override
-  public List<TreeItem> listHypotheses() {
+  public List<Hypothesis> listHypotheses() {
     return this.repo.listHypotheses(USERNAME);
   }
 
@@ -434,7 +435,7 @@ public List<Question> listQuestions() {
   @GET
   @Path("question/{id}/options")
   @Override
-  public List<List<String>> listOptions(
+  public List<VariableOption> listOptions(
       @PathParam("id") String id) {
     try {
       // return WingsAdapter.get().getWorkflowList();
@@ -463,7 +464,7 @@ public List<List<String>> listOptions(
 
   @POST
   @Path("question/options")
-  public Map<String, List<List<String>>> listDynamicOptions(
+  public Map<String, List<VariableOption>> listDynamicOptions(
       @JsonProperty("config") QuestionOptionsRequest opts) {
     try {
       return this.repo.listDynamicOptions(opts);