Changeset 2463

Timestamp:

01/15/13 10:47:53 (11 years ago)

Author:

teckart

Message:

Add support of FCS endpoints in importer

Location:

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/importer

Files:

• CMDIData.java (modified) (4 diffs)
• MetadataImporter.java (modified) (4 diffs)

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIData.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.importer;
 
-import eu.clarin.cmdi.vlo.FacetConstants;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.solr.common.SolrInputDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import eu.clarin.cmdi.vlo.FacetConstants;
 
 /**
@@ -31 +32 @@
 
     // Lists for different types of resources.
-    private List<Resource> metaDataResources = new ArrayList<Resource>();
-    private List<Resource> dataResources = new ArrayList<Resource>();
-    private List<Resource> searchResources = new ArrayList<Resource>();
+    private final List<Resource> metaDataResources = new ArrayList<Resource>();
+    private final List<Resource> dataResources = new ArrayList<Resource>();
+    private final List<Resource> searchResources = new ArrayList<Resource>();
 
     public SolrInputDocument getSolrDocument() {
@@ -84 +85 @@
 
     /**
-     * //TODO CLARIN-type search resources (CQL endpoints) are not dealth with yet.
-     * you can use this method to get the list of SearchResources (== cql endpoints) and add it to the solr somehow :)
+     * Returns list of all search interfaces (preferably CQL interfaces)
      */
     public List<Resource> getSearchResources() {
@@ -104 +104 @@
         } else if (DATA_RESOURCE_TYPE.equals(type)) {
             dataResources.add(new Resource(resource,type, mimeType));
-        }else if (SEARCH_SERVICE_TYPE.equals(type)){
+        } else if (SEARCH_SERVICE_TYPE.equals(type)){
             searchResources.add(new Resource(resource,type, mimeType));
         } else {

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.importer;
 
-import eu.clarin.cmdi.vlo.CommonUtils;
-import eu.clarin.cmdi.vlo.Configuration;
-import eu.clarin.cmdi.vlo.FacetConstants;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -14 +22 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.*;
+import eu.clarin.cmdi.vlo.CommonUtils;
+import eu.clarin.cmdi.vlo.Configuration;
+import eu.clarin.cmdi.vlo.FacetConstants;
 
 
@@ -67 +74 @@
      * Just to know what we have already done.
      */
-    private Set<String> processedIds = new HashSet<String>();
+    private final Set<String> processedIds = new HashSet<String>();
     /**
      * Some caching for solr documents (we are more efficient if we ram a whole bunch to the solr server at once.
@@ -269 +276 @@
 
         solrDocument.addField(FacetConstants.FIELD_COMPLETE_METADATA, metadataSourceUrl);
-
+        
+        // add SearchServices (should be CQL endpoint)
+        for(Resource resource : cmdiData.getSearchResources())
+                solrDocument.addField(FacetConstants.FIELD_SEARCH_SERVICE, resource.getResourceName());        
+        
         addResourceData(solrDocument, cmdiData);
         docs.add(solrDocument);