[Yanel-commits] rev 51302 - public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search

[michi at wyona.com]

Author: michi
Date: 2010-07-15 11:21:02 +0200 (Thu, 15 Jul 2010)
New Revision: 51302

Modified:
   public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
Log:
only add pages if pagination is enabled

Modified: public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java	2010-07-15 08:53:26 UTC (rev 51301)
+++ public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java	2010-07-15 09:21:02 UTC (rev 51302)
@@ -154,24 +154,25 @@
                         log.debug("Last link page number = " + lastLink);
                     }
 
-
-                    sb.append("<y:pages max-entries-per-page=\"" + maxEntries + "\" max-page-links=\"" + maxLinks + "\">");
-                    if (currentPageNumber > 1) {
-                        sb.append("<y:previous>" + (currentPageNumber - 1) + "</y:previous>");
-                    }
-                    for (int pageNumber = firstLink; pageNumber < lastLink; pageNumber++) {
-                        if (pageNumber <= 0) continue;
-                        if (pageNumber > totalPages) break;
-                        sb.append("<y:page");
-                        if (pageNumber == currentPageNumber) {
-                            sb.append(" selected='true'");
+                    if (paginationEnabled) {
+                        sb.append("<y:pages max-entries-per-page=\"" + maxEntries + "\" max-page-links=\"" + maxLinks + "\">");
+                        if (currentPageNumber > 1) {
+                            sb.append("<y:previous>" + (currentPageNumber - 1) + "</y:previous>");
                         }
-                        sb.append(">" + pageNumber + "</y:page>");
+                        for (int pageNumber = firstLink; pageNumber < lastLink; pageNumber++) {
+                            if (pageNumber <= 0) continue;
+                            if (pageNumber > totalPages) break;
+                            sb.append("<y:page");
+                            if (pageNumber == currentPageNumber) {
+                                sb.append(" selected='true'");
+                            }
+                            sb.append(">" + pageNumber + "</y:page>");
+                        }
+                        if (currentPageNumber < totalPages) {
+                            sb.append("<y:next>" + (currentPageNumber + 1) + "</y:next>");
+                        }
+                        sb.append("</y:pages>");
                     }
-                    if (currentPageNumber < totalPages) {
-                        sb.append("<y:next>" + (currentPageNumber + 1) + "</y:next>");
-                    }
-                    sb.append("</y:pages>");
                     
                     sb.append("<y:results total=\"" + results.length + "\" page-number='" + currentPageNumber + "'>");
                     int startingEntry = 0;