[pcgen-commit-svn] SF.net SVN: pcgen:[12936] branches/5.16.x/pcgen/code/src/java/pcgen/io/ ExportHandler.java

[<jde...@us...>]

Revision: 12936
          http://pcgen.svn.sourceforge.net/pcgen/?rev=12936&view=rev
Author:   jdempsey
Date:     2010-08-28 08:50:07 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
Export rejecting INTVAL in VAR filters
Issue#: CODE-183

Modified Paths:
--------------
    branches/5.16.x/pcgen/code/src/java/pcgen/io/ExportHandler.java

Modified: branches/5.16.x/pcgen/code/src/java/pcgen/io/ExportHandler.java
===================================================================
--- branches/5.16.x/pcgen/code/src/java/pcgen/io/ExportHandler.java	2010-08-28 08:49:29 UTC (rev 12935)
+++ branches/5.16.x/pcgen/code/src/java/pcgen/io/ExportHandler.java	2010-08-28 08:50:07 UTC (rev 12936)
@@ -3396,12 +3396,34 @@
 				new StringTokenizer(aString.substring(5), ".", false);
 		final String varName = aTok.nextToken();
 		String bString = "EQ";
+		boolean intVal = false;
+		boolean maxVal = true;
 
 		if (aTok.hasMoreTokens())
 		{
 			bString = aTok.nextToken();
 		}
-
+		while ("INTVAL".equals(bString) || "MINVAL".equals(bString))
+		{
+			if ("INTVAL".equals(bString))
+			{
+				intVal = true;
+			}
+			else if ("MINVAL".equals(bString))
+			{
+				maxVal = false;
+			}
+			if (aTok.hasMoreTokens())
+			{
+				bString = aTok.nextToken();
+			}
+			else
+			{
+				Logging.errorPrint("Missing comparison type in VAR filter " + aString + " assuming NEQ");
+				bString = "NEQ";
+			}
+		}
+		
 		String value = "0";
 
 		if (aTok.hasMoreTokens())
@@ -3409,7 +3431,11 @@
 			value = aTok.nextToken();
 		}
 
-		final Float varval = aPC.getVariable(varName);
+		Float varval = aPC.getVariable(varName, maxVal, "", "");
+		if (intVal)
+		{
+			varval = (float) Math.floor(varval);
+		}
 		final Float valval = aPC.getVariableValue(value, "");
 
 		if ("GTEQ".equals(bString))
@@ -3436,6 +3462,8 @@
 		}
 		else
 		{
+			Logging.errorPrint("Unknown comparison type: " + bString
+					+ " in VAR filter " + aString + " assuming NEQ");
 			canWrite =
 					!CoreUtility.doublesEqual(varval.doubleValue(), valval
 						.doubleValue());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.