SQO changes

Author: hvarg

server/src/main/java/org/diskproject/server/repository/DiskRepository.java

@@ -856,8 +856,13 @@ public List<Question> loadQuestionsFromKB(String url) {
             this.start_read();
             KBObject typeprop = kb.getProperty(KBConstants.RDF_NS + "type");
             KBObject labelprop = kb.getProperty(KBConstants.RDFS_NS + "label");
+            // Load question variables:
+            for (KBTriple t : kb.genericTripleQuery(null, typeprop, SQOnt.getClass(SQO.QUESTION_VARIABLE))) {
+                KBObject qv = t.getSubject();
+                allVariables.put(qv.getID(), LoadQuestionVariableFromKB(qv, kb));
+            }
 
-            // Load question classes and properties
+            // Load questions and subproperties
             for (KBTriple t : kb.genericTripleQuery(null, typeprop, SQOnt.getClass(SQO.QUESTION))) {
                 // System.out.println(t.toString());
                 KBObject question = t.getSubject();
@@ -873,13 +878,12 @@ public List<Question> loadQuestionsFromKB(String url) {
                     if (variables != null && variables.size() > 0) {
                         vars = new ArrayList<QuestionVariable>();
                         for (KBObject var : variables) {
-                            QuestionVariable qv = LoadQuestionVariableFromKB(var, kb);
+                            QuestionVariable qv = allVariables.get(var.getID());
                             if (qv != null)
                                 vars.add(qv);
+                            else
+                                System.err.println("Could not find " + var.getID());
                         }
-                        // Store question variables
-                        for (QuestionVariable v : vars)
-                            allVariables.put(v.getId(), v);
                     }
 
                     Question q = new Question(question.getID(), name.getValueAsString(), template.getValueAsString(),
@@ -1093,34 +1097,39 @@ public Map<String,List<VariableOption>> listDynamicOptions (QuestionOptionsReque
         Map<String, String> bindings = cfg.getBindings();
         Question q = allQuestions.get(cfg.getId());
         String query = (q != null) ? q.getConstraint() : null;
-        if (q == null) return null;
-
-        if (bindings != null && query != null)
-            for (String name: bindings.keySet()) {
-                String value = bindings.get(name);
-                if (value.startsWith("http")) {
-                    query += "VALUES " + name + " { <" + value + "> }\n";
+        if (q == null) return null; // TODO: If no query constraint should go to variable queries.
+
+        // Create map variableName -> filter
+        Map<String, String> filters = new HashMap<String, String>();
+        if (bindings != null && query != null) {
+            for (String varUrl: bindings.keySet()) {
+                QuestionVariable curVar = allVariables.get(varUrl);
+                if (curVar != null) {
+                    String value = bindings.get(varUrl);
+                    String name = curVar.getVariableName();
+                    String sparqlValue = value.startsWith("http") ? "<" + value + ">" : "\"" + value + "\"";
+                    filters.put(name, "VALUES " + name + " { " + sparqlValue + " }");
                 } else {
-                    query = query.replace(name, "\"" + value + "\"");
+                    System.err.println("Cannot find variable ID: " + varUrl);
                 }
             }
+        }
 
         for (QuestionVariable qv: q.getVariables()) {
             if (qv.getSubType() == null) {
                 String varName = qv.getVariableName();
-                List<VariableOption> options = null;
-                if (bindings != null && bindings.containsKey(varName)) {
-                    String value = bindings.get(varName);
-                    if (!value.startsWith("http")) {
-                        options = new ArrayList<VariableOption>();
-                        options.add(new VariableOption(value, value));
+                String curQuery = query;
+                if (filters != null && query != null) {
+                    for (String diffVar: filters.keySet()) {
+                        if (!diffVar.equals(varName)) {
+                            curQuery += "\n" + filters.get(diffVar);
+                        }
                     }
                 }
-                if (options == null && query != null) {
-                    options = queryForOptions(varName, query);
-                } else if (options == null) {
-                    options = listVariableOptions(qv.getId().replaceAll("^.*\\/", ""));
-                }
+                //System.out.println("Variable " + varName + ":\n" + curQuery);
+                List<VariableOption> options = curQuery != null ?
+                    queryForOptions(varName, curQuery)
+                    : listVariableOptions(qv.getId().replaceAll("^.*\\/", ""));
                 all.put(varName, options);
             }
         }

server/src/main/java/org/diskproject/server/repository/WingsAdapter.java

@@ -315,7 +315,6 @@ private boolean login() {
 			// Check for Session ID to make sure we've logged in
 			for (Cookie cookie : context.getCookieStore().getCookies()) {
 				if (cookie.getName().equalsIgnoreCase("JSESSIONID")) {
-					System.out.println("JSESSIONID: " + cookie.getValue());
 					return true;
 				}
 			}

shared/src/main/java/org/diskproject/shared/ontologies/SQO.java

@@ -26,7 +26,7 @@ public class SQO {
     public static final String HAS_MIN_CARDINALITY = "minCardinality";
     public static final String HAS_MAX_CARDINALITY = "maxCardinality";
     public static final String HAS_OPTIONS_QUERY = "hasOptionsQuery";
-    public static final String HAS_QUESTION_CONSTRAINT_QUERY = "hasQuestionConstraint";
+    public static final String HAS_QUESTION_CONSTRAINT_QUERY = "hasConstraintQuery";
     public static final String HAS_TEMPLATE = "hasQuestionTemplate";
     public static final String HAS_PATTERN = "hasQuestionPattern";
     public static final String HAS_VARIABLE_NAME = "hasVariableName";