Changeset 6386

Timestamp:

07/14/15 09:42:13 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

NULL values in VLO's facet values
ProfileID & ProfileName? facets

Location:

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer

Files:

• CMDIData.java (modified) (3 diffs)
• CMDIParserVTDXML.java (modified) (3 diffs)
• MetadataImporter.java (modified) (1 diff)

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIData.java

@@ -2 +2 @@
 
 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;
@@ -38 +40 @@
     private final List<Resource> landingPageResources = new ArrayList<Resource>();
     private final List<Resource> searchPageResources = new ArrayList<Resource>();
+    
+    private String profileId;
+    private String profileName;
 
     public SolrInputDocument getSolrDocument() {
@@ -147 +152 @@
         return id;
     }
+
+        public void setProfileId(String profileId) {
+                this.profileId = profileId;
+                
+        }
+        
+        public String getProfileId() {
+                return profileId;               
+        }
+
+        public String getProfileName() {
+                return profileName;
+        }
+
+        public void setProfileName(String profileName) {
+                this.profileName = profileName;
+        }
+        
+        
 }

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

@@ -46 +46 @@
 
         VTDNav nav = vg.getNav();
-        FacetMapping facetMapping = getFacetMapping(nav.cloneNav());
+        String profileId = extractXsd(nav.cloneNav());
+        cmdiData.setProfileId(profileId);
+        FacetMapping facetMapping = getFacetMapping(profileId);
 
         if (facetMapping.getFacets().isEmpty()) {
@@ -52 +54 @@
         }
 
+        List<String> profileName = (postProcessors.get(FacetConstants.FIELD_CLARIN_PROFILE)).process(profileId);
+        cmdiData.setProfileName(profileName.get(0));
         nav.toElement(VTDNav.ROOT);
         processResources(cmdiData, nav);
@@ -74 +78 @@
      * @throws VTDException
      */
-    private FacetMapping getFacetMapping(VTDNav nav) throws VTDException {
-        String profileId = extractXsd(nav);
+    private FacetMapping getFacetMapping(String profileId) throws VTDException {
         if (profileId == null) {
             throw new RuntimeException("Cannot get xsd schema so cannot get a proper mapping. Parse failed!");

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -433 +433 @@
         addResourceData(solrDocument, cmdiData);
         
+        
+        //Add profileId & profileName
+        solrDocument.addField("profileName", cmdiData.getProfileName());
+        solrDocument.addField("profileId", cmdiData.getProfileId());
+        
+        
+        //Add missing facets with "null" val
+        for(String facet: config.getFacetFields()){
+                if(!solrDocument.getFieldNames().contains(facet))
+                        solrDocument.addField(facet, "null");
+        }
+        
+        
         LOG.debug("Adding document for submission to SOLR: {}", file);
         docs.add(solrDocument);