You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by vk...@apache.org on 2009/03/11 17:14:22 UTC

svn commit: r752495 - in /portals/applications: demo/src/main/webapp/WEB-INF/view/database-view.vm gems/src/main/java/org/apache/portals/gems/browser/BrowserPortlet.java

Author: vkumar
Date: Wed Mar 11 16:14:21 2009
New Revision: 752495

URL: http://svn.apache.org/viewvc?rev=752495&view=rev
Log:
Fixing Database sorting 
http://issues.apache.org/jira/browse/JS2-546

Modified:
    portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm
    portals/applications/gems/src/main/java/org/apache/portals/gems/browser/BrowserPortlet.java

Modified: portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm
URL: http://svn.apache.org/viewvc/portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm?rev=752495&r1=752494&r2=752495&view=diff
==============================================================================
--- portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm (original)
+++ portals/applications/demo/src/main/webapp/WEB-INF/view/database-view.vm Wed Mar 11 16:14:21 2009
@@ -44,6 +44,7 @@
     #foreach ($column in $title)
 	  #set ($columnLink = $renderResponse.createRenderURL())
 	  $columnLink.setParameter("js_dbcolumn",$column)
+          $columnLink.setParameter("sortOrder",$sortOrder)
       <td align=CENTER class="jetdbHead" width="43" nowrap onClick="window.location.href='$columnLink'">
         <div align="center">$column</div>
       </td>

Modified: portals/applications/gems/src/main/java/org/apache/portals/gems/browser/BrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/applications/gems/src/main/java/org/apache/portals/gems/browser/BrowserPortlet.java?rev=752495&r1=752494&r2=752495&view=diff
==============================================================================
--- portals/applications/gems/src/main/java/org/apache/portals/gems/browser/BrowserPortlet.java (original)
+++ portals/applications/gems/src/main/java/org/apache/portals/gems/browser/BrowserPortlet.java Wed Mar 11 16:14:21 2009
@@ -89,6 +89,7 @@
     // portlet entry Id
     protected static final String PEID = "js_peid";
     protected static final String SORT_COLUMN_NAME = "js_dbcolumn";
+    protected static final String SORT_ORDER = "sortOrder";
     protected List sqlParameters = new Vector();
     /*
      * SSO link
@@ -122,10 +123,15 @@
         BrowserIterator iterator = getBrowserIterator(request);
         Context context = this.getContext(request);
         String sortColName = request.getParameter(SORT_COLUMN_NAME);
+        String sortorder = request.getParameter(SORT_ORDER);
         int start = getStartVariable(request, START, sortColName, iterator);
         PortletPreferences prefs = request.getPreferences();
         windowSize = Integer.parseInt(prefs.getValue(WINDOW_SIZE, "10"));
         StatusMessage message = (StatusMessage) PortletMessaging.consume(request, "DatabaseBrowserPortlet", "action");
+        if (sortorder==null)
+        {
+            sortorder = "DESC";
+        }
         if (message != null)
         {
             this.getContext(request).put("statusMsg", message);
@@ -183,6 +189,12 @@
                 context.put(BROWSER_TABLE_SIZE, new Integer(resultSetSize));
                 context.put(WINDOW_SIZE, new Integer(windowSize));
                 context.put(START, new Integer(start));
+                if(sortorder.equals("ASC")){
+                    context.put(SORT_ORDER, "DESC");    
+                }else{
+                    context.put(SORT_ORDER, "ASC");    
+                }
+                
                 /*
                  * System.out.println("buildNormalContext Sort column name= "+sortColName); System.out.println("buildNormalContext Iterator:
                  * "+iterator); System.out.println("buildNormalContext Titles= "+iterator.getResultSetTitleList()); System.out.println("buildNormalContext