Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (revision 123)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java (revision 132)
@@ -5,4 +5,5 @@
 
 import jp.riken.accc.db.rdf.crawler.dataStructure.sparql.JenaModelGenerator;
+import jp.riken.accc.db.rdf.crawler.dataStructure.sparql.URICollection;
 
 import com.hp.hpl.jena.query.Query;
@@ -34,16 +35,16 @@
 	
 	public static void main(String[] args) throws Exception{
-		JenaModelGenerator jmGene = new JenaModelGenerator("c:\\cdata\\allie.ttl");
+		JenaModelGenerator jmGene = new JenaModelGenerator("c:\\temp\\reactomeF18s.ttl");
 		AcquiredStructureAnalyzer impl 
 			= new AcquiredStructureAnalyzer(jmGene.getEndpointURI(), jmGene.getGraphURIs(), jmGene.getModel());
-		System.out.println("--------------------------");
-		SClass[] scs = impl.getOWLClasses(null, null, null, true);
-		System.out.println("list classes:---------------");
-		for(SClass sc: scs){
-			System.out.println(sc.toString());
-		}
-		System.out.println("--------------------------");
-		
-		ClassLink[] cls = impl.getNextClass(null,"http://purl.org/allie/ontology/201108#ShortForm",100,true );
+//		System.out.println("--------------------------");
+//		SClass[] scs = impl.getOWLClasses(null, null, null, true);
+//		System.out.println("list classes:---------------");
+//		for(SClass sc: scs){
+//			System.out.println(sc.toString());
+//		}
+//		System.out.println("--------------------------");
+		
+		ClassLink[] cls = impl.getNextClass(null,"http://www.biopax.org/release/biopax-level3.owl#Protein",100,true );
 		for(ClassLink cl: cls){
 			System.out.println(cl.toString());
@@ -80,5 +81,5 @@
 		queryStr.append("PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n");
 		queryStr.append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n");
-		queryStr.append("SELECT DISTINCT ?c ?pLabel ?numOfInstances\n");
+		queryStr.append("SELECT DISTINCT ?c ?pLabel ?entities\n");
 //		if (targetGraphURIs != null) {
 //			for (String graphURI : targetGraphURIs) {
@@ -89,7 +90,11 @@
 //		}
 		queryStr.append("WHERE{\n");
-		queryStr.append(" ?c rdf:type rdfs:Class. \n");
-		queryStr.append(" ?c <http://sparqlbuilder.org/numberOfInstances> ?numOfInstances. \n");
-		queryStr.append(" OPTIONAL{ ?c rdfs:label ?pLabel. }\n");
+		queryStr.append(" ?cp <").append(URICollection.PROPERTY_VOID_CLASS).append("> ?c. \n");
+		queryStr.append(" ?cp <");
+		queryStr.append(URICollection.PROPERTY_VOID_ENTITIES);
+		queryStr.append("> ?entities. \n");
+		queryStr.append(" OPTIONAL{ ?c <");
+		queryStr.append(URICollection.PROPERTY_RDFS_LABEL);
+		queryStr.append("> ?pLabel. }\n");
 
 		if (keywords != null && keywords.length != 0) {
@@ -139,5 +144,5 @@
 				int numOfInstances = 0;
 				if (countInstances) {
-					numOfInstances = sol.getLiteral("numOfInstances").getInt();
+					numOfInstances = sol.getLiteral("entities").getInt();
 				} //
 				Literal labelLiteral = sol.getLiteral("pLabel");
@@ -175,5 +180,5 @@
 
 		// SELECT
-		queryStr.append("SELECT DISTINCT ?indPropCat ?c ?dat ?d ?p ?numLnkInsStart ?numLnkInsEnd ?numInsDom ?numInsRan ?numTriples ?isStartClsLim ?isEndClsLim\n");
+		queryStr.append("SELECT DISTINCT ?indPropCat ?c ?dat ?d ?p ?numLnkInsStart ?numLnkInsEnd ?numInsDom ?numInsRan ?numTriples\n");
 
 //		if (targetGraphURIs != null) {
@@ -186,44 +191,43 @@
 
 		queryStr.append("WHERE{\n");
-		queryStr.append(" ?cr rdf:type <http://sparqlbuilder.org/ClassRelation>. \n");
-//		queryStr.append(" <" + originClass + "> <http://sparqlbuilder.org/numberOfInstances> ?numInsStart. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_RDF_TYPE).append("> <").append(URICollection.RESOURCE_SB_CLASS_RELATION).append(">. \n");
+		queryStr.append(" ?propPart <").append(URICollection.PROPERTY_SB_CLASS_RELATION).append("> ?cr. \n");
+		queryStr.append(" ?propPart <").append(URICollection.PROPERTY_VOID_PROPERTY).append("> ?p. \n");
+		
 		queryStr.append(" {");
-		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(" ?cr <").append(URICollection.PROPERTY_SB_SUBJECT_CLASS).append("> <" + originClass + ">. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_OBJECT_CLASS).append("> ?d. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_SUBJECTS).append("> ?numLnkInsStart. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_OBJECTS).append("> ?numLnkInsEnd. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_TRIPLES).append("> ?numTriples. \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");
-		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(" ?cr <").append(URICollection.PROPERTY_SB_SUBJECT_CLASS).append("> <" + originClass + ">. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_OBJECT_DATATYPE).append("> ?dat. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_SUBJECTS).append("> ?numLnkInsStart. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_OBJECTS).append("> ?numLnkInsEnd. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_TRIPLES).append("> ?numTriples. \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/endClass> <" + originClass + ">. \n");
-		queryStr.append(" ?cr <http://sparqlbuilder.org/startClass> ?d. \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> ?numLnkInsEnd. \n");
-		queryStr.append(" ?cr <http://sparqlbuilder.org/numberOfInstancesOfEndClass> ?numLnkInsStart. \n");
-		queryStr.append(" ?cr <http://sparqlbuilder.org/startClassLimitedQ> ?isEndClsLim. \n");
-		queryStr.append(" ?cr <http://sparqlbuilder.org/endClassLimitedQ> ?isStartClsLim. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_OBJECT_CLASS).append("> <" + originClass + ">. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_SUBJECT_CLASS).append("> ?d. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_SUBJECTS).append("> ?numLnkInsEnd. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_OBJECTS).append("> ?numLnkInsStart. \n");
+		queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_TRIPLES).append("> ?numTriples. \n");
+//		queryStr.append(" ?cr <http://sparqlbuilder.org/startClassLimitedQ> ?isEndClsLim. \n");
+//		queryStr.append(" ?cr <http://sparqlbuilder.org/endClassLimitedQ> ?isStartClsLim. \n");
 		queryStr.append("}\n");
 		
-		queryStr.append(" ?pp rdf:type <http://sparqlbuilder.org/PropertyProfile>. \n");
-		queryStr.append(" ?pp <http://sparqlbuilder.org/property> ?p. \n");
-		queryStr.append(" ?pp <http://sparqlbuilder.org/individualPropertyCategory> ?indPropCat. \n");
-		queryStr.append(" ?pp <http://sparqlbuilder.org/numberOfInstancesOfDomainClass> ?numInsDom. \n");
-		queryStr.append(" ?pp <http://sparqlbuilder.org/numberOfInstancesOfRangeClass> ?numInsRan \n");
+//		queryStr.append(" ?propPart <").append(URICollection.PROPERTY_RDF_TYPE).append("> <").append(URICollection.PROPERTY_VOID_PROPERTY_PARTITION).append(">. \n");
+		queryStr.append(" ?propPart <").append(URICollection.PROPERTY_SB_PROPERTY_CATEGORY).append("> ?indPropCat. \n");
+
+		queryStr.append(" ?propPart <").append(URICollection.PROPERTY_VOID_DISTINCT_SUBJECTS).append("> ?numInsDom. \n");
+		queryStr.append(" ?propPart <").append(URICollection.PROPERTY_VOID_DISTINCT_OBJECTS).append("> ?numInsRan. \n");
 	
 		queryStr.append("}\n");
Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 123)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 132)
@@ -23,10 +23,12 @@
     public static void main(String[] args){
         // For Test
-        String sp = "http://data.allie.dbcls.jp/sparql";
-        String sc = "http://purl.org/allie/ontology/201108#ShortForm";
-        String ec = "http://purl.org/allie/ontology/201108#LongForm";
-        //String sp = "http://www.ebi.ac.uk/rdf/services/chembl/sparql";
-        //String sc = "http://rdf.ebi.ac.uk/terms/chembl#Enzyme";
-        //String ec = "http://rdf.ebi.ac.uk/terms/chembl#Activity";
+        //String sp = "http://data.allie.dbcls.jp/sparql";
+        //String sc = "http://purl.org/allie/ontology/201108#ShortForm";
+        //String ec = "http://purl.org/allie/ontology/201108#LongForm";
+
+        String sp = "http://www.ebi.ac.uk/rdf/services/chembl/sparql";
+        String sc = "http://rdf.ebi.ac.uk/terms/chembl#Enzyme";
+        String ec = "http://rdf.ebi.ac.uk/terms/chembl#Activity";
+
         //String sp = "http://www.ebi.ac.uk/rdf/services/biosamples/sparql";
         //String sc = "http://rdf.ebi.ac.uk/terms/biosd/Sample";
Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java (revision 131)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java (revision 132)
@@ -70,5 +70,5 @@
         String jpath = request.getParameter("jsonpath");
         Path path = convertJ2Path(jpath);
-        String query = getQuery(path);
+        String query = convertPath2SPARQL(path);
         out.print(query);
     }