Author: husted
Date: Tue May 9 05:22:15 2006
New Revision: 405407
URL: http://svn.apache.org/viewcvs?rev=405407&view=rev
Log:
OVR-23
* Trim Search Criteria input
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Nexus.sln
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs?rev=405407&r1=405406&r2=405407&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs Tue May 9
05:22:15 2006
@@ -58,19 +58,15 @@
if (input == null) return;
ICollection keys = input.Keys;
IDictionary criteria = Criteria;
- if (nullIfEmpty)
- foreach (string key in keys)
- {
- object value = input[key];
- string s = value as string;
- if ((s != null) && (s.Length == 0))
- criteria.Add(key, null);
- else
- criteria.Add(key, value);
- }
- else foreach (string key in keys)
+ foreach (string key in keys)
{
- criteria.Add(key, input[key]);
+ string s = null;
+ string o = (input[key] as string);
+ if (o!=null) s = o.Trim();
+ if ((nullIfEmpty) && (s != null) && (s.Length
== 0))
+ criteria.Add(key, null);
+ else
+ criteria.Add(key, s);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Nexus.sln
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Nexus.sln?rev=405407&r1=405406&r2=405407&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Nexus.sln (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Nexus.sln Tue May 9 05:22:15 2006
@@ -39,6 +39,8 @@
{2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Release.ActiveCfg =
Release|.NET
{2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Release.Build.0 =
Release|.NET
EndGlobalSection
+ GlobalSection(SolutionItems) = postSolution
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat?rev=405407&r1=405406&r2=405407&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat
(original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat Tue
May 9 05:22:15 2006
@@ -1,5 +1,5 @@
@echo off
-E:\projects\Apache\struts\sandbox\overdrive\Nexus\postbuild.bat
E:\projects\Apache\struts\sandbox\overdrive\Nexus\Test\bin\Debug\ Nexus.Test
Nexus E:\projects\Apache\struts\sandbox\overdrive\Nexus\
+E:\projects\Apache\struts-current\sandbox\overdrive\Nexus\postbuild.bat
E:\projects\Apache\struts-current\sandbox\overdrive\Nexus\Test\bin\Debug\
Nexus.Test Nexus E:\projects\Apache\struts-current\sandbox\overdrive\Nexus\
if errorlevel 1 goto CSharpReportError
goto CSharpEnd
:CSharpReportError
