Changeset 967

Timestamp:

12/08/10 13:47:56 (13 years ago)

Author:

patdui

Message:

Fixed prev/next links. ​http://trac.clarin.eu/ticket/26
Not the best performance but acceptable.

Location:

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo

Files:

• dao/FacetConstants.java (added)
• dao/SearchResultsDao.java (modified) (1 diff)
• pages/AnchorPanel.java (modified) (1 diff)
• pages/DocumentLinkPanel.java (modified) (2 diffs)
• pages/FacetedSearchPage.java (modified) (1 diff)
• pages/PreviousNextPagingNavigator.html (deleted)
• pages/PreviousNextPagingNavigator.java (deleted)
• pages/SearchPageQuery.java (modified) (4 diffs)
• pages/ShowResultPage.html (modified) (1 diff)
• pages/ShowResultPage.java (modified) (3 diffs)

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/dao/SearchResultsDao.java

@@ -29 +29 @@
     }
 
+    public SolrDocumentList getDocIdList(SolrQuery query) {
+        query.setFields(FacetConstants.FIELD_ID);
+        query.setFacet(false);
+        query.setStart(0);
+        query.setRows(Integer.MAX_VALUE);
+        QueryResponse queryResponse = fireQuery(query);
+        return queryResponse.getResults();
+    }
+
 }

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

@@ -13 +13 @@
 class AnchorPanel extends Panel {
 
+    private static final long serialVersionUID = 1L;
+
     public AnchorPanel(String id, String value) {
         super(id);

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

@@ -2 +2 @@
 
 import org.apache.solr.common.SolrDocument;
-import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.protocol.http.WicketURLEncoder;
+
+import eu.clarin.cmdi.vlo.dao.FacetConstants;
 
 public class DocumentLinkPanel extends Panel {
@@ -16 +16 @@
         super(id, model);
         SolrDocument doc = model.getObject();
-        PageParameters pageParameters = query.getPageParameters();
-        pageParameters.put(ShowResultPage.PARAM_DOC_ID, WicketURLEncoder.QUERY_INSTANCE.encode(doc.getFieldValue("id").toString()));
-        BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>("docLink", ShowResultPage.class,
-                pageParameters);
+        BookmarkablePageLink<ShowResultPage> docLink = ShowResultPage.createBookMarkableLink("docLink", query, doc.getFieldValue(
+                FacetConstants.FIELD_ID).toString());
         add(docLink);
-        Object nameValue = doc.getFirstValue("name");
+        Object nameValue = doc.getFirstValue(FacetConstants.FIELD_NAME);
         String name = "<no name>";
         if (nameValue != null) {

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

@@ -97 +97 @@
         searchResultList = new AjaxFallbackDefaultDataTable("searchResults", columns, new SolrDocumentDataProvider(query.getSolrQuery()
                 .getCopy()), 10);
+        
         add(searchResultList);
     }

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

@@ -13 +13 @@
 
 import eu.clarin.cmdi.vlo.Configuration;
+import eu.clarin.cmdi.vlo.dao.FacetConstants;
 
 public class SearchPageQuery implements Serializable {
@@ -47 +48 @@
     }
 
-    //    public static String escapeQueryChars(String s) { //TODO PD copied from solr, removed whitespace escaping this fixes some of the issues I am having. Moet ik solr escapen en dan url escapen?
-    //        StringBuilder sb = new StringBuilder();
-    //        for (int i = 0; i < s.length(); i++) {
-    //          char c = s.charAt(i);
-    //          // These characters are part of the query syntax and must be escaped
-    //          if (c == '\\' || c == '+' || c == '-' || c == '!'  || c == '(' || c == ')' || c == ':'
-    //            || c == '^' || c == '[' || c == ']' || c == '\"' || c == '{' || c == '}' || c == '~'
-    //            || c == '*' || c == '?' || c == '|' || c == '&'  || c == ';'
-    //            ) {
-    //            sb.append('\\');
-    //          }
-    //          sb.append(c);
-    //        }
-    //        return sb.toString();
-    //      }
-
     private String escapeSolrQuery(String value) {
         String result = null;
@@ -85 +70 @@
         result.setRows(10);
         result.setStart(0);
-        result.setFields("name", "id");
+        result.setFields(FacetConstants.FIELD_NAME, FacetConstants.FIELD_ID);
         result.setFacet(true);
         result.setFacetMinCount(1);
@@ -92 +77 @@
     }
 
-    public SolrQuery getSolrQuery() { //TODO fix tests and check incoming parameter decoding in solr_server I think I sent it properly
+    public SolrQuery getSolrQuery() {
         return query;
     }

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

@@ -10 +10 @@
             </div>
             <br><br>
-            <div wicket:id="nav" class="nav"></div>
-            <div wicket:id="test" class="resulttable">[test]</div>
+            <div class="prevNextLabels">
+                <a wicket:id="prev">prev</a>
+                <a wicket:id="next">next</a>
+            </div>
             <div class="resultAttributes"><table wicket:id="attributesTable"/></div>
         </div>

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 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;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.basic.MultiLineLabel;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -15 +19 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.protocol.http.WicketURLEncoder;
 
 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;
+import eu.clarin.cmdi.vlo.dao.DaoLocator;
+import eu.clarin.cmdi.vlo.dao.FacetConstants;
 
 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);
-        query = new SearchPageQuery(parameters);
+        SearchPageQuery 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)));
-        addSearchResults(docId);
+        addPrevNextLabels(docId, query);
         addAttributesTable(docId, query);
     }
 
     private void addAttributesTable(final String docId, SearchPageQuery query) {
-        attributeProvider = new DocumentAttributesDataProvider(docId);
-        t = new AjaxFallbackDefaultDataTable("attributesTable", createAttributesColumns(), attributeProvider, 25);
-        t.setTableBodyCss("attributesTbody");
-        add(t);
+        DocumentAttributesDataProvider attributeProvider = new DocumentAttributesDataProvider(docId);
+        DataTable table = new DataTable("attributesTable", createAttributesColumns(), attributeProvider, 250);
+        table.setTableBodyCss("attributesTbody");
+        table.addTopToolbar(new HeadersToolbar(table, null));
+        add(table);
     }
 
@@ -83 +80 @@
     }
 
-    @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));
+    private void addPrevNextLabels(String docId, SearchPageQuery query) {
+        int index = -1;
+        SolrDocumentList docIdList = DaoLocator.getSearchResultsDao().getDocIdList(query.getSolrQuery().getCopy());
+        for (int i = 0; i < docIdList.size(); i++) {
+            SolrDocument doc = docIdList.get(i);
+            if (doc.getFieldValue(FacetConstants.FIELD_ID).equals(docId)) {
+                index = i;
+                break;
             }
-        });
-        AjaxFallbackDefaultDataTable t = new AjaxFallbackDefaultDataTable("test", columns, new SolrDocumentDataProvider(query.getSolrQuery().getCopy()), 1);
-        add(t);
-        add(new PreviousNextPagingNavigator("nav", t, this, query));
+        }
+        if (index > 0) {
+            String prevDocId = docIdList.get(index - 1).getFieldValue(FacetConstants.FIELD_ID).toString();
+            BookmarkablePageLink<ShowResultPage> prev = createBookMarkableLink("prev", query, prevDocId);
+            add(prev);
+        } else {
+            add(new Label("prev", "prev"));
+        }
+        if (index < (docIdList.size() - 1) && index >= 0) {
+            String prevDocId = docIdList.get(index + 1).getFieldValue(FacetConstants.FIELD_ID).toString();
+            BookmarkablePageLink<ShowResultPage> next = createBookMarkableLink("next", query, prevDocId);
+            add(next);
+        } else {
+            add(new Label("next", "next"));
+        }
     }
 
-    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);
-        }
+    public static BookmarkablePageLink<ShowResultPage> createBookMarkableLink(String linkId, SearchPageQuery query, String docId) {
+        PageParameters pageParameters = query.getPageParameters();
+        pageParameters.put(ShowResultPage.PARAM_DOC_ID, WicketURLEncoder.QUERY_INSTANCE.encode(docId));
+        BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>(linkId, ShowResultPage.class,
+                pageParameters);
+        return docLink;
     }
 }