cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation SQLTransformer.java

[cziegeler]

cziegeler    2004/07/07 01:50:47

  Modified:    src/blocks/databases/java/org/apache/cocoon/transformation
                        SQLTransformer.java
  Log:
  Correct if/else-if/else construct
  
  Revision  Changes    Path
  1.20      +7 -5      
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SQLTransformer.java       28 Mar 2004 14:28:04 -0000      1.19
  +++ SQLTransformer.java       7 Jul 2004 08:50:47 -0000       1.20
  @@ -1126,10 +1126,10 @@
   
           protected String getColumnValue( int i ) throws SQLException {
                        int numberOfChar = 1024;
  -            String retval =  SQLTransformer.getStringValue( rs.getObject( i 
) );
  +            String retval;
                        
  -                     if (rs.getMetaData().getColumnType(i) == 8) {
  -            retval = SQLTransformer.getStringValue( rs.getBigDecimal( i ) );
  +                     if (rs.getMetaData().getColumnType(i) == 
java.sql.Types.DOUBLE) {
  +                retval = SQLTransformer.getStringValue( rs.getBigDecimal( i 
) );
                        } else if (rs.getMetaData().getColumnType(i) == 
java.sql.Types.CLOB) {
                                Clob clob = rs.getClob(i);
                                InputStream inputStream = clob.getAsciiStream();
  @@ -1144,7 +1144,9 @@
                                        throw new SQLException("Error reading 
stream from CLOB");
                                }
                                retval = buffer.toString();
  -                     }
  +                     } else {
  +                retval = SQLTransformer.getStringValue( rs.getObject( i ) ); 
               
  +            }
               return retval;
           }