[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/grammars/standard StringField.java, 1.22, 1.23 IntegerField.java, 1.17, 1.18 FloatField.java, 1.18, 1.19 DateField.java, 1.22, 1.23

[Vano <jj...@us...>]

Update of /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/grammars/standard
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6524/src/net/sf/csv2sql/grammars/standard

Modified Files:
	StringField.java IntegerField.java FloatField.java 
	DateField.java 
Log Message:
If csv value is equal ignore case to 'NULL' then return database null.

Index: DateField.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/grammars/standard/DateField.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DateField.java	12 Mar 2005 12:34:51 -0000	1.22
--- DateField.java	12 Oct 2006 14:46:15 -0000	1.23
***************
*** 48,51 ****
--- 48,52 ----
                  result = getDefaulNullValue();
              } else {
+                 if ("null".equalsIgnoreCase((String)value)) {return getDefaulNullValue();} 
                  
                  String inputFormat = this.getFieldProperties().getProperty("inputformat");

Index: IntegerField.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/grammars/standard/IntegerField.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** IntegerField.java	12 Mar 2005 12:34:51 -0000	1.17
--- IntegerField.java	12 Oct 2006 14:46:15 -0000	1.18
***************
*** 43,46 ****
--- 43,47 ----
                  result = getDefaulNullValue();
              } else {
+             	if ("null".equalsIgnoreCase((String)value)) {return getDefaulNullValue();}
                  result = String.valueOf(new Integer(Integer.parseInt((String)value)).intValue());
              }

Index: StringField.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/grammars/standard/StringField.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** StringField.java	12 Mar 2005 12:34:51 -0000	1.22
--- StringField.java	12 Oct 2006 14:46:15 -0000	1.23
***************
*** 46,49 ****
--- 46,50 ----
                  result = getDefaulNullValue();
              }  else {
+             	if ("null".equalsIgnoreCase((String)value)) {return getDefaulNullValue();}
                  value = this.truncateValue(value);
                  value = this.escapeValue(value);

Index: FloatField.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/grammars/standard/FloatField.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FloatField.java	12 Mar 2005 12:34:51 -0000	1.18
--- FloatField.java	12 Oct 2006 14:46:15 -0000	1.19
***************
*** 43,46 ****
--- 43,47 ----
                  result = getDefaulNullValue();
              } else {
+             	if ("null".equalsIgnoreCase((String)value)) {return getDefaulNullValue();}
                  String strFloat = ((String)value).replaceAll(",", ".");
                  result = String.valueOf(new Float(Float.parseFloat(strFloat)));