Changeset 3377

Timestamp:

08/14/13 08:21:52 (11 years ago)

Author:

teckart

Message:

Fixed (sometimes) incomplete links in metadataSource facet (ticket #311), removed redundant code for the "language"-facet

File:

• vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (2 diffs)

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

@@ -182 +182 @@
                 DocumentAttribute attribute = rowModel.getObject();
 
-                if (attribute.getField().equals(FacetConstants.FIELD_LANGUAGE)) {
-                    cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) {
-
-                        @Override
-                        protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
-                            CharSequence body = StringUtils.toMultiLineHtml(getDefaultModelObjectAsString());
-                            replaceComponentTagBody(markupStream, openTag, getSmartLink(body));
-                        }
-                    });
-                } else if(attribute.getField().equals(FacetConstants.FIELD_LANGUAGES)) {
+                if(attribute.getField().equals(FacetConstants.FIELD_LANGUAGES)) {
                     cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) {
 
@@ -199 +190 @@
                             CharSequence body = getDefaultModelObjectAsString();
                             replaceComponentTagBody(markupStream, openTag, body);
+                        }
+                    });
+                } else if(attribute.getField().equals(FacetConstants.FIELD_COMPLETE_METADATA)) {
+                    cellItem.add(new SmartLinkMultiLineLabel(componentId, attribute.getValue()) {
+
+                        @Override
+                        protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
+                                setEscapeModelStrings(false);
+                            CharSequence body = getDefaultModelObjectAsString();
+                            replaceComponentTagBody(markupStream, openTag, "<a href=\""+body+"\">"+body+"</a>");
                         }
                     });