Changeset 6088


Ignore:
Timestamp:
03/09/15 14:24:38 (9 years ago)
Author:
Twan Goosen
Message:

Merged fix of #739 and #740 from trunk to 3.1 branch

Location:
vlo/branches/vlo-3.1
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.1

  • vlo/branches/vlo-3.1/CHANGES

    r6056 r6088  
    22
    33VLO 3.1 (???)
    4 * Upgraded a number of dependencies including Solr, Wicket and Spring to a more recent version
    5         <https://trac.clarin.eu/ticket/541>
     4* Added the 'license' facet
     5        <https://trac.clarin.eu/ticket/393>
     6        <https://trac.clarin.eu/ticket/740>
    67* More fields get indexed for the autocomplete/suggestion function in the search box
    78        <https://trac.clarin.eu/ticket/624>
    … …  
    2223        * Content language is stored for descriptions
    2324                <https://trac.clarin.eu/ticket/667>
     25* Upgraded a number of dependencies including Solr, Wicket and Spring to a more recent version
     26        <https://trac.clarin.eu/ticket/541>
     27* VLO importer logs to separate log directory
     28        <https://trac.clarin.eu/ticket/741>
    2429* A number of changes in VloConfig.xml; see UPGRADE instructions for details
    2530

  • vlo/branches/vlo-3.1/vlo-commons/src/main/resources/VloConfig.xml

    r6029 r6088  
    8080        <facetField>format</facetField>
    8181        <facetField>organisation</facetField>
     82        <facetField>license</facetField>
    8283        <facetField>nationalProject</facetField>
    8384        <facetField>keywords</facetField>

  • vlo/branches/vlo-3.1/vlo-commons/src/main/resources/facetConcepts.xml

    r6029 r6088  
    229229                <concept>http://www.isocat.org/datcat/DC-2979</concept>
    230230                <concept>http://hdl.handle.net/11459/CCR_C-2979_8030473e-bbcb-6b87-3fd2-90554429ec50</concept>
    231                 <concept>http://purl.org/dc/terms/publisher</concept>
    232                 <concept>http://purl.org/dc/elements/1.1/publisher</concept>
    233231                <concept>http://www.isocat.org/datcat/DC-6134</concept>
    234232                <concept>http://hdl.handle.net/11459/CCR_C-6134_72c22724-2615-fd70-2eff-8cd3cb59e91d</concept>
    … …  
    435433                <pattern>/c:CMD/c:Components//text()</pattern>
    436434        </facetConcept>
    437         <facetConcept name="_componentProfile">
     435        <facetConcept name="_componentProfile" allowMultipleValues="false">
    438436                <pattern>/c:CMD/c:Header/c:MdProfile/text()</pattern>
    439437        </facetConcept>

  • vlo/branches/vlo-3.1/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

    r6029 r6088  
    641641                "format",
    642642                "organisation",
     643                "license",
    643644                "nationalProject",
    644645                "keywords",

  • vlo/branches/vlo-3.1/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java

    r5222 r6088  
    5656        assertEquals("http://localhost:8080/vlo-solr/core0/", config.getSolrUrl());
    5757        assertEquals(2, config.getDataRoots().size());
    58         assertEquals(13, config.getFacetFields().size());
     58        assertEquals(14, config.getFacetFields().size());
    5959    }
    6060

  • vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSolrSpringConfig.java

    r6029 r6088  
    103103            FacetConstants.FIELD_SUBJECT,
    104104            FacetConstants.FIELD_ORGANISATION,
     105            FacetConstants.FIELD_LICENSE,
    105106            FacetConstants.FIELD_KEYWORDS,
    106107            FacetConstants.FIELD_NATIONAL_PROJECT,
Note: See TracChangeset for help on using the changeset viewer.