チェンジセット 273 : SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www

更新日時:

2016/03/15 18:40:34 (9 年 前)

更新者:

atsuko

ログメッセージ:

新クローラに対応

パス:

SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www

ファイル:

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

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

@@ -75 +75 @@
         PrintWriter out = response.getWriter();
         String ep = request.getParameter("ep");
+        String classURI = request.getParameter("class");
         
         HttpSession session = request.getSession();
         QueryPathGenerator qpg = (QueryPathGenerator)session.getAttribute("qpg");
         SortedSet<String> sortedClasses = null;
+        SClass[] classes = null;
+        JsonBuilderFactory jbfactory = Json.createBuilderFactory(null);
+        JsonObjectBuilder job = jbfactory.createObjectBuilder();
+        JsonArray ja = null;
                 
         if ( qpg == null ){
             qpg = new QueryPathGenerator();
         }
-        if ( ep == null ){
-            JsonBuilderFactory jbfactory = Json.createBuilderFactory(null);
-            JsonObjectBuilder job = jbfactory.createObjectBuilder();
-
-            String[] eplist = qpg.getFactory().getEndpointURIList();
-            for ( int i = 0; i < eplist.length; i++ ){
-                try{
-                    SClass[] classes = qpg.getClassesByEndpoint(eplist[i]);
-                    sortedClasses = qpg.getSortedClasses(classes);
-                    JsonArray ja = getJsonArrayFromSortedClasses(jbfactory, sortedClasses);
-                    job.add(eplist[i], ja);                    
-                }catch(Exception e){
-                    System.err.println(e);
-                }
+        if ( classURI == null ){
+            try{
+                classes = qpg.getClasses();
+            }catch(Exception e){
+                System.err.println(e);
             }
-            JsonObject jo = job.build();
-            out.print(jo);
-            return;
-        }
-        String classURI = request.getParameter("class");
-        SClass[] classes = null;
-        if ( classURI != null ){
-            //qpg.setOWLClassGraph(classURI); // KOKO
-            //classes = qpg.getReachableClasses();
         }else{
-            classes = qpg.getClasses(null);
+            //classes = qpg.getAdjclasses(classURI);
         }
         sortedClasses = qpg.getSortedClasses(classes);
-        
-        JsonBuilderFactory jbfactory = Json.createBuilderFactory(null);
-        JsonArray ja = getJsonArrayFromSortedClasses(jbfactory, sortedClasses);
+        ja = getJsonArrayFromSortedClasses(jbfactory, sortedClasses);
         out.print(ja);
     }
@@ -148 +133 @@
         while( cit.hasNext() ){
             String classinfo = cit.next();
-            String[] data = classinfo.split("  "); 
+            String[] data = classinfo.split("\t"); 
             if (data.length != 3 ){
                 System.out.println("data is wrong?");
@@ -164 +149 @@
         while( cit.hasNext() ){
             String classinfo = cit.next();
-            String[] data = classinfo.split("  "); 
+            String[] data = classinfo.split("\t"); 
             if (data.length != 3 ){
                 System.out.println("data is wrong?");

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

@@ -85 +85 @@
             qpg = new QueryPathGenerator();
         }
-        SClass[] classes = qpg.getClasses(null);
+        SClass[] classes = qpg.getClasses();
         qpg.setClassLabels(classes);
         

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

@@ -165 +165 @@
         //                       numOfOriginClassInstances,  numOfLinkedClassInstances,
         //                      false, false);
-             ClassLink classLink =new ClassLink(propertyURI, linkedClassURI, linkedLiteralDatatypeURI, myDirection, 
+             ClassLink classLink = new ClassLink(propertyURI, linkedClassURI, linkedLiteralDatatypeURI, myDirection, 
                                  0,  0,  0,
-                                 0,  0,
-                                false, false);
+                                 0,  0);
             System.out.println(classLink.getDirection().toString());  
            list.add(classLink);