Scarab commit: svn commit: r10757 - trunk/src/java/org/tigris/scarab: pipeline tools

Author: dabbous
Date: 2009-06-09 14:29:41-0700
New Revision: 10757

Modified:
   trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
   trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Log:
SCB2974: Secnd try to implement shortlinks for queries: Reverted changes in ScarabRequestTool and added on the fly parameters to DetermineTargetValue.java when the parameter 'query' is found in the pathInfo

Modified: trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java?view=diff&pathrev=10757&r1=10756&r2=10757
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java	(original)
+++ trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java	2009-06-09 14:29:41-0700
@@ -95,8 +95,12 @@
             else if (parameters.getString("query") != null)
             {
                 // Allows short link to public/personal queries
-                // $scarabRoot/issues/query/<queryId>/curmodule/<moduleId>
-                data.setTarget("IssueList.vm");
+                // $scarabRoot/issues/query/<queryId>/curmodule/<moduleId>                
+                if (parameters.getString("tqk")      == null) parameters.setString("tqk", ""+0);
+                if (parameters.getString("template") == null) data.setTarget("IssueList.vm");
+                if (parameters.getString("action")   == null) data.setAction("Search");
+                if (parameters.getString("eventSubmit_doSelectquery") == null) parameters.setString("eventSubmit_doSelectquery", "foo");
+                if (parameters.getString("go")       == null) parameters.setString("go",parameters.getString("query"));
             }
             else
             {

Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=10757&r1=10756&r2=10757
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2009-06-09 14:29:41-0700
@@ -1944,26 +1944,7 @@
         // control the search-Subsystem so that it will perfrom the correct
         // search. Any help and advice for a better solution is heavily welcome!!!
 		
-        String currentQueryString;
-        String queryId = data.getParameters().get("query");
-        if(queryId != null && queryId.length() > 0)
-        {
-            // ===================================================================
-            // Query has been entered via shortLink:
-            // <scarabHost>/scarab/issues/query/<queryId>/curmodule/<moduleId>/...
-            // ===================================================================
-            query = getQuery(queryId);
-            currentQueryString = query.getValue();
-            MITList queryMitList = query.getMITList(); //use the query default mitlist
-            user.setCurrentMITList(queryMitList);
-            user.removeTemp("queryResult");
-        }
-        else
-        {
-            currentQueryString = user.getMostRecentQuery();
-        }
-        
-        assert currentQueryString != null;
+        String currentQueryString = user.getMostRecentQuery();
         String sortColumn = data.getParameters().getString("sortColumn");
         String sortInternal=data.getParameters().getString("sortInternal");
         String sortPolarity = data.getParameters().getString("sortPolarity");

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2360740