Changeset 4625

Timestamp:

03/06/14 09:37:16 (10 years ago)

Author:

Twan Goosen

Message:

added title and landing page link to record page

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• components/SearchResultItemPanel.java (modified) (2 diffs)
• components/SolrFieldLabel.java (added)
• pages/RecordPage.html (modified) (1 diff)
• pages/RecordPage.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.java

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.pojo.ResourceTypeCount;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
-import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import java.util.Locale;
 import org.apache.solr.common.SolrDocument;
@@ -76 +74 @@
         // not passed to super
         selectionModel.detach();
-    }
-
-    /**
-     * Label that shows the content of a Solr field by its string value (using
-     * {@link SolrFieldStringModel})
-     */
-    private static class SolrFieldLabel extends Label {
-
-        public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName) {
-            super(id, new SolrFieldStringModel(documentModel, fieldName));
-        }
-
-        public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName, String nullFallback) {
-            super(id,
-                    new NullFallbackModel(
-                            new SolrFieldStringModel(documentModel, fieldName), nullFallback));
-        }
-
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.html

@@ -76 +76 @@
                     | <a href="">next &gt;</a><br />
                 </div>
-                <h1 id="recordtitle">&quot;Chinese Democratie en de Transformatie&quot;</h1>
+                <h1 wicket:id="name" id="recordtitle">[TITLE]</h1>
                 <div id="recorddetails">
-                    <a id="recordlandingpage" href="http://dspace.library.uu.nl/handle/1874/235456">Show this record in its original context</a>
+                    <a wicket:id="landingPageLink" id="recordlandingpage">Show this record in its original context</a>
                     <table class="recorddetailstable">
                         <tbody class="attributesTbody">

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
+import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.ExternalLink;
 import org.apache.wicket.model.IModel;
 
@@ -28 +32 @@
 public class RecordPage extends WebPage {
 
-    private final IModel<SolrDocument> documentModel;
+//    private final IModel<SolrDocument> documentModel;
     private final IModel<QueryFacetsSelection> contextModel;
 
     public RecordPage(IModel<SolrDocument> documentModel, IModel<QueryFacetsSelection> contextModel) {
         super(documentModel);
-        this.documentModel = documentModel;
+//        this.documentModel = documentModel;
         this.contextModel = contextModel;
+
+        add(new SolrFieldLabel("name", documentModel, FacetConstants.FIELD_NAME, "Unnamed record"));
+        add(createLandingPageLink("landingPageLink", documentModel));
+    }
+
+    private ExternalLink createLandingPageLink(String id, IModel<SolrDocument> documentModel) {
+        final SolrFieldStringModel landingPageHrefModel = new SolrFieldStringModel(documentModel, FacetConstants.FIELD_LANDINGPAGE);
+        // add landing page link
+        final ExternalLink landingPageLink = new ExternalLink(id, landingPageHrefModel) {
+
+            @Override
+            protected void onConfigure() {
+                super.onConfigure();
+                setVisible(landingPageHrefModel.getObject() != null);
+            }
+
+        };
+        return landingPageLink;
     }