チェンジセット 269 : SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata

更新日時:

2016/03/14 20:01:59 (9 年 前)

更新者:

nori

ログメッセージ:

クローラー結果としてCrawledDataset が扱えるようにの暫定版

パス:

SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata

ファイル:

• MetadataFile.java (変更) (1 diff)
• MetadataManager.java (変更) (4 diff)

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

@@ -5 +5 @@
 import java.util.Calendar;
 
-import jp.riken.accc.db.rdf.crawler.dataStructure.sparql.URICollection;
+import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.URICollection;
 
 import org.apache.jena.riot.RDFDataMgr;

SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata/MetadataManager.java

@@ -5 +5 @@
 import java.util.Set;
 
+import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.crawler.CrawledMetadata;
+import jp.riken.accc.db.sparqlBuilderMetadata.crawler.dataStructure.sparql.crawler.CrawledMetadataFileReader;
+
 public class MetadataManager {
 
-        HashMap<String,MetadataFile> metadataTable = null;
+        HashMap<String,CrawledMetadata> metadataTable = null;
         
         /*
@@ -22 +25 @@
         }*/     
 
-        public MetadataFile[] getMetadataFiles(){
-                return metadataTable.values().toArray(new MetadataFile[0]);
+        public CrawledMetadata[] getCrawlerMetadataList(){
+                return metadataTable.values().toArray(new CrawledMetadata[0]);
         }
-        public MetadataFile getMetadataFile(String uri){
+        public CrawledMetadata getCrawledMetadata(String uri){
                 return metadataTable.get(uri);
         }
@@ -41 +44 @@
         
         public void init(String metadataDirStr) throws Exception{
-                metadataTable = new HashMap<String,MetadataFile>();
+                metadataTable = new HashMap<String,CrawledMetadata>();
                 File metadataDir = new File(metadataDirStr);
                 File[] files = null;
@@ -58 +61 @@
                 }
                 for(File file: files){
-                        MetadataFile metadataFile = null;
+                        CrawledMetadata crawledMetadata = null;
                         try{
-                                metadataFile = new MetadataFile(file);
-                                String uri = metadataFile.getEndpointURI();
+                                crawledMetadata = CrawledMetadataFileReader.readFile(file.getCanonicalPath());
+                                String uri = crawledMetadata.getEndpointURI();
                                 if( uri != null ){
                                         if( metadataTable.containsKey(uri)){
-                                                MetadataFile tempMF = metadataTable.get(uri);
-                                                if(tempMF.getEndDateTime().before(metadataFile.getEndDateTime()) ){
+                                                CrawledMetadata tempMF = metadataTable.get(uri);
+                                                if(tempMF.getDefaultDataset().getCrawlLog().crawlEndTime.before(crawledMetadata.getDefaultDataset().getCrawlLog().crawlEndTime) ){
                                                         metadataTable.remove(uri);
-                                                        metadataTable.put(uri,  metadataFile);
+                                                        metadataTable.put(uri,  crawledMetadata);
                                                 }
                                         }else{
-                                                metadataTable.put(uri, metadataFile);
+                                                metadataTable.put(uri, crawledMetadata);
                                         }
                                 }