チェンジセット 197

更新日時:

2014/10/28 11:44:50 (10 年 前)

更新者:

atsuko

ログメッセージ:

CLServlet がラベル+インスタンス数を出力するように変更

パス:

SPARQLBuilderWWW

ファイル:

• nbproject/genfiles.properties (変更) (1 diff)
• nbproject/project.properties (変更) (2 diff)
• nbproject/project.xml (変更) (1 diff)
• src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (変更) (2 diff)
• src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (変更) (2 diff)
• src/java/org/biohackathon/SPARQLBuilder/endpointMetadata/MetadataFile.java (変更) (1 diff)
• src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (変更) (1 diff)
• web/WEB-INF/glassfish-web.xml (変更) (1 diff)

SPARQLBuilderWWW/nbproject/genfiles.properties

@@ -1 @@
-build.xml.data.CRC32=d2464d47
+build.xml.data.CRC32=73259a3a
 build.xml.script.CRC32=15bad33c
 build.xml.stylesheet.CRC32=651128d4@1.67.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d2464d47
+nbproject/build-impl.xml.data.CRC32=73259a3a
 nbproject/build-impl.xml.script.CRC32=06c5e70d
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.67.1.1

SPARQLBuilderWWW/nbproject/project.properties

@@ -111 +111 @@
 javadoc.windowtitle=
 lib.dir=${web.docbase.dir}/WEB-INF/lib
-no.dependencies=false
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
@@ -120 +119 @@
 # Space-separated list of JVM arguments used when running a class with a main method or a unit test
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
-runmain.jvmargs=
+runmain.jvmargs=-Xmx 5000m -Xms 5000m -XX:-UseGCOverheadLimit
 source.encoding=UTF-8
 source.root=src

SPARQLBuilderWWW/nbproject/project.xml

@@ -94 +94 @@
             <web-module-additional-libraries/>
             <source-roots>
-                <root id="src.dir" name="繧ｽ繝ｼ繧ｹ繝ｻ繝代ャ繧ｱ繝ｼ繧ｸ"/>
+                <root id="src.dir"/>
             </source-roots>
             <test-roots>
-                <root id="test.src.dir" name="繝�せ繝医�繝代ャ繧ｱ繝ｼ繧ｸ"/>
+                <root id="test.src.dir"/>
             </test-roots>
         </data>

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

@@ -44 +44 @@
     public OWLClassGraph(String startClass, String endClass){
         super();
+        
+        // start & end
         this.startClass = startClass;
-        addNode(startClass);
         this.endClass = endClass;
-        addNode(endClass);
+        
+        // parameters
         nsteps = 3;
         limit = 1000;
         prunecut = 100;
+        
+        // constructing subgraph
+        
     }
 
@@ -229 +234 @@
     }
     */
+      
+   private void setGraph(RDFSchemaAnalyzer rdfsa, boolean countLink){
+       // BFS
+       
+       
+       //ClassLink[] classLinks = rdfsa.getNextClass(null, crrlp.classLink.getLinkedClassURI(), limit, countLinks);
+   }
     
 }

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

@@ -18 +18 @@
     private RDFSchemaAnalyzer analyzer = null;
     //private OWLClassGraph graph;
-
+    //private PathMatrix matrix = null;
+    
     private static final String CDIR = "cdata";
     
@@ -84 +85 @@
         }
         try {
-            return analyzer.getOWLClasses(null, keywords, null, false);
+            return analyzer.getOWLClasses(null, keywords, null, true);
         }catch(Exception e){
             System.err.println(e);

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata/MetadataFile.java

@@ -324 +324 @@
         }
         
-        
-        
-        
         private void readFile(File file) throws Exception{
                 System.out.println("readfile: " + file.getAbsolutePath());

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

@@ -83 +83 @@
         for (int i = 0 ; i < classes.length; i++ ){
             JsonObjectBuilder job = jbfactory.createObjectBuilder();
-            job.add("uri", classes[i].getClassURI());
-            job.add("display", classes[i].getClassURI());
-            //jab.add(classes[i].getClassURI());
+            String uri = classes[i].getClassURI();
+            job.add("uri", uri);
+            Label[] labels = classes[i].getLabels();
+            String label = null;
+            for ( int j = 0 ; j < labels.length; j++ ){
+                if ( labels[j].getLanguage() == null ){
+                    label = labels[j].getLabel(); break;
+                }else if ( labels[j].getLanguage().equals("en") ){
+                    label = labels[j].getLabel(); break;
+                }
+            }
+            if ( label == null ){
+                String[] uris = uri.split("/");
+                String tmplabel = uris[uris.length-1];
+                String[] tmplabel2 = tmplabel.split("#");
+                label = tmplabel2[tmplabel2.length-1];
+            }
+            
+            StringBuilder displaybuilder = new StringBuilder(label);
+            displaybuilder.append(" (");
+            displaybuilder.append(classes[i].getNumOfInstances());
+            displaybuilder.append(")");
+            job.add("display", displaybuilder.toString());
             jab.add(job);
         }

SPARQLBuilderWWW/web/WEB-INF/glassfish-web.xml

@@ -2 +2 @@
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
-  <context-root>/sbapi</context-root>
+  <context-root>/api</context-root>
   <class-loader delegate="true"/>
   <jsp-config>