Scarab commit: svn commit: r10504 - trunk/src/java/org/tigris/scarab/actions/Search.java

Author: ronvoe122
Date: 2007-12-16 12:45:02-0800
New Revision: 10504

Modified:
   trunk/src/java/org/tigris/scarab/actions/Search.java

Log:
SCB1163: the search results were not displayed in the defined sort order if the search was executed from the search or advanced search screen.

The search screen and the resulting issue list are using different names for the sort order parameter, which have to be translated before executing a search.

Modified: trunk/src/java/org/tigris/scarab/actions/Search.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/Search.java?view=diff&rev=10504&p1=trunk/src/java/org/tigris/scarab/actions/Search.java&p2=trunk/src/java/org/tigris/scarab/actions/Search.java&r1=10503&r2=10504
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/Search.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/Search.java	2007-12-16 12:45:02-0800
@@ -109,8 +109,7 @@
     private static final String SELECTED_USER = "select_user";
     private static final String USER_LIST = "user_list";
     private static final String ANY = "any";
-    private static final String CREATED_BY = "created_by";
-
+    
     private static final String OUTPUT_FORMAT = "output";
     private static final String WEB_OUTPUT = "web";
     private static final String FEED_OUTPUT = "feed";
@@ -282,6 +281,7 @@
         setup(data, context);
         String queryString = getQueryString(data);        
         setRecentQuery(queryString);
+        translateSortorder(data, queryString);
 
         doPerform(data, context);
     }
@@ -547,13 +547,24 @@
         }
         setRecentQuery(query.getValue());
         
-        //
+        translateSortorder(data, query.getValue());
+
+        setTarget(data, getIssueListTarget());
+    }
+
+    private void translateSortorder(RunData data, String queryString) throws Exception
+    {
         // Add 'sortColumn', 'sortPolarity' and 'resultsPerPage'
         // to the RunData parameters. This ensures that when the
         // user runs a saved query, the resulting issue list is
         // displayed with that query's settings. 
         //
-        StringValueParser parser = ScarabUtil.parseURL(query.getValue());
+        // TODO remove translateSortorder
+        // this method is just a hack
+        // instead of translating between different parameter names
+        // the sortorder-parameter should have the same name, 
+        // in the edit-query-screens as well as in the issue list
+        StringValueParser parser = ScarabUtil.parseURL(queryString);
         
         if (parser.containsKey("resultsperpage")) {
             data.getParameters().add("resultsperpage",
@@ -569,8 +580,6 @@
             data.getParameters().add("sortPolarity",
                                      parser.getString("searchsp"));
         }
-
-        setTarget(data, getIssueListTarget());
     }