Changeset 4622

Timestamp:

03/05/14 16:25:29 (10 years ago)

Author:

Twan Goosen

Message:

created stub for record page and links to it from search result items

Location:

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

Files:

• components/RecordPageLink.java (added)
• components/SearchResultItemPanel.html (modified) (1 diff)
• components/SearchResultItemPanel.java (modified) (5 diffs)
• components/SearchResultsPanel.java (modified) (2 diffs)
• pages/RecordPage.html (copied) (copied from vlo/branches/vlo-3.0/vlo-web-app/src/main/html/record1.html) (3 diffs)
• pages/RecordPage.java (added)

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

@@ -25 +25 @@
         <wicket:panel>
             <h2>
-                <a wicket:id="title" href="record1.html">[TITLE]</a>
+                <a wicket:id="recordLink" href="record1.html"><wicket:container wicket:id="title" >[TITLE]</wicket:container></a>
             </h2>
             <div class="searchresultitembrief">

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

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.wicket.provider.ResouceTypeCountDataProvider;
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.pojo.ResourceTypeCount;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
@@ -43 +44 @@
 public class SearchResultItemPanel extends Panel {
 
+    private final static ResourceTypeCountConverter resourceTypeCountConverter = new ResourceTypeCountConverter();
+
     @SpringBean
     private ResourceTypeCountingService countingService;
+    private final IModel<QueryFacetsSelection> selectionModel;
+    private final IModel<SolrDocument> documentModel;
 
-    public SearchResultItemPanel(String id, IModel<SolrDocument> model) {
-        super(id, model);
-        add(new SolrFieldLabel("title", model, FacetConstants.FIELD_NAME));
-        add(new SolrFieldLabel("description", model, FacetConstants.FIELD_DESCRIPTION, "<no description>"));
+    public SearchResultItemPanel(String id, IModel<SolrDocument> documentModel, IModel<QueryFacetsSelection> selectionModel) {
+        super(id, documentModel);
+        this.documentModel = documentModel;
+        this.selectionModel = selectionModel;
+
+        final Link recordLink = new RecordPageLink("recordLink", documentModel, selectionModel);
+        recordLink.add(new SolrFieldLabel("title", documentModel, FacetConstants.FIELD_NAME));
+        add(recordLink);
+
+        add(new SolrFieldLabel("description", documentModel, FacetConstants.FIELD_DESCRIPTION, "<no description>"));
 
         // get model for resources
-        final SolrFieldModel<String> resourcesModel = new SolrFieldModel<String>(model, FacetConstants.FIELD_RESOURCE);
+        final SolrFieldModel<String> resourcesModel = new SolrFieldModel<String>(documentModel, FacetConstants.FIELD_RESOURCE);
         // wrap with a count provider
         final ResouceTypeCountDataProvider countProvider = new ResouceTypeCountDataProvider(resourcesModel, countingService);
@@ -58 +69 @@
         // TODO: hide if no resources
         add(new ResourceCountDataView("resourceCount", countProvider));
+    }
+
+    @Override
+    public void detachModels() {
+        super.detachModels();
+        // not passed to super
+        selectionModel.detach();
     }
 
@@ -82 +100 @@
      * {@link ResourceTypeCount}
      */
-    private static class ResourceCountDataView extends DataView<ResourceTypeCount> {
-
-        private final static ResourceTypeCountConverter resourceTypeCountConverter
-                = new ResourceTypeCountConverter();
+    private class ResourceCountDataView extends DataView<ResourceTypeCount> {
 
         public ResourceCountDataView(String id, IDataProvider<ResourceTypeCount> dataProvider) {
@@ -93 +108 @@
         @Override
         protected void populateItem(Item<ResourceTypeCount> item) {
-            final Link resourceLink = new Link("recordLink") {
-
-                @Override
-                public void onClick() {
-                    throw new UnsupportedOperationException("Not supported yet.");
-                }
-            };
+            final Link resourceLink = new RecordPageLink("recordLink", documentModel, selectionModel);
             final Label label = new Label("resourceCountLabel", item.getModel()) {
 

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

@@ -53 +53 @@
     private final DataView<SolrDocument> resultsView;
 
-    public SearchResultsPanel(String id, IModel<QueryFacetsSelection> model) {
-        super(id, model);
-        solrDocumentProvider = new SolrDocumentProvider(documentService, model);
+    public SearchResultsPanel(String id, final IModel<QueryFacetsSelection> selectionModel) {
+        super(id, selectionModel);
+        solrDocumentProvider = new SolrDocumentProvider(documentService, selectionModel);
 
         // data view for search results
@@ -63 +63 @@
             protected void populateItem(Item<SolrDocument> item) {
                 // single result item
-                item.add(new SearchResultItemPanel("resultItemDetails", item.getModel()));
+                item.add(new SearchResultItemPanel("resultItemDetails", item.getModel(), selectionModel));
             }
         };

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

@@ -52 +52 @@
             <div id="topnavigation">
                 <div id="breadcrumbs">
-                    <a href="index.html">VLO</a>
-                    &gt; <a href="index2.html">Search results: democratie</a>
-                    &gt; <a href="index3.html">Language: Dutch </a>
-                    &gt; &quot;Chinese Democratie en de Transformatie&quot;
+                    <wicket:link>
+                        <a href="FacetedSearchPage.html">VLO</a>
+                    </wicket:link>
+                    &gt; <a href="FacetedSearchPage.html">Search results: TODO</a>
+
+                    <!--                    &gt; <a href="index3.html">Language: Dutch </a>
+                                        &gt; &quot;Chinese Democratie en de Transformatie&quot;-->
+
                 </div>
                 <div id="topnavigationlinks">
@@ -128 +132 @@
                     <a class="audioresource" href="http://corpus1.mpi.nl/qfs1/media-archive/dobes_data/Ache/Documentaci_n_-_Documentation/Comunidades_-_Communities/Cerro_Moroti/Media/002-djawu_klluu-2011-09-01.wav">002-djawu_klluu-2011-09-01.wav</a>
                     <a class="annotationresource" href="http://corpus1.mpi.nl/qfs1/media-archive/dobes_data/Ache/Documentaci_n_-_Documentation/Comunidades_-_Communities/Cerro_Moroti/Annotations/002-djawu_klluu-2011-09-01.eaf">002-djawu_klluu-2011-09-01.eaf</a>
-                    
+
                     <div class="recordresourcedetails">
                         <h2>Bachelorscriptie+Rene+Witteveen+3375005.docx</h2>
@@ -137 +141 @@
                         </ul>
                     </div>
-                    
+
                 </div>