Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java (revision 214)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java (revision 229)
@@ -276,25 +276,30 @@
               //rewrite Sparql                
 	                 
-      ArrayList<String> classname2 = new ArrayList<String>();
+               ArrayList<String> classname2 = new ArrayList<String>();
                for(int index=0;index<classname.size();index++){
-                 String  tmp=classname.get(index);
-                
-                 int mark;
-                 if((mark=tmp.indexOf("#"))!=-1)
+                  String  tmp=classname.get(index);
+                  /*
+                  int mark;
+                  if((mark=tmp.indexOf("#"))!=-1)
                      classname2.add(tmp.substring(mark+1));
                   else classname2.add(tmp.substring(tmp.indexOf("/")+1));
-                   
+                  */
+                  // changed by Atsuko
+                  String[] sname1 = tmp.split("#");
+                  String[] sname2 = sname1[sname1.length -1].split("/");
+                  String[] sname3 = sname2[sname2.length -1].split(":");
+                  String cname = sname3[sname3.length -1].replaceAll("-", "");
+                  classname2.add(cname);
                }
                String query=queryStr.toString();
                 for(int index=0;index<classname2.size();index++){
-                  String  original="c"+index; 
-                 query= query.replaceAll(original, classname2.get(index));
+                  String  original="c"+index;
+                  query= query.replaceAll(original, classname2.get(index));
                 }
                 query= query.replaceAll("\\?l","\\?label");
-		System.out.println(query);  
+		System.out.println(query);
 		return query;
-        
-    
-    }
+    }
+    
     private static String rewriteSparql(String query){
         StringBuffer tmp=new StringBuffer(query);