[Treebase-guts] SF.net SVN: treebase:[481] trunk/treebase-core/src/main/java/org/cipres/ treebase/dao/jdbc

[<yo...@us...>]

Revision: 481
          http://treebase.svn.sourceforge.net/treebase/?rev=481&view=rev
Author:   youjun
Date:     2010-02-02 20:54:48 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
fix sql, postgresql will not accept 1,0 for boolean type

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ContinuousMatrixElementJDBC.java
    trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/DiscreteMatrixElementJDBC.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ContinuousMatrixElementJDBC.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ContinuousMatrixElementJDBC.java	2010-01-25 20:27:40 UTC (rev 480)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ContinuousMatrixElementJDBC.java	2010-02-02 20:54:48 UTC (rev 481)
@@ -83,7 +83,7 @@
 				// DISCRETECHARSTATE_ID
 
 				ps.setDouble(1, e.getValue()); // Value
-				ps.setShort(2, e.getGap()); // Gap
+				ps.setBoolean(2, e.getGap()); // Gap
 				ps.setLong(3, e.getMatrixColID()); // MATRIXCOLUMN_ID
 				// ps.setLong(4, 0); // ITEMDEFINITION_ID //Only by compound elements. 
 				ps.setLong(4, e.getMatrixRowID()); // MATRIXROW_ID
@@ -125,8 +125,8 @@
 	 * 
 	 * @return short mGap
 	 */
-	public short getGap() {
-		return mGap;
+	public boolean getGap() {
+		return (mGap!=0);
 	}
 
 	/**

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/DiscreteMatrixElementJDBC.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/DiscreteMatrixElementJDBC.java	2010-01-25 20:27:40 UTC (rev 480)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/DiscreteMatrixElementJDBC.java	2010-02-02 20:54:48 UTC (rev 481)
@@ -93,7 +93,7 @@
 				// Value: (continuous)
 				// ITEMDEFINITION_ID: (continuous)
 
-				ps.setShort(1, e.getGap()); // Gap
+				ps.setBoolean(1, e.getGap()); // Gap
 				ps.setLong(2, e.getMatrixColID()); // MATRIXCOLUMN_ID
 				ps.setLong(3, e.getMatrixRowID()); // MATRIXROW_ID
 
@@ -138,8 +138,8 @@
 	 * 
 	 * @return short mGap
 	 */
-	public short getGap() {
-		return mGap;
+	public boolean getGap() {
+		return (mGap!=0);
 	}
 
 	/**


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