Changeset 6313

Timestamp:

06/19/15 14:39:10 (9 years ago)

Author:

Twan Goosen

Message:

renamed languageName facet to _languageName (as it is not directly visible to user) and defined a query alias 'language'
refs #770

Location:

vlo/trunk

Files:

• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java (modified) (2 diffs)
• vlo-commons/src/main/resources/facetConcepts.xml (modified) (1 diff)
• 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-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

@@ -16 +16 @@
     public static final String FIELD_LICENSE = "license";
     public static final String FIELD_LANGUAGE_CODE = "languageCode";
-    public static final String FIELD_LANGUAGE_NAME = "languageName";
     public static final String FIELD_TEMPORAL_COVERAGE = "temporalCoverage";
     public static final String FIELD_GENRE = "genre";
@@ -48 +47 @@
     public static final String FIELD_HAS_PART = "_hasPart";
     public static final String FIELD_HAS_PART_COUNT = "_hasPartCount";
+    public static final String FIELD_LANGUAGE_NAME = "_languageName";
 
     /**

vlo/trunk/vlo-commons/src/main/resources/facetConcepts.xml

@@ -211 +211 @@
                 <blacklistPattern>/c:CMD/c:Components/c:MultimodalCorpus/c:DocumentationLanguages</blacklistPattern>
                 <!-- IMS c:MultimodalCorpus -->
-                <derivedFacet>languageName</derivedFacet>
+                <derivedFacet>_languageName</derivedFacet>
         </facetConcept>
         <facetConcept name="availability" description="The usage conditions for the resource or tool" definition="A rough description of the conditions under which the resource or tool can be used.">

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

@@ -421 +421 @@
    <field name="country" type="string" indexed="true" stored="true" multiValued="true"/>
    <field name="languageCode" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="languageName" type="string" indexed="true" stored="false" multiValued="true" />
    <field name="availability" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="license" type="string" indexed="true" stored="true" multiValued="true" />
@@ -453 +452 @@
    <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="_languageName" type="string" indexed="true" stored="false" multiValued="true" />
    <field name="metadataSource" type="metadataSource" indexed="false" stored="true" multiValued="true" />
    

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

@@ -373 +373 @@
         <!-- Query fields -->
         <str name="qf">
-            <!-- TODO: Add _languagename field for search purposes? -->
-           text name^8 description^4 keywords^2 languageName^2 country^2 organisation^2 subject^2 collection^1 modality^1 genre^1 continent^.5 id^.1
+           text name^8 description^4 keywords^2 language^2 country^2 organisation^2 subject^2 collection^1 modality^1 genre^1 continent^.5 id^.1
+        </str>
+        
+        <!-- alias: language = _languageName -->
+        <str name="f.language.qf">
+            _languageName
         </str>