Index: /BH13SPARQLBuilder/.classpath
===================================================================
--- /BH13SPARQLBuilder/.classpath (revision 2)
+++ /BH13SPARQLBuilder/.classpath (revision 42)
@@ -17,4 +17,5 @@
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="lib2/agraph-4.5.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
Index: /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java
===================================================================
--- /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java (revision 36)
+++ /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java (revision 42)
@@ -61,4 +61,6 @@
 
 		OWLQueryBuilder builder = new OWLQueryBuilderImpl(sparqlEndpoint);
+
+/*
 		SClass[] clz = builder.getOWLClasses(graphURIs, keyword, false);
 		for (SClass cls : clz) {
@@ -69,19 +71,21 @@
 			System.out.println(cls);
 		}
-
+*/
 		System.out.println("CLS");
 
-		ClassLink[] cls = builder.getNextClass(null, clz[0].getClassURI(), 100,
-				false);
+		String uri = "http://purl.jp/bio/10/lsd/ontology/201209#EnglishEntry";
+		
+		ClassLink[] cls = builder.getNextClass(null, uri, 100, false);
+
 		if (cls != null) {
 			for (ClassLink cl : cls) {
 				System.out.println(cl.toString());
 			}
-			cls = builder.countLinks(null, clz[0].getClassURI(), cls);
+			cls = builder.countLinks(null, uri, cls);
 			for (ClassLink cl : cls) {
 				System.out.println(cl.toString());
 			}
 		}
-
+/*
 		System.out.println("CLS-INS");
 		cls = builder.getNextClassViaInstanceLink(null, clz[0].getClassURI(),
@@ -100,5 +104,5 @@
 			}
 		}
-
+*/
 		/*
 		 * System.out.println("INS-INS"); ins = builder.getInstances(null,
@@ -112,4 +116,7 @@
 	}
 
+	
+	
+	
 	/**
 	 * 譏守､ｺ逧�↓RDF縺ｧ譖ｸ縺九ｌ縺ｦ縺�ｋ繧ｯ繝ｩ繧ｹ繧貞叙蠕励☆繧�
@@ -146,4 +153,5 @@
 		queryStr.append("WHERE{\n");
 
+		// 
 		queryStr.append(" {?c rdf:type rdfs:Class} UNION {?c rdf:type owl:Class}\n");
 //		queryStr.append("  ?i rdf:type ?c.\n");
@@ -303,5 +311,14 @@
 	public ClassLink[] getNextClass(String[] graphURIs, String originClass,
 			int limit, boolean countLinks) throws Exception {
-		StringBuffer queryStr = new StringBuffer();
+		ClassLink[] cLinks = getNextClassSub(graphURIs, originClass, limit, false);
+		if( countLinks ){
+			cLinks = countLinks(graphURIs, originClass, cLinks);
+		}
+		return cLinks;
+	}
+
+	private ClassLink[] getNextClassSub(String[] graphURIs, String originClass, 
+			int limit, boolean countLinks) throws Exception {
+				StringBuffer queryStr = new StringBuffer();
 		queryStr.append("PREFIX owl: <http://www.w3.org/2002/07/owl#>\n");
 		queryStr.append("PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n");
@@ -714,5 +731,7 @@
 				queryStr.append(classLink.getLinkedClassURI());
 				queryStr.append(">.\n");
-				queryStr.append("?is ?p ?os.\n");
+				queryStr.append("?is <");
+				queryStr.append(classLink.getPropertyURI());
+				queryStr.append("> ?os.\n");
 				queryStr.append("}");
 			} else {
@@ -724,5 +743,7 @@
 					queryStr.append(classLink.getLinkedClassURI());
 					queryStr.append(">.\n");
-					queryStr.append("?is ?p ?os.\n");
+					queryStr.append("?is <");
+					queryStr.append(classLink.getPropertyURI());
+					queryStr.append("> ?os.\n");
 					queryStr.append("}");
 				} else {
@@ -733,7 +754,11 @@
 					queryStr.append(classLink.getLinkedClassURI());
 					queryStr.append(">.\n");
-					queryStr.append("{?is ?p ?os.}\n");
+					queryStr.append("{?is <");
+					queryStr.append(classLink.getPropertyURI());
+					queryStr.append("> ?os.}\n");
 					queryStr.append("UNION\n");
-					queryStr.append("{?os ?p ?is.}\n");
+					queryStr.append("{?os <");
+					queryStr.append(classLink.getPropertyURI());
+					queryStr.append("> ?is.}\n");
 					queryStr.append("}");
 				}