Changeset 3602

Timestamp:

09/20/13 17:02:19 (11 years ago)

Author:

sanmai

Message:

Fixes #343

Location:

vlo/trunk

Files:

• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/Resources.java (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.properties (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html (modified) (1 diff)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (1 diff)

vlo/trunk/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/Resources.java

@@ -23 +23 @@
     public static final String FIELD = "field";
     public static final String NO_RESOURCE_FOUND = "noResourceFound";
+    public static final String RESOURCE = "resource";
+    public static final String RESOURCE_PL = "resource.PL";
     public static final String VALUE = "value";
     public static final String RESULTS = "results";

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloWebApplication.properties

@@ -9 +9 @@
 name=name
 next=>
-noResourceFound=No Resources found
+noResourceFound=No resource found.
 openInOriginalContext=open in original context
 originalContextNotAvailable=no original context available
 prev=<
 quickNavTo=Quick navigation to
-resources=Resources
+resource=Resource
+resource.PL=Resources
 results=Results
 resultNotFound=Result could not be found

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html

@@ -46 +46 @@
                 </ul>
             </div>
-            <div class="resourceList"><span><wicket:message key="resources">[Resources]</wicket:message>:</span>
+            <div class="resourceList">
+                <!--<span><wicket:message key="resources">[Resources]</wicket:message>:</span>-->
                 <ul class="resultItem" >
                     <li wicket:id="resourceList"></li>

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -372 +372 @@
         RepeatingView repeatingView = new RepeatingView("resourceList");
         add(repeatingView);
-        if (solrDocument.containsKey(FacetConstants.FIELD_RESOURCE)) {
+        if (solrDocument.containsKey(FacetConstants.FIELD_RESOURCE)) {     
             Collection<Object> resources = solrDocument.getFieldValues(FacetConstants.FIELD_RESOURCE);
+            if (resources.size() > 1) {
+                repeatingView.add(new Label(repeatingView.newChildId(), new ResourceModel(Resources.RESOURCE_PL)));
+            } else {
+                repeatingView.add(new Label(repeatingView.newChildId(), new ResourceModel(Resources.RESOURCE)));
+            }
             for (Object resource : resources) {
                 String[] split = resource.toString().split(Pattern.quote(FacetConstants.FIELD_RESOURCE_SPLIT_CHAR), 2);