Scarab commit: svn commit: r11282 - branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/util/word/IssueSearch.java

Author: dabbous
Date: 2012-06-10 09:10:19-0700
New Revision: 11282

Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/util/word/IssueSearch.java

Log:
Internal sort columns (issueId, creation date, modification date, ...) Where not recognized correctly due to case sensitive parameter naming.
Quick fix: detect sort columns using case insensitive name resolution.

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/util/word/IssueSearch.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/util/word/IssueSearch.java?view=diff&pathrev=11282&r1=11281&r2=11282
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/util/word/IssueSearch.java	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/util/word/IssueSearch.java	2012-06-10 09:10:19-0700
@@ -1229,10 +1229,10 @@
                 Criteria.LEFT_JOIN 
             );
         }
-        if (sortInternal.equals(RModuleUserAttribute.MODIFIED_DATE.getName()) ||
-            sortInternal.equals(RModuleUserAttribute.CREATED_DATE.getName()))
+        if (sortInternal.equalsIgnoreCase(RModuleUserAttribute.MODIFIED_DATE.getName()) ||
+            sortInternal.equalsIgnoreCase(RModuleUserAttribute.CREATED_DATE.getName()))
         {
-            if (sortInternal.equals(RModuleUserAttribute.CREATED_DATE.getName()))
+            if (sortInternal.equalsIgnoreCase(RModuleUserAttribute.CREATED_DATE.getName()))
             {
                 joinColumn  = IssuePeer.CREATED_TRANS_ID;
             }
@@ -1249,10 +1249,10 @@
                 Criteria.LEFT_JOIN 
             );
         }
-        else if (sortInternal.equals(RModuleUserAttribute.MODIFIED_BY.getName()) ||
-            sortInternal.equals(RModuleUserAttribute.CREATED_BY.getName()))
+        else if (sortInternal.equalsIgnoreCase(RModuleUserAttribute.MODIFIED_BY.getName()) ||
+            sortInternal.equalsIgnoreCase(RModuleUserAttribute.CREATED_BY.getName()))
         {   
-            if (sortInternal.equals(RModuleUserAttribute.CREATED_BY.getName()))
+            if (sortInternal.equalsIgnoreCase(RModuleUserAttribute.CREATED_BY.getName()))
             {
                 joinColumn  = IssuePeer.CREATED_TRANS_ID;
             }
@@ -1275,7 +1275,7 @@
                 Criteria.LEFT_JOIN 
             );
         }
-
+        
         addSortColumn(crit, sortColumn);
     }

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