Changeset 2841


Ignore:
Timestamp:
04/26/13 12:49:41 (11 years ago)
Author:
teckart
Message:

Re-enabled tag facet

Location:
vlo/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

    r2834 r2841  
    2525    public static final String FIELD_COMPLETE_METADATA = "metadataSource";
    2626    public static final String FIELD_NATIONAL_PROJECT = "nationalProject";
    27     // public static final String FIELD_TAG = "tag";
     27    public static final String FIELD_TAG = "tag";
    2828   
    2929    //The _ facets are not meant to be shown to users.

  • vlo/trunk/vlo_importer/src/main/resources/VloConfig.xml

    r2834 r2841  
    5353    <nationalProjectMapping>/nationalProjectsMapping.xml</nationalProjectMapping>
    5454   
    55     <facetFields length="10">
     55    <facetFields length="11">
    5656        <facetField>collection</facetField>
    5757        <facetField>language</facetField>
    … …  
    6464        <facetField>dataProvider</facetField>
    6565        <facetField>nationalProject</facetField>
     66        <facetField>tag</facetField>
    6667    </facetFields>
    6768   

  • vlo/trunk/vlo_importer/src/main/resources/facetConcepts.xml

    r2834 r2841  
    8181    <pattern>/c:CMD/c:Header/c:MdProfile/text()</pattern>
    8282  </facetConcept>
    83 <!--  <facetConcept name="tag">
     83  <facetConcept name="tag">
    8484        <concept>http://www.isocat.org/datcat/DC-5436</concept>
    8585        <concept>http://www.isocat.org/rest/dc/5436</concept>  not an official ISOcat PID - added to support LrtInventoryResource, should be removed in the future
    86   </facetConcept>-->
     86  </facetConcept>
    8787</facetConcepts>

  • vlo/trunk/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigTest.java

    r2834 r2841  
    595595        "resourceType",
    596596        "dataProvider",
    597         "nationalProject"};
     597        "nationalProject",
     598        "tag"};
    598599   
    599600        String[] result = VloConfig.getFacetFields();

  • vlo/trunk/vlo_importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java

    r2834 r2841  
    166166                .getFacetMapping("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/clarin.eu:cr1:p_1289827960126/xsd");
    167167        List<FacetConfiguration> facets = facetMapping.getFacets();
    168         assertEquals(15, facets.size());
     168        assertEquals(16, facets.size());
    169169        int index = 0;
    170170        FacetConfiguration mapping = facets.get(index++);
    … …  
    229229        assertEquals("/c:CMD/c:Header/c:MdProfile/text()", mapping.getPatterns().get(0));
    230230        assertEquals(1, mapping.getPatterns().size());
    231 //        mapping = facets.get(index++);
    232 //        assertEquals(FacetConstants.FIELD_TAG, mapping.getName());
    233 //        assertEquals(1, mapping.getPatterns().size());
    234 //        assertEquals("/c:CMD/c:Components/c:LrtInventoryResource/c:tags/c:tag/text()", mapping.getPatterns().get(0));
     231        mapping = facets.get(index++);
     232        assertEquals(FacetConstants.FIELD_TAG, mapping.getName());
     233        assertEquals(1, mapping.getPatterns().size());
     234        assertEquals("/c:CMD/c:Components/c:LrtInventoryResource/c:tags/c:tag/text()", mapping.getPatterns().get(0));
    235235        assertEquals("check to see we tested them all", facets.size(), index);
    236236    }

  • vlo/trunk/vlo_solr/src/main/solr_conf/solr/conf/schema.xml

    r2833 r2841  
    427427   <field name="dataProvider" type="string" indexed="true" stored="true" multiValued="false" />
    428428   <field name="nationalProject" type="string" indexed="true" stored="true" multiValued="true" />
    429    // <field name="tag" type="string" indexed="true" stored="true" multiValued="true"/>
     429   <field name="tag" type="string" indexed="true" stored="true" multiValued="true"/>
    430430   <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
    431431

  • vlo/trunk/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/SearchPageQueryTest.java

    r2768 r2841  
    2929        assertEquals("*:*", q.getSolrQuery().getQuery());
    3030        assertEquals("name,id,description", q.getSolrQuery().getFields());
    31         assertEquals(10, q.getSolrQuery().getFacetFields().length);
     31        assertEquals(11, q.getSolrQuery().getFacetFields().length);
    3232        assertEquals("collection", q.getSolrQuery().getFacetFields()[0]);
    3333        assertEquals("continent", q.getSolrQuery().getFacetFields()[2]);
    … …  
    4141        assertEquals("test", q.getSolrQuery().getQuery());
    4242        assertEquals("name,id,description", q.getSolrQuery().getFields());
    43         assertEquals(10, q.getSolrQuery().getFacetFields().length);
     43        assertEquals(11, q.getSolrQuery().getFacetFields().length);
    4444        assertEquals("collection", q.getSolrQuery().getFacetFields()[0]);
    4545        assertEquals("continent", q.getSolrQuery().getFacetFields()[2]);
Note: See TracChangeset for help on using the changeset viewer.