Changeset 5094


Ignore:
Timestamp:
04/29/14 14:14:34 (10 years ago)
Author:
Twan Goosen
Message:

Merged fix for #542 from trunk to 3.0 branch

Location:
vlo/branches/vlo-3.0
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.0

  • vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

    r5025 r5094  
    2828
    2929    //The _ facets are not meant to be shown to users.
     30    public static final String FIELD_SELF_LINK = "_selfLink";
    3031    public static final String FIELD_FILENAME = "_fileName";
    3132    public static final String FIELD_RESOURCE = "_resourceRef";

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

    r5068 r5094  
    114114    <technicalFields>
    115115        <technicalField>id</technicalField>
     116        <technicalField>_selfLink</technicalField>
    116117        <technicalField>dataProvider</technicalField>
    117118        <technicalField>metadataSource</technicalField>

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

    r4906 r5094  
    33  <facetConcept name="id" allowMultipleValues="false">
    44    <concept>http://www.isocat.org/datcat/DC-2573</concept>
     5    <pattern>/c:CMD/c:Header/c:MdSelfLink/text()</pattern>
     6  </facetConcept>
     7  <facetConcept name="_selfLink" allowMultipleValues="false">
    58    <pattern>/c:CMD/c:Header/c:MdSelfLink/text()</pattern>
    69  </facetConcept>

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

    r5068 r5094  
    981981    public void testGetTechnicalFields() {
    982982        Set<String> result = config.getTechnicalFields();
    983         assertEquals(8, result.size());
     983        assertEquals(9, result.size());
    984984    }
    985985

  • vlo/branches/vlo-3.0/vlo-importer

    • Property svn:ignore

      •  

        old new  
        1 target
        2 .settings
         1nb-configuration.xml
        32.classpath
        43.project
         4target
         5vlo-importer.log*
        56nbactions-local config.xml
        6 vlo-importer.log*
         7.settings

  • vlo/branches/vlo-3.0/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java

    r4984 r5094  
    66import java.util.Collection;
    77import java.util.Collections;
    8 import java.util.Iterator;
    98import java.util.List;
    109import org.apache.solr.common.SolrInputDocument;
    1110import static org.junit.Assert.assertEquals;
    1211import static org.junit.Assert.assertNotNull;
     12import static org.junit.Assert.assertNull;
    1313import static org.junit.Assert.assertTrue;
    1414import org.junit.Test;
    … …  
    390390        SolrInputDocument doc = data.getSolrDocument();
    391391        assertNotNull(doc);
    392         assertEquals(14, doc.getFieldNames().size());
     392        assertEquals(15, doc.getFieldNames().size());
     393        assertEquals("test-hdl:1839/00-0000-0000-0009-294C-9", doc.getFieldValue("_selfLink"));
    393394        assertEquals("kleve-route", doc.getFieldValue("name"));
    394395        assertEquals("Peter Wittenburg", doc.getFieldValue(FacetConstants.FIELD_PROJECT_NAME));
    … …  
    513514        CMDIDataProcessor processor = getDataParser();
    514515        CMDIData data = processor.process(cmdiFile);
    515         assertEquals("test-hdl_58_1839_47_00-0000-0000-0009-294C-9", data.getId());
     516        assertEquals("test-hdl_58_1839_47_00-0000-0000-0009-294C-9", data.getId()); //modified handle -> 'clean' id
    516517        List<Resource> resources = data.getMetadataResources();
    517518        assertEquals(0, resources.size());
    518519        SolrInputDocument doc = data.getSolrDocument();
    519520        assertNotNull(doc);
    520         assertEquals(8, doc.getFieldNames().size());
     521        assertEquals(9, doc.getFieldNames().size());
     522        assertEquals("test-hdl:1839/00-0000-0000-0009-294C-9", doc.getFieldValue("_selfLink")); //unmodified handle
    521523        assertEquals("kleve-route", doc.getFieldValue("name"));
    522524        assertEquals("Europe", doc.getFieldValue("continent"));
    … …  
    591593        SolrInputDocument doc = data.getSolrDocument();
    592594        assertNotNull(doc);
    593         assertEquals(9, doc.getFieldNames().size());
     595        assertEquals(10, doc.getFieldNames().size());
     596        assertEquals("oai:ailla.utexas.edu:1", doc.getFieldValue("_selfLink"));
    594597        assertEquals(null, doc.getFieldValue("name"));
    595598        assertEquals(null, doc.getFieldValue("continent"));
    … …  
    645648        CMDIData data = processor.process(cmdiFile);
    646649        SolrInputDocument doc = data.getSolrDocument();
     650        assertNull(doc.getFieldValue("_selfLink"));
    647651        assertEquals(3, doc.getFieldValues(FacetConstants.FIELD_SUBJECT).size());
    648652        assertTrue(doc.getFieldValues(FacetConstants.FIELD_SUBJECT).contains("kuna"));
    … …  
    834838        CMDIData data = processor.process(cmdiFile);
    835839        assertEquals("collection_ATILF_Resources.cmdi", data.getId());
     840        assertEquals("collection_ATILF_Resources.cmdi", data.getSolrDocument().getFieldValue("_selfLink"));
    836841        List<Resource> resources = data.getMetadataResources();
    837842        assertEquals(9, resources.size());
    … …  
    897902        SolrInputDocument doc = data.getSolrDocument();
    898903        assertNotNull(doc);
    899         assertEquals(9, doc.getFieldNames().size());
     904        assertEquals(10, doc.getFieldNames().size());
     905        assertEquals("clarin.eu:lrt:433", doc.getFieldValue("_selfLink"));
    900906        assertEquals("Corpus of Present-day Written Estonian", doc.getFieldValue("name"));
    901907        assertEquals(null, doc.getFieldValue("continent"));

  • vlo/branches/vlo-3.0/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java

    r4984 r5094  
    3535       
    3636        List<FacetConfiguration> facets = facetMapping.getFacets();
    37         assertEquals(20, facets.size());
     37        assertEquals(21, facets.size());
    3838       
    3939        int index = 0;
    … …  
    4141       
    4242        assertEquals(FacetConstants.FIELD_ID, mapping.getName());
     43        assertEquals(1, mapping.getPatterns().size());
     44        assertEquals("/c:CMD/c:Header/c:MdSelfLink/text()",
     45                mapping.getPatterns().get(0));
     46        mapping = facets.get(index++);
     47       
     48        assertEquals(FacetConstants.FIELD_SELF_LINK, mapping.getName());
    4349        assertEquals(1, mapping.getPatterns().size());
    4450        assertEquals("/c:CMD/c:Header/c:MdSelfLink/text()",
    … …  
    176182       
    177183        List<FacetConfiguration> facets = facetMapping.getFacets();
    178         assertEquals(18, facets.size());
     184        assertEquals(19, facets.size());
    179185       
    180186        int index = 0;
    … …  
    182188       
    183189        assertEquals(FacetConstants.FIELD_ID, mapping.getName());
     190        assertEquals(1, mapping.getPatterns().size());
     191        assertEquals("/c:CMD/c:Header/c:MdSelfLink/text()",
     192                mapping.getPatterns().get(0));
     193        mapping = facets.get(index++);
     194       
     195        assertEquals(FacetConstants.FIELD_SELF_LINK, mapping.getName());
    184196        assertEquals(1, mapping.getPatterns().size());
    185197        assertEquals("/c:CMD/c:Header/c:MdSelfLink/text()",
    … …  
    296308
    297309        List<FacetConfiguration> facets = facetMapping.getFacets();
    298         assertEquals(17, facets.size());
     310        assertEquals(18, facets.size());
    299311       
    300312        int index = 0;
    … …  
    304316        assertEquals(1, mapping.getPatterns().size());
    305317       
     318        assertEquals("/c:CMD/c:Header/c:MdSelfLink/text()",
     319                mapping.getPatterns().get(0));
     320        mapping = facets.get(index++);
     321       
     322        assertEquals(FacetConstants.FIELD_SELF_LINK, mapping.getName());
     323        assertEquals(1, mapping.getPatterns().size());
    306324        assertEquals("/c:CMD/c:Header/c:MdSelfLink/text()",
    307325                mapping.getPatterns().get(0));
    … …  
    444462        List<FacetConfiguration> facets = facetMapping.getFacets();
    445463       
    446         FacetConfiguration facet = facets.get(4);
     464        FacetConfiguration facet = facets.get(5);
    447465        assertEquals(FacetConstants.FIELD_YEAR, facet.getName());
    448466        assertEquals(2, facet.getPatterns().size());
    … …  
    451469       
    452470       
    453         facet = facets.get(13);
     471        facet = facets.get(14);
    454472        assertEquals(FacetConstants.FIELD_DESCRIPTION, facet.getName());
    455473        assertEquals(1, facet.getPatterns().size());

  • vlo/branches/vlo-3.0/vlo-importer/src/test/resources/facetConceptsTest.xml

    r4984 r5094  
    33  <facetConcept name="id" allowMultipleValues="false">
    44    <concept>http://www.isocat.org/datcat/DC-2573</concept>
     5    <pattern>/c:CMD/c:Header/c:MdSelfLink/text()</pattern>
     6  </facetConcept>
     7  <facetConcept name="_selfLink" allowMultipleValues="false">
    58    <pattern>/c:CMD/c:Header/c:MdSelfLink/text()</pattern>
    69  </facetConcept>

  • vlo/branches/vlo-3.0/vlo-solr/src/main/solr_conf/solr/collection1/conf/schema.xml

    r4325 r5094  
    432432   <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
    433433
    434    
     434   <field name="_selfLink" type="string" indexed="true" stored="true" multiValued="false"/>
    435435   <field name="_fileName" type="string" indexed="true" stored="true" multiValued="false" />
    436436   <field name="_resourceRef" type="string" indexed="true" stored="true" multiValued="true" />

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

    r5046 r5094  
    227227            FacetConstants.FIELD_RESOURCE_CLASS,
    228228            FacetConstants.FIELD_RESOURCE,
     229            FacetConstants.FIELD_SELF_LINK,
    229230            FacetConstants.FIELD_ID,
    230231            FacetConstants.FIELD_DATA_PROVIDER,

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ContentSearchFormPanel.java

    r4902 r5094  
    6969
    7070    private IModel<String> createJsonModel(final IModel<SolrDocument> model, final IModel<String> endpointModel) {
    71         // Prepare a JSON object that holds the CQL endpoint and the document ID
     71        // Prepare a JSON object that holds the CQL endpoint and the document self link
    7272        return new AbstractReadOnlyModel<String>() {
    7373            @Override
    7474            public String getObject() {
    7575                final String endPoint = endpointModel.getObject();
    76                 final Object docId = model.getObject().getFirstValue(FacetConstants.FIELD_ID);
     76                final Object selfLink = model.getObject().getFirstValue(FacetConstants.FIELD_SELF_LINK);
    7777                try {
    7878                    final JSONObject json = new JSONObject();
    79                     json.put(endPoint, new JSONArray(new Object[]{docId}));
     79                    json.put(endPoint, new JSONArray(new Object[]{selfLink}));
    8080                    return json.toString(2);
    8181                } catch (JSONException ex) {
    82                     logger.warn("Could not create JSON for aggregation context with endpoint '{}' and docId '{}'", endPoint, docId, ex);
     82                    logger.warn("Could not create JSON for aggregation context with endpoint '{}' and docId '{}'", endPoint, selfLink, ex);
    8383                    return null;
    8484                }

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/fieldNames.properties

    r5026 r5094  
    3333
    3434#hidden/technical fields
     35field.metadataSource=Metadata source
    3536field._componentProfile=Profile name
    36 field.metadataSource=Metadata source
    3737field._landingPageRef=Landing page
    3838field._searchPageRef=Search page
     39field._contentSearchRef=Content search reference
    3940field._lastSeen=Last seen
     41field._selfLink=Self link
Note: See TracChangeset for help on using the changeset viewer.