Changeset 5093

Timestamp:

04/29/14 14:07:48 (10 years ago)

Author:

Twan Goosen

Message:

Sending document self link instead of docId to FCS aggregator. Fixes #542.
Also added "_selfLink" as a technical field.

Location:

vlo/trunk

Files:

• vlo-commons/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ContentSearchFormPanel.java (modified) (1 diff)
• vlo-web-app/src/main/resources/fieldNames.properties (modified) (1 diff)

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

@@ -114 +114 @@
     <technicalFields>
         <technicalField>id</technicalField>
+        <technicalField>_selfLink</technicalField>
         <technicalField>dataProvider</technicalField>
         <technicalField>metadataSource</technicalField>

vlo/trunk/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

@@ -981 +981 @@
     public void testGetTechnicalFields() {
         Set<String> result = config.getTechnicalFields();
-        assertEquals(8, result.size());
+        assertEquals(9, result.size());
     }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -227 +227 @@
             FacetConstants.FIELD_RESOURCE_CLASS,
             FacetConstants.FIELD_RESOURCE,
+            FacetConstants.FIELD_SELF_LINK,
             FacetConstants.FIELD_ID,
             FacetConstants.FIELD_DATA_PROVIDER,

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

@@ -69 +69 @@
 
     private IModel<String> createJsonModel(final IModel<SolrDocument> model, final IModel<String> endpointModel) {
-        // Prepare a JSON object that holds the CQL endpoint and the document ID
+        // Prepare a JSON object that holds the CQL endpoint and the document self link
         return new AbstractReadOnlyModel<String>() {
             @Override
             public String getObject() {
                 final String endPoint = endpointModel.getObject();
-                final Object docId = model.getObject().getFirstValue(FacetConstants.FIELD_ID);
+                final Object selfLink = model.getObject().getFirstValue(FacetConstants.FIELD_SELF_LINK);
                 try {
                     final JSONObject json = new JSONObject();
-                    json.put(endPoint, new JSONArray(new Object[]{docId}));
+                    json.put(endPoint, new JSONArray(new Object[]{selfLink}));
                     return json.toString(2);
                 } catch (JSONException ex) {
-                    logger.warn("Could not create JSON for aggregation context with endpoint '{}' and docId '{}'", endPoint, docId, ex);
+                    logger.warn("Could not create JSON for aggregation context with endpoint '{}' and docId '{}'", endPoint, selfLink, ex);
                     return null;
                 }

vlo/trunk/vlo-web-app/src/main/resources/fieldNames.properties

@@ -33 +33 @@
 
 #hidden/technical fields
+field.metadataSource=Metadata source
 field._componentProfile=Profile name
-field.metadataSource=Metadata source
 field._landingPageRef=Landing page
 field._searchPageRef=Search page
+field._contentSearchRef=Content search reference
 field._lastSeen=Last seen
+field._selfLink=Self link