fixed bug with missing choices comments in classesAndChoices

Author: kevinchekovfeeney

lib/query/woqlLibrary.js

@@ -117,21 +117,28 @@ WOQLLibrary.prototype.classesAndChoices = function(values, variables, schema_res
 
 
     let qpattern = new WOQLQuery().and(
-                    this.classes(values, variables, schema_resource),
-                   new WOQLQuery().opt().select("v:Choices").from("schema/main")
-                   .group_by("v:Class ID", ["v:choice id", "v:choice label", "v:choice description"], "v:Choices")
-                    .and(
-                  new WOQLQuery().select("v:choice id").distinct("v:choice id")
-                  .triple("v:Class ID", "owl:oneOf", "v:Choice")
-                  .path("v:Choice", "rdf:rest+", "v:Entry", "v:Path")
-                  .or(
+        this.classes(values, variables, schema_resource),
+        new WOQLQuery().opt().select("v:Choices").from("schema/main")
+            .group_by("v:Class ID", ["v:choice id", "v:choice label", "v:choice description"], "v:Choices")
+            .and(
+                new WOQLQuery().select("v:choice id").distinct("v:choice id")
+                .triple("v:Class ID", "owl:oneOf", "v:Choice")
+                .path("v:Choice", "rdf:rest+", "v:Entry", "v:Path")
+                .or(
                     new WOQLQuery().triple("v:Choice", "rdf:first", "v:choice id"),
                     new WOQLQuery().triple("v:Entry", "rdf:first", "v:choice id")
-                  ),
-                  new WOQLQuery().triple("v:choice id", "label", "v:choice label")
-                  .triple("v:choice id", "comment", "v:choice description")
-                    )   
-            )
+                ),
+                new WOQLQuery().triple("v:choice id", "label", "v:choice label"),
+                new WOQLQuery().or(
+                    new WOQLQuery().and(
+                        new WOQLQuery().not().triple("v:choice id", "comment", "v:any_choice"),
+                        new WOQLQuery().eq("v:choice description", "v:choice label")
+                    ),
+                    new WOQLQuery().triple("v:choice id", "comment", "v:choice description"),
+
+                )
+            )   
+    )
 
     return this._add_constraints(qpattern, values)
 }

lib/query/woqlSchema.js

@@ -188,6 +188,47 @@ WOQLQuery.prototype._nuke_schema_element = function(elvar, graph) {
 /**
  * Experimental / Unstable API
  */
+WOQLQuery.prototype.genEnum = function(prop, cls, clslabel, clsdesc, graph) {
+    clslabel = clslabel || cls
+    graph = this._sg(graph)
+
+    let add_class =  new WOQLQuery()
+        .add_quad(cls, "type", "owl:Class", graph) 
+        .add_quad(cls, "label", clslabel, graph)           
+    if(clsdesc){
+        add_class.add_quad(cls, "comment", clsdesc, graph)
+    }
+
+    this.and(
+        new WOQLQuery().select("v:PV").distinct("v:PV").triple("v:A", prop, "v:PV"),
+        new WOQLQuery().idgen(cls, ["v:PV"], "v:ChoiceID"),
+        add_class,
+        new WOQLQuery().add_quad("v:ChoiceID", "type", cls, graph)
+            .add_quad("v:ChoiceID", "label", "v:PV", graph)       
+    )    
+    return this
+}
+
+WOQLQuery.prototype.finishEnum = function(client, cls, graph) {
+    graph = this._sg(graph)
+    let q = new WOQLQuery().quad("v:ChoiceID", "type", cls, graph)
+    return client.query(q).then((results) => {
+        let ids = []
+        for(var i = 0; i< results.bindings.length; i++){
+            ids.push(results.bindings[i]["ChoiceID"])
+        }
+        return client.query(this._oneOfList(cls, ids, graph))
+    })
+}
+
+WOQLQuery.prototype.makeEnum = function(client, prop, cls, clslabel, clsdesc, graph) {
+    client.query(new WOQLQuery().genEnum( prop, cls, clslabel, clsdesc, graph))
+    .then(() => new WOQLQuery().finishEnum(client, cls, graph))
+    graph = this._sg(graph)
+    return new WOQLQuery().quad("v:Choice", "type", cls, graph)
+}
+
+//makeEnum(client(), "", "scm:DealType", "Deal Type", "The stage of the deal")
 
 /**
  * Generates a class representing a choice list - an enumerated list of specific options
@@ -235,6 +276,24 @@ WOQLQuery.prototype.generateChoiceList = function(cls, clslabel, clsdesc, choice
     return this.and(...confs, oneof)
 }
 
+WOQLQuery.prototype._oneOfList = function(cls, ids, graph) {
+    var listid = '_:' + (cls.indexOf(':') == -1 ? cls : cls.split(':')[1])
+    var lastid = listid
+    graph = this._sg(graph)
+    let clist = []
+    for (var i = 0; i < ids.length; i++) {
+        var nextid = i < ids.length - 1 ? listid + '_' + i : 'rdf:nil'
+        clist.push(new WOQLQuery().add_quad(lastid, 'rdf:first', new WOQLQuery().iri(ids[i]), graph))
+        clist.push(new WOQLQuery().add_quad(lastid, 'rdf:rest', new WOQLQuery().iri(nextid), graph))
+        lastid = nextid
+    }    
+    return this.and(
+        new WOQLQuery().add_quad(cls, 'owl:oneOf', new WOQLQuery().iri(listid), graph),
+        ...clist,
+    )
+}
+
+
 WOQLQuery.prototype.deleteChoiceList = function(classId, graph) {
     graph = this._sg(graph)
     return new WOQLQuery().and(

lib/woql.js

@@ -1011,10 +1011,15 @@ WOQL.link = function(a, b, c, g){
 }
 
 
+WOQL.makeEnum = function(client, prop, cls, clslabel, clsdesc, graph){
+    return new WOQLQuery().makeEnum(client, prop, cls, clslabel, clsdesc, graph)
+}
+
 WOQL.generateChoiceList = function(cls, clslabel, clsdesc, choices, graph, parent){
     return new WOQLQuery().generateChoiceList(cls, clslabel, clsdesc, choices, graph, parent)
 }
 
+
 WOQL.updateChoiceList = function(cls, clslabel, clsdesc, choices, graph){
     return new WOQLQuery().updateChoiceList(cls, clslabel, clsdesc, choices, graph)
 }