チェンジセット 205 : SPARQLBuilderWWW/src

更新日時:

2014/11/13 21:45:40 (10 年 前)

更新者:

atsuko

ログメッセージ:

サーブレットの変数をローカル化

パス:

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder

ファイル:

• OWL/LabeledMultiDigraph.java (変更) (1 diff)
• OWL/OWLClassGraph.java (変更) (2 diff)
• www/EPServlet.java (変更) (4 diff)
• www/PLServlet.java (変更) (1 diff)

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/LabeledMultiDigraph.java

@@ -52 +52 @@
         LabeledEdge edge = new LabeledEdge(node2, elabel, direction, ntriples);
         adjlist.get(node1).add(edge);
+        
         Map<Integer, List<LabeledEdge>> edges = gadjlist.get(node1);
-        // 
+        List<LabeledEdge> sedge = edges.get(node2);
+        if ( sedge == null ){
+            sedge = new LinkedList<LabeledEdge>();
+            edges.put(node2, sedge);
+        }
+        sedge.add(edge);
     }
 }

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java

@@ -133 +133 @@
     }
 
+    //private
+    
 /*    
     private List<List<ClassLink>> searchPathsWithCut(OWLQueryBuilderImpl qb){
@@ -258 +260 @@
        } 
    }
+   
+   
 }

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

@@ -27 +27 @@
 public class EPServlet extends HttpServlet {
 
-    //private RDFSchemaAnalyzerFactory factory = null;
-    private QueryPathGenerator qpg = null;
     private static final String FILENAME = "cdata/";
     
@@ -69 +67 @@
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        //processRequest(request, response);
-        
+        HttpSession session = request.getSession();
+        session.removeAttribute("qpg");
+        QueryPathGenerator qpg = new QueryPathGenerator();
+
         response.setContentType("application/json;charset=UTF-8");
         response.setHeader("Access-Control-Allow-Origin", "*");
@@ -77 +77 @@
         response.setHeader("Access-Control-Max-Age", "-1");        
         PrintWriter out = response.getWriter();
-        if ( qpg == null ){
-            qpg = new QueryPathGenerator();
-        }
+
         String[] elist = qpg.getFactory().getEndpointURIList();
         JsonBuilderFactory jbfactory = Json.createBuilderFactory(null);
@@ -88 +86 @@
         JsonArray ja = jab.build();
         out.print(ja);
-        HttpSession session = request.getSession();
         session.setAttribute("qpg", qpg);
     }

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

@@ -88 +88 @@
                 jsonstr += ",";
             }
-            //jsonstr += paths[i].toJSONString2();
             if ( paths[i] == null ){
                 continue;
-                //System.out.println("here");
             }
             jsonstr += paths[i].toJSONString3(classes);