チェンジセット 248 : SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www

更新日時:

2015/03/24 18:18:00 (10 年 前)

更新者:

atsuko

ログメッセージ:

枝刈り，クラス順序変更(数字は下に)

パス:

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www

ファイル:

• CLServlet.java (変更) (5 diff)
• PLServlet.java (変更) (2 diff)
• SPServlet.java (変更) (1 diff)

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java

@@ -74 +74 @@
         PrintWriter out = response.getWriter();
         String ep = request.getParameter("ep");
+        String classURI = request.getParameter("class");
         HttpSession session = request.getSession();
         QueryPathGenerator qpg = (QueryPathGenerator)session.getAttribute("qpg");
@@ -82 +83 @@
         qpg.setSPARQLendpoint(ep);
         //OWLClassGraph ocg = qpg.getOWLClassGraph();
+        if ( classURI != null ){
+            qpg.setOWLClassGraph(classURI);
+        }
+        
         SClass[] classes = qpg.getClasses(null);
         for (int i = 0 ; i < classes.length; i++ ){
@@ -88 +93 @@
             //    continue;
             //}
+            if ( classURI != null ){
+                if ( qpg.getOWLClassGraph().visitedNode(classURI) == false ){
+                    continue;
+                }
+            }
             Label[] labels = classes[i].getLabels();
             String label = null;
@@ -113 +123 @@
         JsonArrayBuilder jab = jbfactory.createArrayBuilder();
         Iterator<String> cit = sortedClasses.iterator();
+        List<String> tmpclasses = new LinkedList<String>();
+        JsonObjectBuilder job = jbfactory.createObjectBuilder();
         while( cit.hasNext() ){
-            JsonObjectBuilder job = jbfactory.createObjectBuilder();
+            String classinfo = cit.next();
+            String[] data = classinfo.split("  "); 
+            if (data.length != 3 ){
+                System.out.println("data is wrong?");
+            }
+            if (data[0].matches("^[0-9]*$")){
+                tmpclasses.add(classinfo);
+            }else{
+                job.add("uri", data[2]);
+                job.add("label", data[0]);
+                job.add("number", data[1]);
+                jab.add(job);
+            }
+        }
+        cit = tmpclasses.iterator();
+        while( cit.hasNext() ){
             String classinfo = cit.next();
             String[] data = classinfo.split("  "); 
@@ -124 +151 @@
             job.add("number", data[1]);
             jab.add(job);
-        }
+        }       
         JsonArray ja = jab.build();
         out.print(ja);

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java

@@ -74 +74 @@
         String st = request.getParameter("startclass");
         String en = request.getParameter("endclass");
+        String ask = request.getParameter("ask");
         
         HttpSession session = request.getSession();
@@ -81 +82 @@
         }
         SClass[] classes = qpg.getClasses(null);
-        Path[] paths = qpg.getPaths(st, en, true);
+        Path[] paths = null;
+        if ( ask == null ){
+            paths = qpg.getPaths(st, en, false);
+        }else if ( ask.equalsIgnoreCase("true")){
+            paths = qpg.getPaths(st, en, true);            
+        }else{
+            paths = qpg.getPaths(st, en, false);            
+        }
+            
         String jsonstr = "[";
         for(int i = 0; i< paths.length; i++){

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java

@@ -179 +179 @@
     
     private String convertPath2SPARQL(Path path) throws Exception{
-        
-         ArrayList<String> classname =new ArrayList<String>() ;
-                
+        ArrayList<String> classname =new ArrayList<String>() ;
         if( path == null ){
                         throw new Exception("Path is null.");