Index: /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java
===================================================================
--- /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java (revision 32)
+++ /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilderImpl.java (revision 36)
@@ -52,9 +52,11 @@
 	 */
 	public static void main(String[] args) throws Exception {
-		String sparqlEndpoint = "http://dbpedia.org/sparql";
-		// String sparqlEndpoint = "http://lsd.dbcls.jp/sparql";
-		String keyword = "artiste";
-		// String keyword = "Agent";
+		// String sparqlEndpoint = "http://dbpedia.org/sparql";
+		String sparqlEndpoint = "http://lsd.dbcls.jp/sparql";
+		// String keyword = "artiste";
+		String keyword = "EnglishCode";
 		String[] graphURIs = new String[0];
+
+		keyword = null;
 
 		OWLQueryBuilder builder = new OWLQueryBuilderImpl(sparqlEndpoint);
@@ -67,10 +69,8 @@
 			System.out.println(cls);
 		}
-		
-
-/*
-  		System.out.println("CLS");
- 
-		ClassLink[] cls = builder.getNextClass(null, clz[1].getClassURI(), 100,
+
+		System.out.println("CLS");
+
+		ClassLink[] cls = builder.getNextClass(null, clz[0].getClassURI(), 100,
 				false);
 		if (cls != null) {
@@ -78,21 +78,28 @@
 				System.out.println(cl.toString());
 			}
-			cls = builder.countLinks(null, clz[1].getClassURI(), cls);
+			cls = builder.countLinks(null, clz[0].getClassURI(), cls);
 			for (ClassLink cl : cls) {
 				System.out.println(cl.toString());
 			}
 		}
-*/
+
+		System.out.println("CLS-INS");
+		cls = builder.getNextClassViaInstanceLink(null, clz[0].getClassURI(),
+				100);
+		if (cls != null) {
+			for (ClassLink cl : cls) {
+				System.out.println(cl.toString());
+			}
+		}
+
+		System.out.println("Instances");
+		Instance[] ins = builder.getInstances(null, "\"A.C. Reed\"@en");
+		if (ins != null) {
+			for (Instance in : ins) {
+				System.out.println(in.toString());
+			}
+		}
+
 		/*
-		 * System.out.println("CLS-INS"); cls =
-		 * builder.getNextClassViaInstanceLink(null, clz[0].getClassURI(), 100);
-		 * if( cls != null ){ for( ClassLink cl: cls){
-		 * System.out.println(cl.toString()); } }
-		 * 
-		 * System.out.println("Instances"); Instance[] ins =
-		 * builder.getInstances(null, "\"A.C. Reed\"@en"); if( ins != null ){
-		 * for( Instance in: ins){ System.out.println(in.toString()); } }
-		 * 
-		 * 
 		 * System.out.println("INS-INS"); ins = builder.getInstances(null,
 		 * "\"A.C. Reed\"@en"); InstanceLink[] iLinks =
@@ -100,7 +107,5 @@
 		 * ins[0].getInstanceURI(), 100);
 		 * 
-		 * 
-		 * 
-		 * if( iLinks != null ){ for( InstanceLink in: iLinks){
+		 * if (iLinks != null) { for (InstanceLink in : iLinks) {
 		 * System.out.println(in.toString()); } }
 		 */
@@ -142,7 +147,12 @@
 
 		queryStr.append(" {?c rdf:type rdfs:Class} UNION {?c rdf:type owl:Class}\n");
-
-		queryStr.append("      ?c rdfs:label ?label.\n");
-		queryStr.append("      ?c rdfs:label ?pLabel.\n");
+//		queryStr.append("  ?i rdf:type ?c.\n");
+
+
+		
+		if (countInstances) {
+			queryStr.append("  ?c rdfs:label ?label.\n");
+		}
+		queryStr.append("  ?c rdfs:label ?pLabel.\n");
 		if (countInstances) {
 			queryStr.append("      ?i rdf:type ?c.\n");
@@ -156,10 +166,10 @@
 			queryStr.append(keyword);
 			queryStr.append("\" , \"i\" )\n");
-			queryStr.append("  )");
+			queryStr.append("  )\n");
 		}
 		if (countInstances) {
-			queryStr.append("\n}  GROUP BY ?c ?pLabel");
+			queryStr.append("}  GROUP BY ?c ?pLabel");
 		} else {
-			queryStr.append("\n}");
+			queryStr.append("}");
 		}
 		System.out.println(queryStr.toString());
@@ -177,5 +187,5 @@
 				String uri = res.getURI();
 				int numOfInstances = 0;
-				if( countInstances ){
+				if (countInstances) {
 					numOfInstances = sol.getLiteral("numOfInstances").getInt();
 				}
@@ -493,5 +503,6 @@
 	}
 
-	public Path[] getPaths(String startClass, String endClass, int mode, boolean countLinks) throws Exception {
+	public Path[] getPaths(String startClass, String endClass, int mode,
+			boolean countLinks) throws Exception {
 		OWLClassGraph graph = new OWLClassGraph(startClass, endClass);
 		return graph.getPaths(this, mode, countLinks);
@@ -748,10 +759,11 @@
 	}
 
-	public SClass[] countInstances(String[] graphURIs, SClass[] classes) throws Exception{
-		if( classes == null || classes.length == 0 ){
+	public SClass[] countInstances(String[] graphURIs, SClass[] classes)
+			throws Exception {
+		if (classes == null || classes.length == 0) {
 			return new SClass[0];
 		}
 		HashMap<String, SClass> classMap = new HashMap<String, SClass>();
-		for(SClass sc: classes){
+		for (SClass sc : classes) {
 			classMap.put(sc.getClassURI(), sc);
 		}
@@ -803,5 +815,5 @@
 		}
 		qexec.close();
-	
+
 		return classes;
 	}
Index: /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilder.java
===================================================================
--- /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilder.java (revision 32)
+++ /BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLQueryBuilder.java (revision 36)
@@ -82,4 +82,5 @@
 
 	public Path[] getPaths(String startClass, String endClass, int mode, boolean countLinks) throws Exception;
+
 	public String createSPARQL(Path path) throws Exception;
 
@@ -103,6 +104,8 @@
  InstanceLink[] getNextInstancesViaInstanceLink(String[] graphURIs, String originInstance,
 			int limit) throws Exception;
-	public LabelMap[] getLabels(String[] graphURIs, String[] resourceURIs, String language) throws Exception;
-	public ClassLink[] countLinks(String[] graphURIs, String startClassURI,
+
+ public LabelMap[] getLabels(String[] graphURIs, String[] resourceURIs, String language) throws Exception;
+
+ public ClassLink[] countLinks(String[] graphURIs, String startClassURI,
 			ClassLink[] classLinks) throws Exception;