Added label output for matched terms.

balhoff · balhoff · commit 74fd81159ede · 2017-03-02T15:40:37.000-05:00
diff --git a/src/main/scala/org/monarchinitiative/dosdp/SPARQL.scala b/src/main/scala/org/monarchinitiative/dosdp/SPARQL.scala
@@ -59,7 +59,7 @@ ${triplesFor(dosdp).mkString("\n")}
       case (variable, named: OWLClass) => Seq(s"?${DOSDP.processedVariable(variable)} rdfs:subClassOf* <${named.getIRI}> .")
       case (variable, expression)      => Seq(s"?${DOSDP.processedVariable(variable)} rdfs:subClassOf ${expression.asOMN} .")
     }
-    val labelTriples = axiomVariables(dosdp).map(v => s"OPTIONAL { ?$v rdfs:label ${v}__label . }")
+    val labelTriples = axiomVariables(dosdp).map(v => s"OPTIONAL { $v rdfs:label ${v}__label . }")
     axiomTriples ++ variableTriples ++ labelTriples
   }
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ ${triplesFor(dosdp).mkString("\n")}`
`59`	`59`	`case (variable, named: OWLClass) => Seq(s"?${DOSDP.processedVariable(variable)} rdfs:subClassOf* <${named.getIRI}> .")`
`60`	`60`	`case (variable, expression) => Seq(s"?${DOSDP.processedVariable(variable)} rdfs:subClassOf ${expression.asOMN} .")`
`61`	`61`	`}`
`62`		`- val labelTriples = axiomVariables(dosdp).map(v => s"OPTIONAL { ?$v rdfs:label ${v}__label . }")`
	`62`	`+ val labelTriples = axiomVariables(dosdp).map(v => s"OPTIONAL { $v rdfs:label ${v}__label . }")`
`63`	`63`	`axiomTriples ++ variableTriples ++ labelTriples`
`64`	`64`	`}`
`65`	`65`