Changeset 965

Timestamp:

12/08/10 09:25:59 (13 years ago)

Author:

paucas

Message:

added previous next functionality

Location:

vlo/trunk/vlo_webapp/src

Files:

• main/java/eu/clarin/cmdi/vlo/pages/PreviousNextPagingNavigator.html (added)
• main/java/eu/clarin/cmdi/vlo/pages/PreviousNextPagingNavigator.java (added)
• main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (5 diffs)
• main/resources/importerConfig.xml (modified) (1 diff)
• main/webapp/css/main.css (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/importer/CMDIDigesterTest.java (modified) (1 diff)

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

@@ -5 +5 @@
     <wicket:extend>
         <div class="endgame">
+            <br>
             <div><a wicket:id="backLink" href="#">back to results</a>&nbsp;|&nbsp;<a wicket:id="openBrowserLink" href="#">open in original context</a>
                 <p />
             </div>
-            <table wicket:id="attributesTable">
-            </table>
+            <br><br>
+            <div wicket:id="nav" class="nav"></div>
+            <div wicket:id="test" class="resulttable">[test]</div>
+            <div class="resultAttributes"><table wicket:id="attributesTable"/></div>
         </div>
     </wicket:extend>

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

@@ -5 +5 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
@@ -19 +18 @@
 import eu.clarin.cmdi.vlo.Configuration;
 import eu.clarin.cmdi.vlo.StringUtils;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import java.util.List;
+import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
 
 public class ShowResultPage extends BasePage {
 
     public static final String PARAM_DOC_ID = "docId";
+    SearchPageQuery query;
+    DataTable table;
+    DocumentAttributesDataProvider attributeProvider;
+    AjaxFallbackDefaultDataTable t;
 
     public ShowResultPage(final PageParameters parameters) {
         super(parameters);
         String docId = getPageParameters().getString(PARAM_DOC_ID, null);
-        SearchPageQuery query = new SearchPageQuery(parameters);
+        query = new SearchPageQuery(parameters);
         BookmarkablePageLink backLink = new BookmarkablePageLink("backLink", FacetedSearchPage.class, query.getPageParameters());
         add(backLink);
         String handle = docId.substring("test-".length());
         add(new ExternalLink("openBrowserLink", Configuration.getInstance().getIMDIBrowserUrl(handle)));
-        addAttributesTable(docId);
+        addSearchResults(docId);
+        addAttributesTable(docId, query);
     }
 
-    private void addAttributesTable(final String docId) {
-        DataTable table = new DataTable("attributesTable", createAttributesColumns(), new DocumentAttributesDataProvider(docId), 25);
-        table.setTableBodyCss("attributesTbody");
-        table.addTopToolbar(new HeadersToolbar(table, null));
-        add(table);
+    private void addAttributesTable(final String docId, SearchPageQuery query) {
+        attributeProvider = new DocumentAttributesDataProvider(docId);
+        t = new AjaxFallbackDefaultDataTable("attributesTable", createAttributesColumns(), attributeProvider, 25);
+        t.setTableBodyCss("attributesTbody");
+        add(t);
     }
 
@@ -46 +57 @@
         IColumn[] columns = new IColumn[2];
 
-        columns[0] = new PropertyColumn(new Model<String>("Attribute"), "field") {
+        columns[0] = new PropertyColumn(new Model<String>("Field"), "field") {
+
             @Override
             public String getCssClass() {
                 return "attribute";
             }
-
         };
-        columns[1] = new AbstractColumn<DocumentAttribute>(new Model<String>("")) {
+        columns[1] = new AbstractColumn<DocumentAttribute>(new Model<String>("Value")) {
 
             @Override
@@ -60 +71 @@
                 DocumentAttribute attribute = rowModel.getObject();
                 cellItem.add(new MultiLineLabel(componentId, attribute.getValue()) {
+
                     @Override
                     protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
@@ -67 +79 @@
                 });
             }
-
         };
         return columns;
     }
 
+    @SuppressWarnings("serial")
+    private void addSearchResults(String docId) {
+        List<IColumn<SolrDocument>> columns = new ArrayList<IColumn<SolrDocument>>();
+        columns.add(new AbstractColumn<SolrDocument>(new Model<String>("Results")) {
+
+            @Override
+            public void populateItem(Item<ICellPopulator<SolrDocument>> cellItem, String componentId, IModel<SolrDocument> rowModel) {
+
+                cellItem.add(new DocumentLinkPanel(componentId, rowModel, query));
+            }
+        });
+        AjaxFallbackDefaultDataTable t = new AjaxFallbackDefaultDataTable("test", columns, new SolrDocumentDataProvider(query.getSolrQuery().getCopy()), 1);
+        add(t);
+        add(new PreviousNextPagingNavigator("nav", t, this, query));
+    }
+
+    public void setCurrentPage(int pagenumber) {
+        SolrDocumentDataProvider dataProvider = new SolrDocumentDataProvider(query.getSolrQuery().getCopy());
+        Iterator it = dataProvider.iterator(pagenumber, 1);
+        if (it.hasNext()) {
+            SolrDocument doc = (SolrDocument) it.next();
+            attributeProvider = new DocumentAttributesDataProvider(doc.getFieldValue("id").toString());
+            this.remove("attributesTable");
+            table = new DataTable("attributesTable", createAttributesColumns(), attributeProvider, 25);
+            table.setTableBodyCss("attributesTbody");
+            table.addTopToolbar(new HeadersToolbar(table, null));
+            add(table);
+        }
+    }
 }

vlo/trunk/vlo_webapp/src/main/resources/importerConfig.xml

@@ -151 +151 @@
         </entry>
         <entry key="language">
-          <value>CMD/Components/Session/MDGroup/Content/Content_Languages/Content_Language/Name</value>
+<!--          <value>CMD/Components/Session/MDGroup/Content/Content_Languages/Content_Language/Name</value>-->
+          <value>CMD/Components/Session/MDGroup/Content/Content_Languages/Content_Language/Id</value>
         </entry>
         <entry key="organisation">

vlo/trunk/vlo_webapp/src/main/webapp/css/main.css

@@ -46 +46 @@
     padding: 0;
 }
-.opening .facetbox {
-    font-size: 14px;
-}
-.middlegame .facetbox {
+.facetbox {
     font-size: 14px;
     padding: 2px 5px;
@@ -85 +82 @@
     color: #BCCEE8;
 }
-.resulttable{
+.headers{
+    background-color: #2E6B99;
+    color:#FFFFFF;
+}
+.resulttable tbody{
+    background-color:#BCCEE8;
+}
+.endgame .resulttable{
+    display:none;
+
+}
+.endgame div{
     margin-left: 11px;
+    border: none;
+    padding: 0;
 }
-.endgame{
-    margin-left: 11px;
+.resultAttributes{
+    margin: 0px;
+    padding: 0px;
+    border: none;
 }
 .endgame .attribute {
     font-weight: bold;
+    background-color: #BCCEE8;
+}
+.endgame .headers .attribute{
+    background-color: #2E6B99;    
 }
 .endgame .attributesTbody {
     vertical-align: top;
+    background-color:#d4deef;
 }
 .navigation .navigator {
     clear:both;
 }
-
-
-
 .anchorpanel{
     padding:5px;

vlo/trunk/vlo_webapp/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDigesterTest.java

@@ -375 +375 @@
         assertEquals("kleve-route", doc.getFieldValue("name"));
         assertEquals("Europe", doc.getFieldValue("continent"));
-        assertEquals("English", doc.getFieldValue("language"));
+        assertEquals("ISO639-3:eng", doc.getFieldValue("language"));
+//        assertEquals("English", doc.getFieldValue("language"));
         assertEquals("Netherlands", doc.getFieldValue("country"));
         assertEquals("Max Planck Institute for Psycholinguistics", doc.getFieldValue("organisation"));