csvtosql-cvs — csvtosql cvs developers list

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/renders/exceptions MissingRequiredParameterException.java, 1.1, 1.2 RendererException.java, 1.7, 1.8 InvalidParameterValueException.java, 1.4, 1.5

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

Update of /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/exceptions
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25680/src/net/sf/csv2sql/renders/exceptions

Modified Files:
	MissingRequiredParameterException.java RendererException.java 
	InvalidParameterValueException.java 
Log Message:


Index: RendererException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/exceptions/RendererException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RendererException.java	9 Jan 2005 13:52:44 -0000	1.7
--- RendererException.java	16 Nov 2006 16:23:04 -0000	1.8
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.renders.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.renders.exceptions;
  

Index: InvalidParameterValueException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/exceptions/InvalidParameterValueException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InvalidParameterValueException.java	11 Nov 2004 09:15:14 -0000	1.4
--- InvalidParameterValueException.java	16 Nov 2006 16:23:04 -0000	1.5
***************
*** 2,18 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.renders.exceptions;
--- 2,18 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.renders.exceptions;

Index: MissingRequiredParameterException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/exceptions/MissingRequiredParameterException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MissingRequiredParameterException.java	5 Nov 2004 16:42:19 -0000	1.1
--- MissingRequiredParameterException.java	16 Nov 2006 16:23:04 -0000	1.2
***************
*** 1,19 ****
  /*
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.renders.exceptions;
  
--- 1,19 ----
  /*
      Copyright (C) 2004  Davide Consonni <dco...@en...>
+     
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.renders.exceptions;
  

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/storage/exceptions StorageException.java, 1.2, 1.3 InvalidParameterValueException.java, 1.2, 1.3 MissingRequiredParameterException.java, 1.2, 1.3

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

Update of /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/storage/exceptions
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25680/src/net/sf/csv2sql/storage/exceptions

Modified Files:
	StorageException.java InvalidParameterValueException.java 
	MissingRequiredParameterException.java 
Log Message:


Index: StorageException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/storage/exceptions/StorageException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StorageException.java	10 Nov 2004 20:49:52 -0000	1.2
--- StorageException.java	16 Nov 2006 16:23:03 -0000	1.3
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.storage.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.storage.exceptions;
  

Index: MissingRequiredParameterException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/storage/exceptions/MissingRequiredParameterException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MissingRequiredParameterException.java	5 Nov 2004 16:48:39 -0000	1.2
--- MissingRequiredParameterException.java	16 Nov 2006 16:23:03 -0000	1.3
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.storage.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.storage.exceptions;
  

Index: InvalidParameterValueException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/storage/exceptions/InvalidParameterValueException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InvalidParameterValueException.java	10 Nov 2004 20:49:52 -0000	1.2
--- InvalidParameterValueException.java	16 Nov 2006 16:23:03 -0000	1.3
***************
*** 2,20 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! package net.sf.csv2sql.storage.exceptions;
  
  /**
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */age net.sf.csv2sql.storage.exceptions;
  
  /**

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/writers/exceptions ThreadedInvalidParameterValueException.java, 1.4, 1.5 MissingRequiredParameterException.java, 1.4, 1.5 InvalidParameterValueException.java, 1.5, 1.6 ThreadedWriterException.java, 1.3, 1.4 WriterException.java, 1.6, 1.7

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

Update of /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/exceptions
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25680/src/net/sf/csv2sql/writers/exceptions

Modified Files:
	ThreadedInvalidParameterValueException.java 
	MissingRequiredParameterException.java 
	InvalidParameterValueException.java 
	ThreadedWriterException.java WriterException.java 
Log Message:


Index: InvalidParameterValueException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/exceptions/InvalidParameterValueException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InvalidParameterValueException.java	11 Nov 2004 09:15:15 -0000	1.5
--- InvalidParameterValueException.java	16 Nov 2006 16:23:04 -0000	1.6
***************
*** 2,18 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.writers.exceptions;
--- 2,18 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.writers.exceptions;

Index: WriterException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/exceptions/WriterException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WriterException.java	12 Oct 2006 10:41:10 -0000	1.6
--- WriterException.java	16 Nov 2006 16:23:04 -0000	1.7
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.writers.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.writers.exceptions;
  

Index: ThreadedInvalidParameterValueException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/exceptions/ThreadedInvalidParameterValueException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ThreadedInvalidParameterValueException.java	12 Oct 2004 23:13:35 -0000	1.4
--- ThreadedInvalidParameterValueException.java	16 Nov 2006 16:23:04 -0000	1.5
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.writers.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.writers.exceptions;
  

Index: ThreadedWriterException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/exceptions/ThreadedWriterException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ThreadedWriterException.java	12 Oct 2004 23:13:35 -0000	1.3
--- ThreadedWriterException.java	16 Nov 2006 16:23:04 -0000	1.4
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.writers.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.writers.exceptions;
  

Index: MissingRequiredParameterException.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/exceptions/MissingRequiredParameterException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MissingRequiredParameterException.java	12 Oct 2004 23:13:35 -0000	1.4
--- MissingRequiredParameterException.java	16 Nov 2006 16:23:04 -0000	1.5
***************
*** 2,19 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
! 
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
! 
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  package net.sf.csv2sql.writers.exceptions;
  
--- 2,19 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
!  
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
!  
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
!  */
  package net.sf.csv2sql.writers.exceptions;
  

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/renders/splitters Standard.java, 1.3, 1.4 Splitter.java, 1.1, 1.2 Simple.java, 1.1, 1.2

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

Update of /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/splitters
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25680/src/net/sf/csv2sql/renders/splitters

Modified Files:
	Standard.java Splitter.java Simple.java 
Log Message:


Index: Splitter.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/splitters/Splitter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Splitter.java	22 Nov 2004 13:03:42 -0000	1.1
--- Splitter.java	16 Nov 2006 16:23:04 -0000	1.2
***************
*** 2,18 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.renders.splitters;
--- 2,18 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.renders.splitters;

Index: Standard.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/splitters/Standard.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Standard.java	12 Mar 2005 11:29:21 -0000	1.3
--- Standard.java	16 Nov 2006 16:23:04 -0000	1.4
***************
*** 2,18 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.renders.splitters;
--- 2,18 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.renders.splitters;

Index: Simple.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/renders/splitters/Simple.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Simple.java	22 Nov 2004 13:03:42 -0000	1.1
--- Simple.java	16 Nov 2006 16:23:04 -0000	1.2
***************
*** 2,18 ****
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.renders.splitters;
--- 2,18 ----
      Copyright (C) 2004  Davide Consonni <dco...@en...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.renders.splitters;

[Csvtosql-cvs] csvtosql_jdk50/bin csvtosql.jar,1.3,1.4

[consonni d. <dav...@us...>]

Update of /cvsroot/csvtosql/csvtosql_jdk50/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24138/bin

Modified Files:
	csvtosql.jar 
Log Message:
no message

Index: csvtosql.jar
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/bin/csvtosql.jar,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsIvksB3 and /tmp/cvs8asR2u differ

[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/grammars/mysql GrammarFactory.java, 1.2, 1.3

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

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

Modified Files:
	GrammarFactory.java 
Log Message:


Index: GrammarFactory.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/grammars/mysql/GrammarFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GrammarFactory.java	11 Oct 2006 18:23:18 -0000	1.2
--- GrammarFactory.java	19 Oct 2006 08:27:41 -0000	1.3
***************
*** 37,40 ****
--- 37,43 ----
          mapping.put("VARCHAR",  "net.sf.csv2sql.grammars.mysql.MysqlFieldChar");
          mapping.put("CHAR",     "net.sf.csv2sql.grammars.mysql.MysqlFieldChar");
+         // added TEXT field for MySQL
+         // @author <a href="mailto:jj...@us...">Ivan Ryndin</a>
+         mapping.put("TEXT",     "net.sf.csv2sql.grammars.mysql.MysqlFieldChar");
          
          //numbers        

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/grammars/mysql GrammarFactory.java, 1.18, 1.19

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

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

Modified Files:
	GrammarFactory.java 
Log Message:


Index: GrammarFactory.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/grammars/mysql/GrammarFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GrammarFactory.java	12 Mar 2005 12:34:32 -0000	1.18
--- GrammarFactory.java	19 Oct 2006 08:26:18 -0000	1.19
***************
*** 37,40 ****
--- 37,43 ----
          mapping.put("VARCHAR",  "net.sf.csv2sql.grammars.mysql.MysqlFieldChar");
          mapping.put("CHAR",     "net.sf.csv2sql.grammars.mysql.MysqlFieldChar");
+         // added TEXT field for MySQL
+         // @author <a href="mailto:jj...@us...">Ivan Ryndin</a>
+         mapping.put("TEXT",     "net.sf.csv2sql.grammars.mysql.MysqlFieldChar");
          
          //numbers        

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/writers JdbcBatchWriter.java, 1.23, 1.24

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

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

Modified Files:
	JdbcBatchWriter.java 
Log Message:


Index: JdbcBatchWriter.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/JdbcBatchWriter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** JdbcBatchWriter.java	17 Oct 2006 06:52:38 -0000	1.23
--- JdbcBatchWriter.java	17 Oct 2006 12:27:59 -0000	1.24
***************
*** 97,102 ****
--- 97,104 ----
              	if (jdbcJar!=null) {
              		connection = DBUtils.openConnection(jdbcJar, driver, url, username, password);
+ //            		System.out.println("create conn");
              	} else  {
              		connection = DBUtils.openConnection(driver, url, username, password);
+ //            		System.out.println("create conn");
              	}
              } else {

[Csvtosql-cvs] csvtosql_jdk50/examples/test.jdbcbatchwriter create_db.sql, NONE, 1.1 build.xml, NONE, 1.1 runconsole.sh, NONE, 1.1 runconsole.bat, NONE, 1.1 mysql.jar, NONE, 1.1 readme.txt, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.jdbcbatchwriter
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27295/examples/test.jdbcbatchwriter

Added Files:
	create_db.sql build.xml runconsole.sh runconsole.bat mysql.jar 
	readme.txt 
Log Message:


--- NEW FILE: build.xml ---
<!-- 
     Created by Ivan Ryndin <a href="mailto:jj...@us...">
-->

<project name="testcvstosql" default="run">

	<description>
    This ant file helps to run test for next two things: ExtendedConsoleMain frontend and JdbcExtendedBatchWriter writer. 

	What should you do to run test: 

	1) Copy "cvstosql.jar" from "bin" folder to here.
	2) Run ANT.
	</description>

	<property name="db.url" value="jdbc:mysql://localhost/testdb"/>
	<property name="db.user" value="ryndin"/>
	<property name="db.password" value="ryndin"/>
	<property name="db.driver.class" value="com.mysql.jdbc.Driver"/>

	<property name="lib.dir" value="**/../../../lib"/>

	<path id="clp">
		<pathelement location="mysql.jar"/>
		<pathelement location="csvtosql.jar"/>
		<pathelement path="..\..\lib"/>
		<fileset dir="${lib.dir}">
        	<include name="**/*.jar"/>
		</fileset>
	</path>


    <target name="create-db" description="Creates test database. Suitable for MySQL.">

        <sql driver="${db.driver.class}" password="${db.password}" url="${db.url}" userid="${db.user}">
            <classpath refid="clp" />
            <transaction src="create_db.sql"/>
        </sql>
    </target>


    <target name="run" depends="create-db" description="Run test task">

        <java classname="net.sf.csv2sql.frontends.console.ExtendedConsoleMain" fork="true" classpathref="clp">
			<arg line="-d data\tables.txt"/>
            <syspropertyset>
                <propertyref prefix="db." />
            </syspropertyset>
        </java>
    </target>

</project>

--- NEW FILE: runconsole.sh ---
java -classpath csvtosql.jar;mysql.jar;../../lib/commons-cli-1.0.jar -Ddb.url=jdbc:mysql://localhost/testdb -Ddb.user=ryndin -Ddb.password=ryndin -Ddb.driver.class=com.mysql.jdbc.Driver net.sf.csv2sql.frontends.console.ExtendedConsoleMain $1 $2 $3 $4 $5 $6 $7 $8

--- NEW FILE: create_db.sql ---
drop database if exists testdb;
create database testdb character set 'utf8';

use testdb;

    create table ADDR_TYPE (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        COMPANY_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table EFFECT (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        DESCR text,
        CREATOR_ID integer,
        MODIFIER_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table MATRIX (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table SAMPLE_LOC (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        COMPANY_ID integer,
        primary key (ID)
    ) type=InnoDB;


--- NEW FILE: runconsole.bat ---
java -classpath csvtosql.jar;mysql.jar;..\..\lib\commons-cli-1.0.jar -Ddb.url=jdbc:mysql://localhost/testdb -Ddb.user=ryndin -Ddb.password=ryndin -Ddb.driver.class=com.mysql.jdbc.Driver net.sf.csv2sql.frontends.console.ExtendedConsoleMain -d data\tables.txt

--- NEW FILE: mysql.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: readme.txt ---


This test case does testing 
of the ExtendedConsoleMain frontend 
and JdbcBatchMain writer.

What should you do to run test: 

1) Copy "cvstosql.jar" from "bin" folder to here.
2) Execute "create_db.sql" for creating database and its tables. 
   Use MySQL database. It wasn't tested on others databases. But at a glance, 
   all should work well on others databases. You need only to change a little
   "create_db.sql" and XML descriptors  in "data" folder.
3) Run either "runconsole.bat" (or "runconsole.sh") or "build.xml" 
   for running the task with ANT.

[Csvtosql-cvs] csvtosql_jdk50/examples/test.jdbcbatchwriter/data matrix.csv, NONE, 1.1 addr_type.xml, NONE, 1.1 effect.csv, NONE, 1.1 tables.txt, NONE, 1.1 sample_loc.csv, NONE, 1.1 effect.xml, NONE, 1.1 matrix.xml, NONE, 1.1 sample_loc.xml, NONE, 1.1 addr_type.csv, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.jdbcbatchwriter/data
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27295/examples/test.jdbcbatchwriter/data

Added Files:
	matrix.csv addr_type.xml effect.csv tables.txt sample_loc.csv 
	effect.xml matrix.xml sample_loc.xml addr_type.csv 
Log Message:


--- NEW FILE: matrix.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID
"1","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Soil","SOIL",NULL,NULL
"2","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Air","AIR",NULL,NULL
"3","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Water","WATER",NULL,NULL

--- NEW FILE: effect.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="effect">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="DESCR" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="effect.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="effect.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: addr_type.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="addr_type">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
    <field name="COMPANY_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="addr_type.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="addr_type.sql"/>
    </writerAppender>

            
  </output>
</root>


--- NEW FILE: effect.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,DESCR,CREATOR_ID,MODIFIER_ID
"1","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Allergic dermatitis",NULL,"Allergic dermatitis",NULL,NULL
"2","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; decrease in blood platelets; increased risk of cancer",NULL,"Anemia; decrease in blood platelets; increased risk of cancer",NULL,NULL
"3","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; infants & young children: nervous system effects",NULL,"Anemia; infants & young children: nervous system effects",NULL,NULL
"4","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; liver, kidney or spleen damage; changes in blood",NULL,"Anemia; liver, kidney or spleen damage; changes in blood",NULL,NULL
"5","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Bone disease (pain and tenderness of the bones); Children may get mottled teeth",NULL,"Bone disease (pain and tenderness of the bones); Children may get mottled teeth",NULL,NULL
"6","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Cardiovascular system or reproductive problems",NULL,"Cardiovascular system or reproductive problems",NULL,NULL
"7","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Cataracts",NULL,"Cataracts",NULL,NULL
"8","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Changes in adrenal glands",NULL,"Changes in adrenal glands",NULL,NULL
"9","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye, liver, kidney or spleen problems; anemia; increased risk of cancer",NULL,"Eye, liver, kidney or spleen problems; anemia; increased risk of cancer",NULL,NULL
"10","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye/nose irritation; stomach discomfort",NULL,"Eye/nose irritation; stomach discomfort",NULL,NULL
"11","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye/nose irritation; stomach discomfort, anemia",NULL,"Eye/nose irritation; stomach discomfort, anemia",NULL,NULL
"12","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Gastrointestinal illness (e.g., diarrhea, vomiting, cramps)",NULL,"Gastrointestinal illness (e.g., diarrhea, vomiting, cramps)",NULL,NULL
"13","0","2006-10-10 14:29:48","2006-10-10 14:29:48","HPC has no health effects; it is an analytic method used to measure the variety of bacteria that are common in water. The lower the concentration of bacteria in drinking water, the better maintained the water system is.",NULL,"HPC has no health effects; it is an analytic method used to measure the variety of bacteria that are common in water. The lower the concentration of bacteria in drinking water, the better maintained the water system is.",NULL,NULL
"14","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Hair loss; changes in blood; kidney, intestine, or liver problems",NULL,"Hair loss; changes in blood; kidney, intestine, or liver problems",NULL,NULL
"15","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Hair or fingernail loss; numbness in fingers or toes; circulatory problems",NULL,"Hair or fingernail loss; numbness in fingers or toes; circulatory problems",NULL,NULL
"16","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increase in blood cholesterol; decrease in blood sugar",NULL,"Increase in blood cholesterol; decrease in blood sugar",NULL,NULL
"17","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increase in blood pressure",NULL,"Increase in blood pressure",NULL,NULL
"18","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased cancer risk, and over a long period of time, stomach problems",NULL,"Increased cancer risk, and over a long period of time, stomach problems",NULL,NULL
"19","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of cancer",NULL,"Increased risk of cancer",NULL,NULL
"20","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of cancer, kidney toxicity",NULL,"Increased risk of cancer, kidney toxicity",NULL,NULL
"21","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of developing benign intestinal polyps",NULL,"Increased risk of developing benign intestinal polyps",NULL,NULL
"22","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants and children: Delays in physical or mental development; children could show slight deficits in attention span and learning abilities; Adults: Kidney problems; high blood pressure",NULL,"Infants and children: Delays in physical or mental development; children could show slight deficits in attention span and learning abilities; Adults: Kidney problems; high blood pressure",NULL,NULL
"23","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants below the age of six months who drink water containing nitrate in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,"Infants below the age of six months who drink water containing nitrate in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,NULL
"24","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants below the age of six months who drink water containing nitrite in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,"Infants below the age of six months who drink water containing nitrite in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,NULL
"25","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Intestinal lesions",NULL,"Intestinal lesions",NULL,NULL
"26","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney damage",NULL,"Kidney damage",NULL,NULL
"27","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney or stomach problems",NULL,"Kidney or stomach problems",NULL,NULL
"28","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney problems; reproductive difficulties",NULL,"Kidney problems; reproductive difficulties",NULL,NULL
"29","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney, liver, or adrenal gland problems",NULL,"Kidney, liver, or adrenal gland problems",NULL,NULL
"30","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney, liver, or thyroid problems; increased risk of cancer",NULL,"Kidney, liver, or thyroid problems; increased risk of cancer",NULL,NULL
"31","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Legionnaire's Disease, a type of pneumonia",NULL,"Legionnaire's Disease, a type of pneumonia",NULL,NULL
"32","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver damage; increased risk of cancer",NULL,"Liver damage; increased risk of cancer",NULL,NULL
"33","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems",NULL,"Liver or kidney problems",NULL,NULL
"34","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems; increased cancer risk",NULL,"Liver or kidney problems; increased cancer risk",NULL,NULL
"35","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems; reproductive difficulties; increased risk of cancer",NULL,"Liver or kidney problems; reproductive difficulties; increased risk of cancer",NULL,NULL
"36","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidneys problems",NULL,"Liver or kidneys problems",NULL,NULL
"37","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or nervous system problems; increased risk of cancer",NULL,"Liver or nervous system problems; increased risk of cancer",NULL,NULL
"38","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver problems",NULL,"Liver problems",NULL,NULL
"39","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver problems; increased risk of cancer",NULL,"Liver problems; increased risk of cancer",NULL,NULL
"40","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney or central nervous system problems; increased risk of cancer",NULL,"Liver, kidney or central nervous system problems; increased risk of cancer",NULL,NULL
"41","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney, or circulatory system problems",NULL,"Liver, kidney, or circulatory system problems",NULL,NULL
"42","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney, or immune system problems",NULL,"Liver, kidney, or immune system problems",NULL,NULL
"43","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, nervous system, or circulatory problems",NULL,"Liver, nervous system, or circulatory problems",NULL,NULL
"44","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Minor kidney changes",NULL,"Minor kidney changes",NULL,NULL
"45","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nerve damage or thyroid problems",NULL,"Nerve damage or thyroid problems",NULL,NULL
"46","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system damage",NULL,"Nervous system damage",NULL,NULL
"47","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system or blood problems; increased risk of cancer",NULL,"Nervous system or blood problems; increased risk of cancer",NULL,NULL
"48","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system, kidney, or liver problems",NULL,"Nervous system, kidney, or liver problems",NULL,NULL
"49","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Not a health threat in itself; it is used to indicate whether other potentially harmful bacteria may be present",NULL,"Not a health threat in itself; it is used to indicate whether other potentially harmful bacteria may be present",NULL,NULL
"50","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with blood",NULL,"Problems with blood",NULL,NULL
"51","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with blood, nervous system, or reproductive system",NULL,"Problems with blood, nervous system, or reproductive system",NULL,NULL
"52","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with liver, stomach, reproductive system, or kidneys; increased risk of cancer",NULL,"Problems with liver, stomach, reproductive system, or kidneys; increased risk of cancer",NULL,NULL
"53","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties",NULL,"Reproductive difficulties",NULL,NULL
"54","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties; increased risk of cancer",NULL,"Reproductive difficulties; increased risk of cancer",NULL,NULL
"55","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties; liver problems; increased risk of cancer",NULL,"Reproductive difficulties; liver problems; increased risk of cancer",NULL,NULL
"56","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Short term exposure: Gastrointestinal distress; Long term exposure: Liver or kidney damage; People with Wilson's Disease should consult their personal doctor if the amount of copper in their water exceeds the action level",NULL,"Short term exposure: Gastrointestinal distress; Long term exposure: Liver or kidney damage; People with Wilson's Disease should consult their personal doctor if the amount of copper in their water exceeds the action level",NULL,NULL
"57","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Skin changes; thymus gland problems; immune deficiencies; reproductive or nervous system difficulties; increased risk of cancer",NULL,"Skin changes; thymus gland problems; immune deficiencies; reproductive or nervous system difficulties; increased risk of cancer",NULL,NULL
"58","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Skin damage or problems with circulatory systems, and may have increased risk of getting cancer",NULL,"Skin damage or problems with circulatory systems, and may have increased risk of getting cancer",NULL,NULL
"59","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Slight nervous system effects",NULL,"Slight nervous system effects",NULL,NULL
"60","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Stomach and intestinal problems",NULL,"Stomach and intestinal problems",NULL,NULL
"61","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Tooth discoloration",NULL,"Tooth discoloration",NULL,NULL
"62","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Turbidity is a measure of the cloudiness of water. It is used to indicate water quality and filtration effectiveness (e.g., whether disease-causing organisms are present). Higher turbidity levels are often associated with higher levels of disease-causing",NULL,"Turbidity is a measure of the cloudiness of water. It is used to indicate water quality and filtration effectiveness (e.g., whether disease-causing organisms are present). Higher turbidity levels are often associated with higher levels of disease-causing ",NULL,NULL
"63","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Weight loss, liver problems, or possible reproductive difficulties.",NULL,"Weight loss, liver problems, or possible reproductive difficulties.",NULL,NULL
"64","0","2006-10-10 14:29:48","2006-10-10 14:29:48","black to brown color; black staining; bitter metallic taste",NULL,"black to brown color; black staining; bitter metallic taste",NULL,NULL
"65","0","2006-10-10 14:29:48","2006-10-10 14:29:48","colored water",NULL,"colored water",NULL,NULL
"66","0","2006-10-10 14:29:48","2006-10-10 14:29:48","frothy, cloudy; bitter taste; odor",NULL,"frothy, cloudy; bitter taste; odor",NULL,NULL
"67","0","2006-10-10 14:29:48","2006-10-10 14:29:48","hardness; deposits; colored water; staining; salty taste",NULL,"hardness; deposits; colored water; staining; salty taste",NULL,NULL
"68","0","2006-10-10 14:29:48","2006-10-10 14:29:48","high pH: slippery feel; soda taste; deposits",NULL,"high pH: slippery feel; soda taste; deposits",NULL,NULL
"69","0","2006-10-10 14:29:48","2006-10-10 14:29:48","low pH: bitter metallic taste; corrosion ",NULL,"low pH: bitter metallic taste; corrosion ",NULL,NULL
"70","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste",NULL,"metallic taste",NULL,NULL
"71","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste; blue-green staining",NULL,"metallic taste; blue-green staining",NULL,NULL
"72","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste; corroded pipes/ fixtures staining",NULL,"metallic taste; corroded pipes/ fixtures staining",NULL,NULL
"73","0","2006-10-10 14:29:48","2006-10-10 14:29:48","rotten-egg, musty or chemical smell",NULL,"rotten-egg, musty or chemical smell",NULL,NULL
"74","0","2006-10-10 14:29:48","2006-10-10 14:29:48","rusty color; sediment; metallic taste; reddish or orange staining",NULL,"rusty color; sediment; metallic taste; reddish or orange staining",NULL,NULL
"75","0","2006-10-10 14:29:48","2006-10-10 14:29:48","salty taste",NULL,"salty taste",NULL,NULL
"76","0","2006-10-10 14:29:48","2006-10-10 14:29:48","skin discoloration; graying of the white part of the eye",NULL,"skin discoloration; graying of the white part of the eye",NULL,NULL
"77","0","2006-10-10 14:29:48","2006-10-10 14:29:48","visible tint",NULL,"visible tint",NULL,NULL

--- NEW FILE: matrix.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="matrix">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="matrix.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="matrix.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: sample_loc.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="sample_loc">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
    <field name="COMPANY_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="sample_loc.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="sample_loc.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: tables.txt ---
# this is list of descriptors for csv2sql utility
# all descriptors have path relative to this file
effect.xml
addr_type.xml
matrix.xml
sample_loc.xml
--- NEW FILE: sample_loc.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID,COMPANY_ID
"1","0","2006-10-10 15:36:36","2006-10-10 15:36:36","AFTER FILTERS","AF",NULL,NULL,NULL
"2","0","2006-10-10 15:36:36","2006-10-10 15:36:36","BEFORE FILTERS","BE",NULL,NULL,NULL
"3","0","2006-10-10 15:36:36","2006-10-10 15:36:36","BETWEEN FILTERS","BT",NULL,NULL,NULL
"4","0","2006-10-10 15:36:36","2006-10-10 15:36:36","TREATMENT SYSTEM - EFFLUENT","EF",NULL,NULL,NULL
"5","0","2006-10-10 15:36:36","2006-10-10 15:36:36","TREATMENT SYSTEM - INFLUENT","IN",NULL,NULL,NULL
"6","0","2006-10-10 15:36:36","2006-10-10 15:36:36","NOT APPLICABLE","NA",NULL,NULL,NULL
"7","0","2006-10-10 15:36:36","2006-10-10 15:36:36","OTHER","O",NULL,NULL,NULL
"8","0","2006-10-10 15:36:36","2006-10-10 15:36:36","OUTSIDE TAP","OT",NULL,NULL,NULL
"9","0","2006-10-10 15:36:36","2006-10-10 15:36:36","PRESSURE TANK","PT",NULL,NULL,NULL
"10","0","2006-10-10 15:36:36","2006-10-10 15:36:36","WELLHEAD","PU",NULL,NULL,NULL
"11","0","2006-10-10 15:36:36","2006-10-10 15:36:36","INSIDE TAP","T",NULL,NULL,NULL
"12","0","2006-10-10 15:36:36","2006-10-10 15:36:36","UNKNOWN","U",NULL,NULL,NULL
"13","0","2006-10-10 15:36:36","2006-10-10 15:36:36","NONE","NONE",NULL,NULL,NULL

--- NEW FILE: addr_type.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID,COMPANY_ID
"1","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Simple Address",NULL,NULL,NULL,NULL
"2","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Secondary address","SADR",NULL,NULL,NULL
"3","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Security service address","sec123123",NULL,NULL,NULL
"4","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Main address","MADR",NULL,NULL,NULL
"10","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Billing","Billing",NULL,NULL,NULL
"11","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Facility","Facility",NULL,NULL,NULL
"12","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Mailing","Mailing",NULL,NULL,NULL
"13","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Office","Office",NULL,NULL,NULL
"14","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Shipping","Shipping",NULL,NULL,NULL

[Csvtosql-cvs] csvtosql_jdk50/examples/test.jdbcbatchwriter - New directory

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.jdbcbatchwriter
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27273/examples/test.jdbcbatchwriter

Log Message:
Directory /cvsroot/csvtosql/csvtosql_jdk50/examples/test.jdbcbatchwriter added to the repository

[Csvtosql-cvs] csvtosql_jdk50/examples/test.jdbcbatchwriter/data - New directory

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.jdbcbatchwriter/data
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27273/examples/test.jdbcbatchwriter/data

Log Message:
Directory /cvsroot/csvtosql/csvtosql_jdk50/examples/test.jdbcbatchwriter/data added to the repository

[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/writers JdbcBatchWriter.java, 1.3, 1.4

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/writers
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26906/src/net/sf/csv2sql/writers

Modified Files:
	JdbcBatchWriter.java 
Log Message:


Index: JdbcBatchWriter.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/writers/JdbcBatchWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JdbcBatchWriter.java	17 Oct 2006 07:07:49 -0000	1.3
--- JdbcBatchWriter.java	17 Oct 2006 07:08:35 -0000	1.4
***************
*** 92,96 ****
              connection = null;
              // check writer parameters
!             HashMap writerParameters = getWriterParameters();
              if (writerParameters != null) {
              	connection = (Connection)writerParameters.get("connection");            	            
--- 92,96 ----
              connection = null;
              // check writer parameters
!             HashMap<String, Object> writerParameters = getWriterParameters();
              if (writerParameters != null) {
              	connection = (Connection)writerParameters.get("connection");            	            

[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/writers JdbcBatchWriter.java, 1.2, 1.3

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/writers
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26539/src/net/sf/csv2sql/writers

Modified Files:
	JdbcBatchWriter.java 
Log Message:


Index: JdbcBatchWriter.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/writers/JdbcBatchWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JdbcBatchWriter.java	6 Apr 2006 14:46:16 -0000	1.2
--- JdbcBatchWriter.java	17 Oct 2006 07:07:49 -0000	1.3
***************
*** 1,18 ****
  /*
!     Copyright (C) 2004  Radovan Sninsky <sn...@po...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.writers;
--- 1,18 ----
  /*
!     Copyright (C) 2006  Ivan Ryndin <jj...@us...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.writers;
***************
*** 31,43 ****
  
  
  /**
   * Load generated statements in a jdbc resource with batch method.
!  * @author <a href="mailto:sn...@bg...">Radovan Sninsky</a>
!  * @version $Revision$, $Date$
!  * @since 1.1
   */
  public class JdbcBatchWriter extends AbstractWriter {
      
!     //mandatory parameters
      String driver;
      String url;
--- 31,44 ----
  
  
+ 
  /**
   * Load generated statements in a jdbc resource with batch method.
!  * Can open connection for every sql statements bundle or use given connection
!  * and don't open new connections.
!  * @author <a href="mailto:jj...@us...">Ivan Ryndin</a>
   */
  public class JdbcBatchWriter extends AbstractWriter {
      
!     //optional parameters
      String driver;
      String url;
***************
*** 50,53 ****
--- 51,57 ----
      File jdbcJar = null;
      
+     Connection connection;
+     boolean useGivenConnection = false;      
+     
      private void init() throws InvalidParameterValueException {
          driver = getWriterProperties().getProperty("driver");
***************
*** 82,91 ****
          String currentSQL = null;
          int sqlIndex = 0;
          try {
!             Connection connection = null;
!             if (jdbcJar!=null) {
!                 connection = DBUtils.openConnection(jdbcJar, driver, url, username, password);
!             } else  {
!                 connection = DBUtils.openConnection(driver, url, username, password);
              }
              
--- 86,105 ----
          String currentSQL = null;
          int sqlIndex = 0;
+         // if connection is set in writer parameters, then use this connection and don't 
+         // open new Connection
+         // else: open new Conneciton         
          try {
!             connection = null;
!             // check writer parameters
!             HashMap writerParameters = getWriterParameters();
!             if (writerParameters != null) {
!             	connection = (Connection)writerParameters.get("connection");            	            
!             }           	
!             if (connection == null) {
!             	if (jdbcJar!=null) {
!             		connection = DBUtils.openConnection(jdbcJar, driver, url, username, password);
!             	} else  {
!             		connection = DBUtils.openConnection(driver, url, username, password);
!             	}
              }
              
***************
*** 129,133 ****
                  }
              } finally {
!                 connection.close();
              }
          } catch (StorageException e) {
--- 143,148 ----
                  }
              } finally {
!             	if (!useGivenConnection)
!             		connection.close();
              }
          } catch (StorageException e) {
***************
*** 145,151 ****
      protected HashMap<String, String> requiredParameterList() {
          HashMap<String, String> hm = new HashMap<String, String>();
-         hm.put("driver","jdbc driver classname.");
-         hm.put("url","jdbc database url.");
-         hm.put("username","jdbc username.");
          hm.put("commitbatchcount","commitbatchcount.");
          return hm;
--- 160,163 ----
***************
*** 154,157 ****
--- 166,173 ----
      protected HashMap<String, String> optionalParameterList() {
          HashMap<String, String> hm = new HashMap<String, String>();
+         hm.put("driver","jdbc driver classname.");
+         hm.put("url","jdbc database url.");
+         hm.put("username","jdbc username.");
+         // 
          hm.put("password","jdbc password.");
          hm.put("commit","true or false. specify the use of transactions.");

[Csvtosql-cvs] csvtosql/examples/test.jdbcbatchwriter readme.txt, NONE, 1.1 runconsole.sh, NONE, 1.1 create_db.sql, NONE, 1.1 runconsole.bat, NONE, 1.1 mysql.jar, NONE, 1.1 build.xml, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql/examples/test.jdbcbatchwriter
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23158/examples/test.jdbcbatchwriter

Added Files:
	readme.txt runconsole.sh create_db.sql runconsole.bat 
	mysql.jar build.xml 
Log Message:


--- NEW FILE: build.xml ---
<!-- 
     Created by Ivan Ryndin <a href="mailto:jj...@us...">
-->

<project name="testcvstosql" default="run">

	<description>
    This ant file helps to run test for next two things: ExtendedConsoleMain frontend and JdbcExtendedBatchWriter writer. 

	What should you do to run test: 

	1) Copy "cvstosql.jar" from "bin" folder to here.
	2) Run ANT.
	</description>

	<property name="db.url" value="jdbc:mysql://localhost/testdb"/>
	<property name="db.user" value="ryndin"/>
	<property name="db.password" value="ryndin"/>
	<property name="db.driver.class" value="com.mysql.jdbc.Driver"/>

	<property name="lib.dir" value="**/../../../lib"/>

	<path id="clp">
		<pathelement location="mysql.jar"/>
		<pathelement location="csvtosql.jar"/>
		<pathelement path="..\..\lib"/>
		<fileset dir="${lib.dir}">
        	<include name="**/*.jar"/>
		</fileset>
	</path>


    <target name="create-db" description="Creates test database. Suitable for MySQL.">

        <sql driver="${db.driver.class}" password="${db.password}" url="${db.url}" userid="${db.user}">
            <classpath refid="clp" />
            <transaction src="create_db.sql"/>
        </sql>
    </target>


    <target name="run" depends="create-db" description="Run test task">

        <java classname="net.sf.csv2sql.frontends.console.ExtendedConsoleMain" fork="true" classpathref="clp">
			<arg line="-d data\tables.txt"/>
            <syspropertyset>
                <propertyref prefix="db." />
            </syspropertyset>
        </java>
    </target>

</project>

--- NEW FILE: runconsole.sh ---
java -classpath csvtosql.jar;mysql.jar;../../lib/commons-cli-1.0.jar -Ddb.url=jdbc:mysql://localhost/testdb -Ddb.user=ryndin -Ddb.password=ryndin -Ddb.driver.class=com.mysql.jdbc.Driver net.sf.csv2sql.frontends.console.ExtendedConsoleMain $1 $2 $3 $4 $5 $6 $7 $8

--- NEW FILE: create_db.sql ---
drop database if exists testdb;
create database testdb character set 'utf8';

use testdb;

    create table ADDR_TYPE (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        COMPANY_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table EFFECT (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        DESCR text,
        CREATOR_ID integer,
        MODIFIER_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table MATRIX (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table SAMPLE_LOC (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        COMPANY_ID integer,
        primary key (ID)
    ) type=InnoDB;


--- NEW FILE: runconsole.bat ---
java -classpath csvtosql.jar;mysql.jar;..\..\lib\commons-cli-1.0.jar -Ddb.url=jdbc:mysql://localhost/testdb -Ddb.user=ryndin -Ddb.password=ryndin -Ddb.driver.class=com.mysql.jdbc.Driver net.sf.csv2sql.frontends.console.ExtendedConsoleMain -d data\tables.txt

--- NEW FILE: mysql.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: readme.txt ---


This test case does testing 
of the ExtendedConsoleMain frontend 
and JdbcBatchMain writer.

What should you do to run test: 

1) Copy "cvstosql.jar" from "bin" folder to here.
2) Execute "create_db.sql" for creating database and its tables. 
   Use MySQL database. It wasn't tested on others databases. But at a glance, 
   all should work well on others databases. You need only to change a little
   "create_db.sql" and XML descriptors  in "data" folder.
3) Run either "runconsole.bat" (or "runconsole.sh") or "build.xml" 
   for running the task with ANT.

[Csvtosql-cvs] csvtosql/examples/test.jdbcbatchwriter/data sample_loc.xml, NONE, 1.1 effect.csv, NONE, 1.1 sample_loc.csv, NONE, 1.1 addr_type.csv, NONE, 1.1 matrix.csv, NONE, 1.1 tables.txt, NONE, 1.1 addr_type.xml, NONE, 1.1 effect.xml, NONE, 1.1 matrix.xml, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql/examples/test.jdbcbatchwriter/data
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23158/examples/test.jdbcbatchwriter/data

Added Files:
	sample_loc.xml effect.csv sample_loc.csv addr_type.csv 
	matrix.csv tables.txt addr_type.xml effect.xml matrix.xml 
Log Message:


--- NEW FILE: matrix.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID
"1","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Soil","SOIL",NULL,NULL
"2","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Air","AIR",NULL,NULL
"3","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Water","WATER",NULL,NULL

--- NEW FILE: effect.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="effect">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="DESCR" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="effect.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="effect.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: addr_type.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="addr_type">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
    <field name="COMPANY_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="addr_type.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="addr_type.sql"/>
    </writerAppender>

            
  </output>
</root>


--- NEW FILE: effect.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,DESCR,CREATOR_ID,MODIFIER_ID
"1","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Allergic dermatitis",NULL,"Allergic dermatitis",NULL,NULL
"2","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; decrease in blood platelets; increased risk of cancer",NULL,"Anemia; decrease in blood platelets; increased risk of cancer",NULL,NULL
"3","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; infants & young children: nervous system effects",NULL,"Anemia; infants & young children: nervous system effects",NULL,NULL
"4","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; liver, kidney or spleen damage; changes in blood",NULL,"Anemia; liver, kidney or spleen damage; changes in blood",NULL,NULL
"5","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Bone disease (pain and tenderness of the bones); Children may get mottled teeth",NULL,"Bone disease (pain and tenderness of the bones); Children may get mottled teeth",NULL,NULL
"6","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Cardiovascular system or reproductive problems",NULL,"Cardiovascular system or reproductive problems",NULL,NULL
"7","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Cataracts",NULL,"Cataracts",NULL,NULL
"8","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Changes in adrenal glands",NULL,"Changes in adrenal glands",NULL,NULL
"9","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye, liver, kidney or spleen problems; anemia; increased risk of cancer",NULL,"Eye, liver, kidney or spleen problems; anemia; increased risk of cancer",NULL,NULL
"10","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye/nose irritation; stomach discomfort",NULL,"Eye/nose irritation; stomach discomfort",NULL,NULL
"11","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye/nose irritation; stomach discomfort, anemia",NULL,"Eye/nose irritation; stomach discomfort, anemia",NULL,NULL
"12","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Gastrointestinal illness (e.g., diarrhea, vomiting, cramps)",NULL,"Gastrointestinal illness (e.g., diarrhea, vomiting, cramps)",NULL,NULL
"13","0","2006-10-10 14:29:48","2006-10-10 14:29:48","HPC has no health effects; it is an analytic method used to measure the variety of bacteria that are common in water. The lower the concentration of bacteria in drinking water, the better maintained the water system is.",NULL,"HPC has no health effects; it is an analytic method used to measure the variety of bacteria that are common in water. The lower the concentration of bacteria in drinking water, the better maintained the water system is.",NULL,NULL
"14","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Hair loss; changes in blood; kidney, intestine, or liver problems",NULL,"Hair loss; changes in blood; kidney, intestine, or liver problems",NULL,NULL
"15","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Hair or fingernail loss; numbness in fingers or toes; circulatory problems",NULL,"Hair or fingernail loss; numbness in fingers or toes; circulatory problems",NULL,NULL
"16","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increase in blood cholesterol; decrease in blood sugar",NULL,"Increase in blood cholesterol; decrease in blood sugar",NULL,NULL
"17","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increase in blood pressure",NULL,"Increase in blood pressure",NULL,NULL
"18","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased cancer risk, and over a long period of time, stomach problems",NULL,"Increased cancer risk, and over a long period of time, stomach problems",NULL,NULL
"19","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of cancer",NULL,"Increased risk of cancer",NULL,NULL
"20","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of cancer, kidney toxicity",NULL,"Increased risk of cancer, kidney toxicity",NULL,NULL
"21","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of developing benign intestinal polyps",NULL,"Increased risk of developing benign intestinal polyps",NULL,NULL
"22","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants and children: Delays in physical or mental development; children could show slight deficits in attention span and learning abilities; Adults: Kidney problems; high blood pressure",NULL,"Infants and children: Delays in physical or mental development; children could show slight deficits in attention span and learning abilities; Adults: Kidney problems; high blood pressure",NULL,NULL
"23","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants below the age of six months who drink water containing nitrate in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,"Infants below the age of six months who drink water containing nitrate in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,NULL
"24","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants below the age of six months who drink water containing nitrite in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,"Infants below the age of six months who drink water containing nitrite in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,NULL
"25","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Intestinal lesions",NULL,"Intestinal lesions",NULL,NULL
"26","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney damage",NULL,"Kidney damage",NULL,NULL
"27","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney or stomach problems",NULL,"Kidney or stomach problems",NULL,NULL
"28","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney problems; reproductive difficulties",NULL,"Kidney problems; reproductive difficulties",NULL,NULL
"29","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney, liver, or adrenal gland problems",NULL,"Kidney, liver, or adrenal gland problems",NULL,NULL
"30","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney, liver, or thyroid problems; increased risk of cancer",NULL,"Kidney, liver, or thyroid problems; increased risk of cancer",NULL,NULL
"31","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Legionnaire's Disease, a type of pneumonia",NULL,"Legionnaire's Disease, a type of pneumonia",NULL,NULL
"32","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver damage; increased risk of cancer",NULL,"Liver damage; increased risk of cancer",NULL,NULL
"33","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems",NULL,"Liver or kidney problems",NULL,NULL
"34","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems; increased cancer risk",NULL,"Liver or kidney problems; increased cancer risk",NULL,NULL
"35","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems; reproductive difficulties; increased risk of cancer",NULL,"Liver or kidney problems; reproductive difficulties; increased risk of cancer",NULL,NULL
"36","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidneys problems",NULL,"Liver or kidneys problems",NULL,NULL
"37","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or nervous system problems; increased risk of cancer",NULL,"Liver or nervous system problems; increased risk of cancer",NULL,NULL
"38","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver problems",NULL,"Liver problems",NULL,NULL
"39","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver problems; increased risk of cancer",NULL,"Liver problems; increased risk of cancer",NULL,NULL
"40","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney or central nervous system problems; increased risk of cancer",NULL,"Liver, kidney or central nervous system problems; increased risk of cancer",NULL,NULL
"41","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney, or circulatory system problems",NULL,"Liver, kidney, or circulatory system problems",NULL,NULL
"42","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney, or immune system problems",NULL,"Liver, kidney, or immune system problems",NULL,NULL
"43","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, nervous system, or circulatory problems",NULL,"Liver, nervous system, or circulatory problems",NULL,NULL
"44","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Minor kidney changes",NULL,"Minor kidney changes",NULL,NULL
"45","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nerve damage or thyroid problems",NULL,"Nerve damage or thyroid problems",NULL,NULL
"46","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system damage",NULL,"Nervous system damage",NULL,NULL
"47","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system or blood problems; increased risk of cancer",NULL,"Nervous system or blood problems; increased risk of cancer",NULL,NULL
"48","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system, kidney, or liver problems",NULL,"Nervous system, kidney, or liver problems",NULL,NULL
"49","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Not a health threat in itself; it is used to indicate whether other potentially harmful bacteria may be present",NULL,"Not a health threat in itself; it is used to indicate whether other potentially harmful bacteria may be present",NULL,NULL
"50","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with blood",NULL,"Problems with blood",NULL,NULL
"51","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with blood, nervous system, or reproductive system",NULL,"Problems with blood, nervous system, or reproductive system",NULL,NULL
"52","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with liver, stomach, reproductive system, or kidneys; increased risk of cancer",NULL,"Problems with liver, stomach, reproductive system, or kidneys; increased risk of cancer",NULL,NULL
"53","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties",NULL,"Reproductive difficulties",NULL,NULL
"54","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties; increased risk of cancer",NULL,"Reproductive difficulties; increased risk of cancer",NULL,NULL
"55","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties; liver problems; increased risk of cancer",NULL,"Reproductive difficulties; liver problems; increased risk of cancer",NULL,NULL
"56","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Short term exposure: Gastrointestinal distress; Long term exposure: Liver or kidney damage; People with Wilson's Disease should consult their personal doctor if the amount of copper in their water exceeds the action level",NULL,"Short term exposure: Gastrointestinal distress; Long term exposure: Liver or kidney damage; People with Wilson's Disease should consult their personal doctor if the amount of copper in their water exceeds the action level",NULL,NULL
"57","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Skin changes; thymus gland problems; immune deficiencies; reproductive or nervous system difficulties; increased risk of cancer",NULL,"Skin changes; thymus gland problems; immune deficiencies; reproductive or nervous system difficulties; increased risk of cancer",NULL,NULL
"58","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Skin damage or problems with circulatory systems, and may have increased risk of getting cancer",NULL,"Skin damage or problems with circulatory systems, and may have increased risk of getting cancer",NULL,NULL
"59","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Slight nervous system effects",NULL,"Slight nervous system effects",NULL,NULL
"60","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Stomach and intestinal problems",NULL,"Stomach and intestinal problems",NULL,NULL
"61","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Tooth discoloration",NULL,"Tooth discoloration",NULL,NULL
"62","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Turbidity is a measure of the cloudiness of water. It is used to indicate water quality and filtration effectiveness (e.g., whether disease-causing organisms are present). Higher turbidity levels are often associated with higher levels of disease-causing",NULL,"Turbidity is a measure of the cloudiness of water. It is used to indicate water quality and filtration effectiveness (e.g., whether disease-causing organisms are present). Higher turbidity levels are often associated with higher levels of disease-causing ",NULL,NULL
"63","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Weight loss, liver problems, or possible reproductive difficulties.",NULL,"Weight loss, liver problems, or possible reproductive difficulties.",NULL,NULL
"64","0","2006-10-10 14:29:48","2006-10-10 14:29:48","black to brown color; black staining; bitter metallic taste",NULL,"black to brown color; black staining; bitter metallic taste",NULL,NULL
"65","0","2006-10-10 14:29:48","2006-10-10 14:29:48","colored water",NULL,"colored water",NULL,NULL
"66","0","2006-10-10 14:29:48","2006-10-10 14:29:48","frothy, cloudy; bitter taste; odor",NULL,"frothy, cloudy; bitter taste; odor",NULL,NULL
"67","0","2006-10-10 14:29:48","2006-10-10 14:29:48","hardness; deposits; colored water; staining; salty taste",NULL,"hardness; deposits; colored water; staining; salty taste",NULL,NULL
"68","0","2006-10-10 14:29:48","2006-10-10 14:29:48","high pH: slippery feel; soda taste; deposits",NULL,"high pH: slippery feel; soda taste; deposits",NULL,NULL
"69","0","2006-10-10 14:29:48","2006-10-10 14:29:48","low pH: bitter metallic taste; corrosion ",NULL,"low pH: bitter metallic taste; corrosion ",NULL,NULL
"70","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste",NULL,"metallic taste",NULL,NULL
"71","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste; blue-green staining",NULL,"metallic taste; blue-green staining",NULL,NULL
"72","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste; corroded pipes/ fixtures staining",NULL,"metallic taste; corroded pipes/ fixtures staining",NULL,NULL
"73","0","2006-10-10 14:29:48","2006-10-10 14:29:48","rotten-egg, musty or chemical smell",NULL,"rotten-egg, musty or chemical smell",NULL,NULL
"74","0","2006-10-10 14:29:48","2006-10-10 14:29:48","rusty color; sediment; metallic taste; reddish or orange staining",NULL,"rusty color; sediment; metallic taste; reddish or orange staining",NULL,NULL
"75","0","2006-10-10 14:29:48","2006-10-10 14:29:48","salty taste",NULL,"salty taste",NULL,NULL
"76","0","2006-10-10 14:29:48","2006-10-10 14:29:48","skin discoloration; graying of the white part of the eye",NULL,"skin discoloration; graying of the white part of the eye",NULL,NULL
"77","0","2006-10-10 14:29:48","2006-10-10 14:29:48","visible tint",NULL,"visible tint",NULL,NULL

--- NEW FILE: matrix.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="matrix">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="matrix.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="matrix.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: sample_loc.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="sample_loc">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
    <field name="COMPANY_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="sample_loc.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="sample_loc.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: tables.txt ---
# this is list of descriptors for csv2sql utility
# all descriptors have path relative to this file
effect.xml
addr_type.xml
matrix.xml
sample_loc.xml
--- NEW FILE: sample_loc.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID,COMPANY_ID
"1","0","2006-10-10 15:36:36","2006-10-10 15:36:36","AFTER FILTERS","AF",NULL,NULL,NULL
"2","0","2006-10-10 15:36:36","2006-10-10 15:36:36","BEFORE FILTERS","BE",NULL,NULL,NULL
"3","0","2006-10-10 15:36:36","2006-10-10 15:36:36","BETWEEN FILTERS","BT",NULL,NULL,NULL
"4","0","2006-10-10 15:36:36","2006-10-10 15:36:36","TREATMENT SYSTEM - EFFLUENT","EF",NULL,NULL,NULL
"5","0","2006-10-10 15:36:36","2006-10-10 15:36:36","TREATMENT SYSTEM - INFLUENT","IN",NULL,NULL,NULL
"6","0","2006-10-10 15:36:36","2006-10-10 15:36:36","NOT APPLICABLE","NA",NULL,NULL,NULL
"7","0","2006-10-10 15:36:36","2006-10-10 15:36:36","OTHER","O",NULL,NULL,NULL
"8","0","2006-10-10 15:36:36","2006-10-10 15:36:36","OUTSIDE TAP","OT",NULL,NULL,NULL
"9","0","2006-10-10 15:36:36","2006-10-10 15:36:36","PRESSURE TANK","PT",NULL,NULL,NULL
"10","0","2006-10-10 15:36:36","2006-10-10 15:36:36","WELLHEAD","PU",NULL,NULL,NULL
"11","0","2006-10-10 15:36:36","2006-10-10 15:36:36","INSIDE TAP","T",NULL,NULL,NULL
"12","0","2006-10-10 15:36:36","2006-10-10 15:36:36","UNKNOWN","U",NULL,NULL,NULL
"13","0","2006-10-10 15:36:36","2006-10-10 15:36:36","NONE","NONE",NULL,NULL,NULL

--- NEW FILE: addr_type.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID,COMPANY_ID
"1","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Simple Address",NULL,NULL,NULL,NULL
"2","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Secondary address","SADR",NULL,NULL,NULL
"3","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Security service address","sec123123",NULL,NULL,NULL
"4","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Main address","MADR",NULL,NULL,NULL
"10","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Billing","Billing",NULL,NULL,NULL
"11","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Facility","Facility",NULL,NULL,NULL
"12","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Mailing","Mailing",NULL,NULL,NULL
"13","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Office","Office",NULL,NULL,NULL
"14","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Shipping","Shipping",NULL,NULL,NULL

[Csvtosql-cvs] csvtosql/examples/test.jdbcbatchwriter - New directory

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

Update of /cvsroot/csvtosql/csvtosql/examples/test.jdbcbatchwriter
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23101/examples/test.jdbcbatchwriter

Log Message:
Directory /cvsroot/csvtosql/csvtosql/examples/test.jdbcbatchwriter added to the repository

[Csvtosql-cvs] csvtosql/examples/test.jdbcbatchwriter/data - New directory

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

Update of /cvsroot/csvtosql/csvtosql/examples/test.jdbcbatchwriter/data
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23101/examples/test.jdbcbatchwriter/data

Log Message:
Directory /cvsroot/csvtosql/csvtosql/examples/test.jdbcbatchwriter/data added to the repository

[Csvtosql-cvs] csvtosql/src/net/sf/csv2sql/writers JdbcBatchWriter.java, 1.22, 1.23

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

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

Modified Files:
	JdbcBatchWriter.java 
Log Message:


Index: JdbcBatchWriter.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql/src/net/sf/csv2sql/writers/JdbcBatchWriter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JdbcBatchWriter.java	12 Mar 2005 11:29:22 -0000	1.22
--- JdbcBatchWriter.java	17 Oct 2006 06:52:38 -0000	1.23
***************
*** 1,18 ****
  /*
!     Copyright (C) 2004  Radovan Sninsky <sn...@po...>
   
!     This program is free software; you can redistribute it and/or modify
!     it under the terms of the GNU General Public License as published by
!     the Free Software Foundation; either version 2 of the License, or
!     (at your option) any later version.
   
!     This program is distributed in the hope that it will be useful,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!     GNU General Public License for more details.
   
!     You should have received a copy of the GNU General Public License
!     along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  package net.sf.csv2sql.writers;
--- 1,18 ----
  /*
!     Copyright (C) 2006  Ivan Ryndin <jj...@us...>
   
! This library is free software; you can redistribute it and/or
! modify it under the terms of the GNU Lesser General Public
! License as published by the Free Software Foundation; either
! version 2.1 of the License, or (at your option) any later version.
   
! This library is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! Lesser General Public License for more details.
   
! You should have received a copy of the GNU Lesser General Public
! License along with this library; if not, write to the Free Software
! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  package net.sf.csv2sql.writers;
***************
*** 32,42 ****
  /**
   * Load generated statements in a jdbc resource with batch method.
!  * @author <a href="mailto:sn...@bg...">Radovan Sninsky</a>
!  * @version $Revision$, $Date$
!  * @since 1.1
   */
  public class JdbcBatchWriter extends AbstractWriter {
      
!     //mandatory parameters
      String driver;
      String url;
--- 32,42 ----
  /**
   * Load generated statements in a jdbc resource with batch method.
!  * Can open connection for every sql statements bundle or use given connection
!  * and don't open new connections.
!  * @author <a href="mailto:jj...@us...">Ivan Ryndin</a>
   */
  public class JdbcBatchWriter extends AbstractWriter {
      
!     //optional parameters
      String driver;
      String url;
***************
*** 49,52 ****
--- 49,55 ----
      File jdbcJar = null;
      
+     Connection connection;
+     boolean useGivenConnection = false;    
+     
      private void init() throws InvalidParameterValueException {
          driver = getWriterProperties().getProperty("driver");
***************
*** 81,90 ****
          String currentSQL = null;
          int sqlIndex = 0;
          try {
!             Connection connection = null;
!             if (jdbcJar!=null) {
!                 connection = DBUtils.openConnection(jdbcJar, driver, url, username, password);
!             } else  {
!                 connection = DBUtils.openConnection(driver, url, username, password);
              }
              
--- 84,107 ----
          String currentSQL = null;
          int sqlIndex = 0;
+         // if connection is set in writer parameters, then use this connection and don't 
+         // open new Connection
+         // else: open new Conneciton
          try {
!             connection = null;
!             // check writer parameters
!             HashMap writerParameters = getWriterParameters();
!             if (writerParameters != null) {
!             	connection = (Connection)writerParameters.get("connection");            	            
!             }   
!             if (connection==null) {
!             	if (jdbcJar!=null) {
!             		connection = DBUtils.openConnection(jdbcJar, driver, url, username, password);
!             	} else  {
!             		connection = DBUtils.openConnection(driver, url, username, password);
!             	}
!             } else {
!             	// set flag that we use given connection
!             	// and it is not required to close in in the finally block
!             	useGivenConnection = true;
              }
              
***************
*** 128,132 ****
                  }
              } finally {
!                 connection.close();
              }
          } catch (StorageException e) {
--- 145,150 ----
                  }
              } finally {
!             	if (!useGivenConnection)
!             		connection.close();
              }
          } catch (StorageException e) {
***************
*** 144,150 ****
      protected HashMap requiredParameterList() {
          HashMap hm = new HashMap();
-         hm.put("driver","jdbc driver classname.");
-         hm.put("url","jdbc database url.");
-         hm.put("username","jdbc username.");
          hm.put("commitbatchcount","commitbatchcount.");
          return hm;
--- 162,165 ----
***************
*** 153,156 ****
--- 168,175 ----
      protected HashMap optionalParameterList() {
          HashMap hm = new HashMap();
+         hm.put("driver","jdbc driver classname.");
+         hm.put("url","jdbc database url.");
+         hm.put("username","jdbc username.");
+         //
          hm.put("password","jdbc password.");
          hm.put("commit","true or false. specify the use of transactions.");
***************
*** 158,162 ****
          hm.put("batchcount","batchcount.");
          return hm;
!     }
!     
  }
--- 177,180 ----
          hm.put("batchcount","batchcount.");
          return hm;
!     }    
  }

[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/frontends/console ExtendedConsoleMain.java, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/frontends/console
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27284/src/net/sf/csv2sql/frontends/console

Added Files:
	ExtendedConsoleMain.java 
Log Message:


--- NEW FILE: ExtendedConsoleMain.java ---
/*
    Copyright (C) 2006  Ivan Ryndin <jj...@us...>
 
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
 
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.
 
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
 */
package net.sf.csv2sql.frontends.console;

import java.io.File;
import java.io.FileReader;
import java.io.BufferedReader;
import java.util.List;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.HashMap;
import java.sql.Connection;
import net.sf.csv2sql.configuration.XmlConfigurator;
import net.sf.csv2sql.writers.AbstractWriter;
import net.sf.csv2sql.utils.DBUtils;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;

/**
 * csv2sql extended console frontends
 * It is used when need to export data from several files into single database. It is not 
 * good to open and close connection every time when processing new file. So, this frontend
 * opens the one connection to database and pass it as a parameter to each writer, so that this
 * single connection is used by all the files processors. 
 * <p>Parameters necessary for opening of the 
 * connection are passed as system properties to this frontend. These params are:
 * <ul>
 * <li> db.url - URL of the database
 * <li> db.user - User name of the database
 * <li> db.password - Password 
 * <li> db.driver.class- Class of the database driver. For example, "com.mysql.jdbc.Driver".
 * </ul>   
 * @author <a href="mailto:jj...@us...">Ivan Ryndin</a>
 */
public class ExtendedConsoleMain {
    
    private static ExtendedConsoleMain self = new ExtendedConsoleMain();
    
    /**
     * singleton pattern
     * return THE istance of main
     * @return istance of ExtendedConsoleMain
     */    
    public static ExtendedConsoleMain getInstance() { return self; }
    
    /**
     * Prints usage information to Console. 
     */
    private static String usage() {
        return "  Usage: csv2sql -d filename [-b]\n\n"+
        "  --descriptor       [-d]    file containing conversion descriptor\n"+
        "  --help             [-h]    display this help\n";
    }
    
    /**
     * Prints version information to Console.
     */
    private static String version() {
        return "csv2sql, Copyright (C) 2004 Davide Consonni <dco...@en...>\n"+
        "Convert a csv file in sql file\n\n";
    }
    
    /**
     * business logic
     * @param descriptor point to conversion descriptor file
     * @param connection Connection to database used by the writers 
     * @throws Exception if any error occured
     */    
    public void run(File descriptor, Connection connection) throws Exception {
        //read configuration
        XmlConfigurator config = new XmlConfigurator();
        config.load(descriptor);
        
        if (config.CURRENT_DESCRIPTOR_VERSION != config.getDescriptorVersion()) {
            throw new Exception("version mismatch");
        }
        
        //generate statements        
        config.getRender().render();
        
        //output statements        
        Iterator it = config.getWriters().iterator();
        HashMap<String, Object> params = new HashMap<String, Object>();
        params.put("connection",connection);
        while (it.hasNext()) {
            AbstractWriter writer = (AbstractWriter)it.next();
            writer.setWriterParameters(params);
            writer.write();
        }        
    }
        
    /**
     * program entry point
     * @param args argument list
     */    
    public static void main(String args []) {
        try {
            
            CommandLineParser parser = new PosixParser();
            
            Options options = new Options();
            options.addOption( "d", "descriptor", true, "descriptor file");
            options.addOption( "h", "help", false, "display help" );                        
            
            CommandLine line = parser.parse( options, args );
            
            //no arguments ? no party.
            if (args.length <= 0) {
                System.out.println(version());
                System.out.println(usage());
                System.exit(1);
            }
            
            //display version
            if( line.hasOption( "h" ) ) {
                System.out.println(version());
                System.out.println(usage());
                System.exit(0);
            }
                        
            ArrayList<String> files = new ArrayList<String>();            
            String pathPart = "";
            //read filename, open file and store filenames of descriptors
            if( line.hasOption( "d" ) ) {
            	try {
            		String fileName = line.getOptionValue("d");
        		    pathPart = fileName.substring(0,fileName.lastIndexOf(File.separator))+File.separator;
        			BufferedReader in = new BufferedReader(new FileReader(fileName));
        			String s;
        			while((s = in.readLine())!= null) {
        				s = s.trim();
        				// # - this signals the beginning of the comment in the input file
        				if (s.length()==0 || s.startsWith("#")) continue;
        				files.add(s);
        			}
        			in.close();
            	} catch (Exception e) {
            		e.printStackTrace();
            		System.exit(1);
            	}               	
                
            } else {
                System.out.println(version());
                System.out.println(usage());
                System.out.println("ERROR: option --descriptor is mandatory.\n");
                System.exit(1);
            }            

            // connect to database
            Connection connection = null;
            try {
//            	start benchmark
            	long start = System.currentTimeMillis();
            	String dbUrl = System.getProperty("db.url");
            	String dbUser = System.getProperty("db.user");
            	String dbPassword = System.getProperty("db.password");
            	String dbDriverClass = System.getProperty("db.driver.class");
            	connection = DBUtils.openConnection(dbDriverClass,dbUrl,dbUser,dbPassword);
            	for (int i=0; i<files.size(); i++) {
            		String fileName = pathPart + files.get(i);
            		System.out.print("Processing file: " + fileName);
            		File descriptor = new File(fileName);
            		ExtendedConsoleMain.getInstance().run(descriptor,connection);
            		System.out.println("  ............ OK");
            	}
            	System.out.println("\nCsv converted in: "+String.valueOf(System.currentTimeMillis()-start)+" ms");
            } finally {
            	DBUtils.closeConnection(connection);
            }            
        } catch( Exception e ) {
            e.printStackTrace();
        }        
    }    
}

[Csvtosql-cvs] csvtosql_jdk50/examples/test.extended.features/data sample_loc.xml, NONE, 1.1 matrix.csv, NONE, 1.1 matrix.xml, NONE, 1.1 effect.xml, NONE, 1.1 effect.csv, NONE, 1.1 addr_type.csv, NONE, 1.1 addr_type.xml, NONE, 1.1 sample_loc.csv, NONE, 1.1 tables.txt, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.extended.features/data
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24036/examples/test.extended.features/data

Added Files:
	sample_loc.xml matrix.csv matrix.xml effect.xml effect.csv 
	addr_type.csv addr_type.xml sample_loc.csv tables.txt 
Log Message:
test for extened features

--- NEW FILE: matrix.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID
"1","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Soil","SOIL",NULL,NULL
"2","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Air","AIR",NULL,NULL
"3","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Water","WATER",NULL,NULL

--- NEW FILE: effect.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="effect">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="DESCR" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="effect.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcExtendedBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="effect.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: addr_type.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="addr_type">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
    <field name="COMPANY_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="addr_type.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcExtendedBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="addr_type.sql"/>
    </writerAppender>

            
  </output>
</root>


--- NEW FILE: effect.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,DESCR,CREATOR_ID,MODIFIER_ID
"1","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Allergic dermatitis",NULL,"Allergic dermatitis",NULL,NULL
"2","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; decrease in blood platelets; increased risk of cancer",NULL,"Anemia; decrease in blood platelets; increased risk of cancer",NULL,NULL
"3","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; infants & young children: nervous system effects",NULL,"Anemia; infants & young children: nervous system effects",NULL,NULL
"4","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Anemia; liver, kidney or spleen damage; changes in blood",NULL,"Anemia; liver, kidney or spleen damage; changes in blood",NULL,NULL
"5","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Bone disease (pain and tenderness of the bones); Children may get mottled teeth",NULL,"Bone disease (pain and tenderness of the bones); Children may get mottled teeth",NULL,NULL
"6","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Cardiovascular system or reproductive problems",NULL,"Cardiovascular system or reproductive problems",NULL,NULL
"7","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Cataracts",NULL,"Cataracts",NULL,NULL
"8","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Changes in adrenal glands",NULL,"Changes in adrenal glands",NULL,NULL
"9","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye, liver, kidney or spleen problems; anemia; increased risk of cancer",NULL,"Eye, liver, kidney or spleen problems; anemia; increased risk of cancer",NULL,NULL
"10","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye/nose irritation; stomach discomfort",NULL,"Eye/nose irritation; stomach discomfort",NULL,NULL
"11","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Eye/nose irritation; stomach discomfort, anemia",NULL,"Eye/nose irritation; stomach discomfort, anemia",NULL,NULL
"12","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Gastrointestinal illness (e.g., diarrhea, vomiting, cramps)",NULL,"Gastrointestinal illness (e.g., diarrhea, vomiting, cramps)",NULL,NULL
"13","0","2006-10-10 14:29:48","2006-10-10 14:29:48","HPC has no health effects; it is an analytic method used to measure the variety of bacteria that are common in water. The lower the concentration of bacteria in drinking water, the better maintained the water system is.",NULL,"HPC has no health effects; it is an analytic method used to measure the variety of bacteria that are common in water. The lower the concentration of bacteria in drinking water, the better maintained the water system is.",NULL,NULL
"14","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Hair loss; changes in blood; kidney, intestine, or liver problems",NULL,"Hair loss; changes in blood; kidney, intestine, or liver problems",NULL,NULL
"15","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Hair or fingernail loss; numbness in fingers or toes; circulatory problems",NULL,"Hair or fingernail loss; numbness in fingers or toes; circulatory problems",NULL,NULL
"16","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increase in blood cholesterol; decrease in blood sugar",NULL,"Increase in blood cholesterol; decrease in blood sugar",NULL,NULL
"17","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increase in blood pressure",NULL,"Increase in blood pressure",NULL,NULL
"18","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased cancer risk, and over a long period of time, stomach problems",NULL,"Increased cancer risk, and over a long period of time, stomach problems",NULL,NULL
"19","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of cancer",NULL,"Increased risk of cancer",NULL,NULL
"20","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of cancer, kidney toxicity",NULL,"Increased risk of cancer, kidney toxicity",NULL,NULL
"21","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Increased risk of developing benign intestinal polyps",NULL,"Increased risk of developing benign intestinal polyps",NULL,NULL
"22","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants and children: Delays in physical or mental development; children could show slight deficits in attention span and learning abilities; Adults: Kidney problems; high blood pressure",NULL,"Infants and children: Delays in physical or mental development; children could show slight deficits in attention span and learning abilities; Adults: Kidney problems; high blood pressure",NULL,NULL
"23","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants below the age of six months who drink water containing nitrate in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,"Infants below the age of six months who drink water containing nitrate in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,NULL
"24","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Infants below the age of six months who drink water containing nitrite in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,"Infants below the age of six months who drink water containing nitrite in excess of the MCL could become seriously ill and, if untreated, may die. Symptoms include shortness of breath and blue-baby syndrome.",NULL,NULL
"25","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Intestinal lesions",NULL,"Intestinal lesions",NULL,NULL
"26","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney damage",NULL,"Kidney damage",NULL,NULL
"27","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney or stomach problems",NULL,"Kidney or stomach problems",NULL,NULL
"28","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney problems; reproductive difficulties",NULL,"Kidney problems; reproductive difficulties",NULL,NULL
"29","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney, liver, or adrenal gland problems",NULL,"Kidney, liver, or adrenal gland problems",NULL,NULL
"30","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Kidney, liver, or thyroid problems; increased risk of cancer",NULL,"Kidney, liver, or thyroid problems; increased risk of cancer",NULL,NULL
"31","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Legionnaire's Disease, a type of pneumonia",NULL,"Legionnaire's Disease, a type of pneumonia",NULL,NULL
"32","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver damage; increased risk of cancer",NULL,"Liver damage; increased risk of cancer",NULL,NULL
"33","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems",NULL,"Liver or kidney problems",NULL,NULL
"34","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems; increased cancer risk",NULL,"Liver or kidney problems; increased cancer risk",NULL,NULL
"35","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidney problems; reproductive difficulties; increased risk of cancer",NULL,"Liver or kidney problems; reproductive difficulties; increased risk of cancer",NULL,NULL
"36","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or kidneys problems",NULL,"Liver or kidneys problems",NULL,NULL
"37","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver or nervous system problems; increased risk of cancer",NULL,"Liver or nervous system problems; increased risk of cancer",NULL,NULL
"38","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver problems",NULL,"Liver problems",NULL,NULL
"39","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver problems; increased risk of cancer",NULL,"Liver problems; increased risk of cancer",NULL,NULL
"40","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney or central nervous system problems; increased risk of cancer",NULL,"Liver, kidney or central nervous system problems; increased risk of cancer",NULL,NULL
"41","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney, or circulatory system problems",NULL,"Liver, kidney, or circulatory system problems",NULL,NULL
"42","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, kidney, or immune system problems",NULL,"Liver, kidney, or immune system problems",NULL,NULL
"43","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Liver, nervous system, or circulatory problems",NULL,"Liver, nervous system, or circulatory problems",NULL,NULL
"44","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Minor kidney changes",NULL,"Minor kidney changes",NULL,NULL
"45","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nerve damage or thyroid problems",NULL,"Nerve damage or thyroid problems",NULL,NULL
"46","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system damage",NULL,"Nervous system damage",NULL,NULL
"47","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system or blood problems; increased risk of cancer",NULL,"Nervous system or blood problems; increased risk of cancer",NULL,NULL
"48","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Nervous system, kidney, or liver problems",NULL,"Nervous system, kidney, or liver problems",NULL,NULL
"49","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Not a health threat in itself; it is used to indicate whether other potentially harmful bacteria may be present",NULL,"Not a health threat in itself; it is used to indicate whether other potentially harmful bacteria may be present",NULL,NULL
"50","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with blood",NULL,"Problems with blood",NULL,NULL
"51","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with blood, nervous system, or reproductive system",NULL,"Problems with blood, nervous system, or reproductive system",NULL,NULL
"52","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Problems with liver, stomach, reproductive system, or kidneys; increased risk of cancer",NULL,"Problems with liver, stomach, reproductive system, or kidneys; increased risk of cancer",NULL,NULL
"53","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties",NULL,"Reproductive difficulties",NULL,NULL
"54","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties; increased risk of cancer",NULL,"Reproductive difficulties; increased risk of cancer",NULL,NULL
"55","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Reproductive difficulties; liver problems; increased risk of cancer",NULL,"Reproductive difficulties; liver problems; increased risk of cancer",NULL,NULL
"56","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Short term exposure: Gastrointestinal distress; Long term exposure: Liver or kidney damage; People with Wilson's Disease should consult their personal doctor if the amount of copper in their water exceeds the action level",NULL,"Short term exposure: Gastrointestinal distress; Long term exposure: Liver or kidney damage; People with Wilson's Disease should consult their personal doctor if the amount of copper in their water exceeds the action level",NULL,NULL
"57","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Skin changes; thymus gland problems; immune deficiencies; reproductive or nervous system difficulties; increased risk of cancer",NULL,"Skin changes; thymus gland problems; immune deficiencies; reproductive or nervous system difficulties; increased risk of cancer",NULL,NULL
"58","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Skin damage or problems with circulatory systems, and may have increased risk of getting cancer",NULL,"Skin damage or problems with circulatory systems, and may have increased risk of getting cancer",NULL,NULL
"59","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Slight nervous system effects",NULL,"Slight nervous system effects",NULL,NULL
"60","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Stomach and intestinal problems",NULL,"Stomach and intestinal problems",NULL,NULL
"61","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Tooth discoloration",NULL,"Tooth discoloration",NULL,NULL
"62","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Turbidity is a measure of the cloudiness of water. It is used to indicate water quality and filtration effectiveness (e.g., whether disease-causing organisms are present). Higher turbidity levels are often associated with higher levels of disease-causing",NULL,"Turbidity is a measure of the cloudiness of water. It is used to indicate water quality and filtration effectiveness (e.g., whether disease-causing organisms are present). Higher turbidity levels are often associated with higher levels of disease-causing ",NULL,NULL
"63","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Weight loss, liver problems, or possible reproductive difficulties.",NULL,"Weight loss, liver problems, or possible reproductive difficulties.",NULL,NULL
"64","0","2006-10-10 14:29:48","2006-10-10 14:29:48","black to brown color; black staining; bitter metallic taste",NULL,"black to brown color; black staining; bitter metallic taste",NULL,NULL
"65","0","2006-10-10 14:29:48","2006-10-10 14:29:48","colored water",NULL,"colored water",NULL,NULL
"66","0","2006-10-10 14:29:48","2006-10-10 14:29:48","frothy, cloudy; bitter taste; odor",NULL,"frothy, cloudy; bitter taste; odor",NULL,NULL
"67","0","2006-10-10 14:29:48","2006-10-10 14:29:48","hardness; deposits; colored water; staining; salty taste",NULL,"hardness; deposits; colored water; staining; salty taste",NULL,NULL
"68","0","2006-10-10 14:29:48","2006-10-10 14:29:48","high pH: slippery feel; soda taste; deposits",NULL,"high pH: slippery feel; soda taste; deposits",NULL,NULL
"69","0","2006-10-10 14:29:48","2006-10-10 14:29:48","low pH: bitter metallic taste; corrosion ",NULL,"low pH: bitter metallic taste; corrosion ",NULL,NULL
"70","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste",NULL,"metallic taste",NULL,NULL
"71","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste; blue-green staining",NULL,"metallic taste; blue-green staining",NULL,NULL
"72","0","2006-10-10 14:29:48","2006-10-10 14:29:48","metallic taste; corroded pipes/ fixtures staining",NULL,"metallic taste; corroded pipes/ fixtures staining",NULL,NULL
"73","0","2006-10-10 14:29:48","2006-10-10 14:29:48","rotten-egg, musty or chemical smell",NULL,"rotten-egg, musty or chemical smell",NULL,NULL
"74","0","2006-10-10 14:29:48","2006-10-10 14:29:48","rusty color; sediment; metallic taste; reddish or orange staining",NULL,"rusty color; sediment; metallic taste; reddish or orange staining",NULL,NULL
"75","0","2006-10-10 14:29:48","2006-10-10 14:29:48","salty taste",NULL,"salty taste",NULL,NULL
"76","0","2006-10-10 14:29:48","2006-10-10 14:29:48","skin discoloration; graying of the white part of the eye",NULL,"skin discoloration; graying of the white part of the eye",NULL,NULL
"77","0","2006-10-10 14:29:48","2006-10-10 14:29:48","visible tint",NULL,"visible tint",NULL,NULL

--- NEW FILE: matrix.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="matrix">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="matrix.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcExtendedBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="matrix.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: sample_loc.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<root> 
  <!-- CONFIGURATOR DATA -->
  <descriptor version="2"/> 
 
  <!-- DEFINE HERE TABLE STRUCTURE -->
  <structure tablename="sample_loc">

    <field name="ID" type="INT"/>    
    <field name="DELETED" type="BOOL"/>        
    <field name="CR_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="MOD_TS"     type="DATE">
        <param name="inputformat"       value="yyyy-MM-dd hh:mm:ss"/>
        <param name="outputformat"      value="yyyy-MM-dd hh:mm:ss"/>
    </field>
    <field name="NAME" type="VARCHAR"/>
    <field name="CODE" type="VARCHAR"/>        
    <field name="CREATOR_ID" type="INT"/>
    <field name="MODIFIER_ID" type="INT"/>
    <field name="COMPANY_ID" type="INT"/>
  </structure>
    
  <!-- WHAT GRAMMAR USE -->
  <grammar class="net.sf.csv2sql.grammars.mysql.GrammarFactory"/>

  <!-- TEMPORARY STORAGE -->
  <storage class="net.sf.csv2sql.storage.Memory"/>

  <!-- RENDERER CONFIGURATION -->
  <render class="net.sf.csv2sql.renders.SqlInsertRenderer">
    <param name="inputfile"          value="sample_loc.csv"/>
    <param name="separator"          value=","/>
    <!--optional-->        
    <param name="trimdata"           value="true"/>
    <param name="removedoublequotes" value="true"/>
    <param name="skiplines"          value="1"/>
    <param name="splitter"           value="net.sf.csv2sql.renders.splitters.Standard"/>
  </render>
  
  <!-- WRITER CONFIGURATION -->
  <output>
  
    <writerAppender active="true"     
        class="net.sf.csv2sql.writers.JdbcExtendedBatchWriter">
        <param name="batchcount"    value="0"/>
        <param name="commitbatchcount"  value="0"/>
    </writerAppender> 

    <writerAppender active="false"
        class="net.sf.csv2sql.writers.SqlFileWriter">
        <param name="filename"  value="sample_loc.sql"/>
    </writerAppender>

            
  </output>
  

</root>


--- NEW FILE: tables.txt ---
# this is list of descriptors for csv2sql utility
# all descriptors have path relative to this file
effect.xml
addr_type.xml
matrix.xml
sample_loc.xml
--- NEW FILE: sample_loc.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID,COMPANY_ID
"1","0","2006-10-10 15:36:36","2006-10-10 15:36:36","AFTER FILTERS","AF",NULL,NULL,NULL
"2","0","2006-10-10 15:36:36","2006-10-10 15:36:36","BEFORE FILTERS","BE",NULL,NULL,NULL
"3","0","2006-10-10 15:36:36","2006-10-10 15:36:36","BETWEEN FILTERS","BT",NULL,NULL,NULL
"4","0","2006-10-10 15:36:36","2006-10-10 15:36:36","TREATMENT SYSTEM - EFFLUENT","EF",NULL,NULL,NULL
"5","0","2006-10-10 15:36:36","2006-10-10 15:36:36","TREATMENT SYSTEM - INFLUENT","IN",NULL,NULL,NULL
"6","0","2006-10-10 15:36:36","2006-10-10 15:36:36","NOT APPLICABLE","NA",NULL,NULL,NULL
"7","0","2006-10-10 15:36:36","2006-10-10 15:36:36","OTHER","O",NULL,NULL,NULL
"8","0","2006-10-10 15:36:36","2006-10-10 15:36:36","OUTSIDE TAP","OT",NULL,NULL,NULL
"9","0","2006-10-10 15:36:36","2006-10-10 15:36:36","PRESSURE TANK","PT",NULL,NULL,NULL
"10","0","2006-10-10 15:36:36","2006-10-10 15:36:36","WELLHEAD","PU",NULL,NULL,NULL
"11","0","2006-10-10 15:36:36","2006-10-10 15:36:36","INSIDE TAP","T",NULL,NULL,NULL
"12","0","2006-10-10 15:36:36","2006-10-10 15:36:36","UNKNOWN","U",NULL,NULL,NULL
"13","0","2006-10-10 15:36:36","2006-10-10 15:36:36","NONE","NONE",NULL,NULL,NULL

--- NEW FILE: addr_type.csv ---
ID,DELETED,CR_TS,MOD_TS,NAME,CODE,CREATOR_ID,MODIFIER_ID,COMPANY_ID
"1","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Simple Address",NULL,NULL,NULL,NULL
"2","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Secondary address","SADR",NULL,NULL,NULL
"3","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Security service address","sec123123",NULL,NULL,NULL
"4","0","2006-10-10 14:30:18","2006-10-10 14:30:18","Main address","MADR",NULL,NULL,NULL
"10","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Billing","Billing",NULL,NULL,NULL
"11","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Facility","Facility",NULL,NULL,NULL
"12","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Mailing","Mailing",NULL,NULL,NULL
"13","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Office","Office",NULL,NULL,NULL
"14","0","2006-10-10 14:29:48","2006-10-10 14:29:48","Shipping","Shipping",NULL,NULL,NULL

[Csvtosql-cvs] csvtosql_jdk50/examples/test.extended.features create_db.sql, NONE, 1.1 runconsole.bat, NONE, 1.1 mysql.jar, NONE, 1.1 runconsole.sh, NONE, 1.1 build.xml, NONE, 1.1 readme.txt, NONE, 1.1

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.extended.features
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24036/examples/test.extended.features

Added Files:
	create_db.sql runconsole.bat mysql.jar runconsole.sh build.xml 
	readme.txt 
Log Message:
test for extened features

--- NEW FILE: build.xml ---
<!-- 
     Created by Ivan Ryndin <a href="mailto:jj...@us...">
-->

<project name="testcvstosql" default="run">

	<description>
    This ant file helps to run test for next two things: ExtendedConsoleMain frontend and JdbcExtendedBatchWriter writer. 

	What should you do to run test: 

	1) Copy "cvstosql.jar" from "bin" folder to here.
	2) Run ANT.
	</description>

	<property name="db.url" value="jdbc:mysql://localhost/testdb"/>
	<property name="db.user" value="ryndin"/>
	<property name="db.password" value="ryndin"/>
	<property name="db.driver.class" value="com.mysql.jdbc.Driver"/>

	<property name="lib.dir" value="**/../../../lib"/>

	<path id="clp">
		<pathelement location="mysql.jar"/>
		<pathelement location="csvtosql.jar"/>
		<pathelement path="..\..\lib"/>
		<fileset dir="${lib.dir}">
        	<include name="**/*.jar"/>
		</fileset>
	</path>


    <target name="create-db" description="Creates test database. Suitable for MySQL.">

        <sql driver="${db.driver.class}" password="${db.password}" url="${db.url}" userid="${db.user}">
            <classpath refid="clp" />
            <transaction src="create_db.sql"/>
        </sql>
    </target>


    <target name="run" depends="create-db" description="Run test task">

        <java classname="net.sf.csv2sql.frontends.console.ExtendedConsoleMain" fork="true" classpathref="clp">
			<arg line="-d data\tables.txt"/>
            <syspropertyset>
                <propertyref prefix="db." />
            </syspropertyset>
        </java>
    </target>

</project>

--- NEW FILE: runconsole.sh ---
java -classpath csvtosql.jar;mysql.jar;../../lib/commons-cli-1.0.jar -Ddb.url=jdbc:mysql://localhost/testdb -Ddb.user=ryndin -Ddb.password=ryndin -Ddb.driver.class=com.mysql.jdbc.Driver net.sf.csv2sql.frontends.console.ExtendedConsoleMain $1 $2 $3 $4 $5 $6 $7 $8

--- NEW FILE: create_db.sql ---
drop database if exists testdb;
create database testdb character set 'utf8';

use testdb;

    create table ADDR_TYPE (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        COMPANY_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table EFFECT (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        DESCR text,
        CREATOR_ID integer,
        MODIFIER_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table MATRIX (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        primary key (ID)
    ) type=InnoDB;

    create table SAMPLE_LOC (
        ID integer not null auto_increment,
        DELETED bit not null,
        CR_TS datetime,
        MOD_TS datetime,
        NAME varchar(255),
        CODE varchar(60),
        CREATOR_ID integer,
        MODIFIER_ID integer,
        COMPANY_ID integer,
        primary key (ID)
    ) type=InnoDB;


--- NEW FILE: runconsole.bat ---
java -classpath csvtosql.jar;mysql.jar;..\..\lib\commons-cli-1.0.jar -Ddb.url=jdbc:mysql://localhost/testdb -Ddb.user=ryndin -Ddb.password=ryndin -Ddb.driver.class=com.mysql.jdbc.Driver net.sf.csv2sql.frontends.console.ExtendedConsoleMain -d data\tables.txt

--- NEW FILE: mysql.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: readme.txt ---


This test case does testing 
of the ExtendedConsoleMain frontend 
and JdbcExtendedBatchMain writer.

What should you do to run test: 

1) Copy "cvstosql.jar" from "bin" folder to here.
2) Execute "create_db.sql" for creating database and its tables. 
   Use MySQL database. It wasn't tested on others databases. But at a glance, 
   all should work well on others databases. You need only to change a little
   "create_db.sql" and XML descriptors  in "data" folder.
3) Run either "runconsole.bat" (or "runconsole.sh") or "build.xml" 
   for running the task with ANT.

[Csvtosql-cvs] csvtosql_jdk50/examples/test.extended.features/data - New directory

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.extended.features/data
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24017/examples/test.extended.features/data

Log Message:
Directory /cvsroot/csvtosql/csvtosql_jdk50/examples/test.extended.features/data added to the repository

[Csvtosql-cvs] csvtosql_jdk50/examples/test.extended.features - New directory

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

Update of /cvsroot/csvtosql/csvtosql_jdk50/examples/test.extended.features
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24017/examples/test.extended.features

Log Message:
Directory /cvsroot/csvtosql/csvtosql_jdk50/examples/test.extended.features added to the repository

[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/grammars/standard DateField.java, 1.2, 1.3 StringField.java, 1.2, 1.3 IntegerField.java, 1.2, 1.3 FloatField.java, 1.2, 1.3

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

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

Modified Files:
	DateField.java StringField.java IntegerField.java 
	FloatField.java 
Log Message:
added next feature:
if fields equals ignore case "null", then we get database NULL 

Index: DateField.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/grammars/standard/DateField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DateField.java	11 Oct 2006 18:23:18 -0000	1.2
--- DateField.java	13 Oct 2006 09:15:09 -0000	1.3
***************
*** 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_jdk50/src/net/sf/csv2sql/grammars/standard/IntegerField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IntegerField.java	11 Oct 2006 18:23:18 -0000	1.2
--- IntegerField.java	13 Oct 2006 09:15:09 -0000	1.3
***************
*** 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_jdk50/src/net/sf/csv2sql/grammars/standard/StringField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StringField.java	11 Oct 2006 18:23:18 -0000	1.2
--- StringField.java	13 Oct 2006 09:15:09 -0000	1.3
***************
*** 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_jdk50/src/net/sf/csv2sql/grammars/standard/FloatField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FloatField.java	11 Oct 2006 18:23:18 -0000	1.2
--- FloatField.java	13 Oct 2006 09:15:09 -0000	1.3
***************
*** 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)));