Changeset 6287

Timestamp:

06/12/15 07:35:11 (9 years ago)

Author:

Twan Goosen

Message:

Added fields with part count and resource count for further ranking
Refs #750

Location:

vlo/trunk

Files:

• vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CountryNamePostProcessor.java (modified) (3 diffs)
• vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (2 diffs)
• vlo-solr/src/main/solr_conf/solr/collection1/conf/schema.xml (modified) (2 diffs)
• vlo-solr/src/main/solr_conf/solr/collection1/conf/solrconfig.xml (modified) (1 diff)

vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CountryNamePostProcessor.java

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.CommonUtils;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15 +16 @@
 
     /**
-     * Returns the country name based on the mapping defined in the CMDI component:
-     * http://catalog.clarin.eu/ds/ComponentRegistry/?item=clarin.eu:cr1:c_1271859438104 If no mapping is found the original value is
-     * returned.
+     * Returns the country name based on the mapping defined in the CMDI
+     * component:
+     * http://catalog.clarin.eu/ds/ComponentRegistry/?item=clarin.eu:cr1:c_1271859438104
+     * If no mapping is found the original value is returned.
+     *
      * @param value extracted "country" value from CMDI file
      * @return List of country names
@@ -48 +51 @@
             return result;
         } catch (Exception e) {
-            throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            if (CommonUtils.SWALLOW_LOOKUP_ERRORS) {
+                return new HashMap<String, String>();
+            } else {
+                throw new RuntimeException("Cannot instantiate postProcessor:", e);
+            }
         }
     }

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

@@ -418 +418 @@
                     + resource.getResourceName());
         }
+        solrDocument.addField(FacetConstants.FIELD_RESOURCE_COUNT, resources.size());
     }
 
@@ -481 +482 @@
                     partialUpdate.put("set", incomingVertexNames);
                     doc.setField(FacetConstants.FIELD_HAS_PART, partialUpdate);
+                    doc.setField(FacetConstants.FIELD_HAS_PART_COUNT, incomingVertexNames.size());
                 }
                 

vlo/trunk/vlo-solr/src/main/solr_conf/solr/collection1/conf/schema.xml

@@ -442 +442 @@
    <field name="_fileName" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="_resourceRef" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="_resourceRefCount" type="int" indexed="true" stored="true" multiValued="false" />
    <field name="_componentProfile" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="_contentSearchRef" type="string" indexed="true" stored="true" multiValued="true" />
@@ -449 +450 @@
    <field name="_isPartOf" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="_hasPart" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="_hasPartCount" type="int" indexed="true" stored="true" multiValued="false" />
    <field name="_hierarchyWeight" type="int" indexed="true" stored="true" multiValued="false" default='0'/>
    <field name="metadataSource" type="metadataSource" indexed="false" stored="true" multiValued="true" />

vlo/trunk/vlo-solr/src/main/solr_conf/solr/collection1/conf/solrconfig.xml

@@ -384 +384 @@
         <!-- Boost fields (boost based on field value regardless of query) -->
         <str name="bf">
-            <!-- boost by hierarchy weight (reverse order because lower numbers indicate a higher level -->
-            rord(_hierarchyWeight)
-           <!-- TODO: use bf to boost records with one or more resources? -->
+            <!-- 
+                boost by hierarchy weight (reverse order because lower numbers
+                indicate a higher level), then by number of parts, then by
+                number of resources -->
+            rord(_hierarchyWeight) log(add(1,_hasPartCount))^.1 <!-- todo: deal with -infinity -->
+            <!-- TODO: prefer CLARIN records over non-CLARIN? -->
+            <!-- TODO: boost records with one or more resources (_resourceRefCount) -->
         </str>