チェンジセット 112 : BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java

更新日時:

2014/07/07 00:27:23 (10 年 前)

更新者:

nori

ログメッセージ:

support Literals

ファイル:

• BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (変更) (6 diff)

BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java

@@ -175 +175 @@
 
                 // SELECT
-                queryStr.append("SELECT DISTINCT ?indPropCat ?c ?d ?p ?numLnkInsStart ?numLnkInsEnd ?numInsDom ?numInsRan ?numTriples ?isStartClsLim ?isEndClsLim\n");
+                queryStr.append("SELECT DISTINCT ?indPropCat ?c ?dat ?d ?p ?numLnkInsStart ?numLnkInsEnd ?numInsDom ?numInsRan ?numTriples ?isStartClsLim ?isEndClsLim\n");
 
 //              if (targetGraphURIs != null) {
@@ -191 +191 @@
                 queryStr.append(" ?cr <http://sparqlbuilder.org/startClass> <" + originClass + ">. \n");
                 queryStr.append(" ?cr <http://sparqlbuilder.org/endClass> ?c. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/property> ?p. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/numberOfTriples> ?numTriples. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/numberOfInstancesOfStartClass> ?numLnkInsStart. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/numberOfInstancesOfEndClass> ?numLnkInsEnd. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/startClassLimitedQ> ?isStartClsLim. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/endClassLimitedQ> ?isEndClsLim. \n");
+                queryStr.append("}\n");
+                queryStr.append(" UNION\n");
+                queryStr.append(" {");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/startClass> <" + originClass + ">. \n");
+                queryStr.append(" ?cr <http://sparqlbuilder.org/endDatatype> ?dat. \n");
                 queryStr.append(" ?cr <http://sparqlbuilder.org/property> ?p. \n");
                 queryStr.append(" ?cr <http://sparqlbuilder.org/numberOfTriples> ?numTriples. \n");
@@ -247 +258 @@
                         Resource pro = sol.getResource("p");
                         String clsURI = null;
+                        String datURI = null;
                         if (pro != null) {
                                 int indPropCat = 4;
@@ -257 +269 @@
                                 Resource ccls = sol.getResource("c");
                                 Resource dcls = sol.getResource("d");
+                                Resource dat = sol.getResource("dat");
                                 Direction direction = null;
                                 if(ccls != null && dcls == null ){
@@ -266 +279 @@
                                                 direction = Direction.reverse;
                                                 clsURI = dcls.getURI();
+                                        }else{
+                                                if( ccls == null && dat != null && dcls == null ){
+                                                        clsURI = null;
+                                                        direction = Direction.forward;
+                                                        datURI = dat.getURI();
+                                                }
                                         }
                                 }
@@ -309 +328 @@
                                 }
                                 
-                                ClassLink cl = new ClassLink(proURI, clsURI, direction,
+                                ClassLink cl = new ClassLink(proURI, clsURI, datURI, direction,
                                                 numTriples, numInsDom, numInsRan,  numLnkInsStart, numLnkInsEnd, isStartClsLim, isEndClsLim);
                                 solCLs.add(cl);