[Cdk-commits] CVS: cdk/src/org/openscience/cdk/database DBReader.java,1.2,1.3 DBWriter.java,1.3,1.4

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/database
In directory usw-pr-cvs1:/tmp/cvs-serv20544/src/org/openscience/cdk/database

Modified Files:
	DBReader.java DBWriter.java 
Log Message:
Removed some old hard coded property get and set methods.


Index: DBReader.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/DBReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DBReader.java	4 Aug 2002 12:25:46 -0000	1.2
--- DBReader.java	5 Oct 2002 14:48:46 -0000	1.3
***************
*** 1,5 ****
! /* DBReader.java
!  *
!  * $RCSfile$    $Author$    $Date$    $Revision$
   * 
   * Copyright (C) 1997-2002  The Chemistry Development Kit (CDK) project
--- 1,6 ----
! /* $RCSfile$    
!  * $Author$    
!  * $Date$    
!  * $Revision$
   * 
   * Copyright (C) 1997-2002  The Chemistry Development Kit (CDK) project
***************
*** 80,91 ****
  			{
  				byte[] bytes = rs.getBytes(14);
!         String CMLString = new String(bytes);
  				reader = new StringReader(CMLString);
  				cmlr = new CMLReader(reader);
  				mol = getMolecule((ChemFile)cmlr.read(new ChemFile()));
  				
! 				mol.setAutonomName(rs.getString(1));
! 				mol.setCasRN(rs.getString(2));
! 				mol.setBeilsteinRN(rs.getString(3));
  			}
  			rs.close();
--- 81,92 ----
  			{
  				byte[] bytes = rs.getBytes(14);
!                 String CMLString = new String(bytes);
  				reader = new StringReader(CMLString);
  				cmlr = new CMLReader(reader);
  				mol = getMolecule((ChemFile)cmlr.read(new ChemFile()));
  				
! 				mol.setProperty(CDKConstants.AUTONOMNAME, rs.getString(1));
! 				mol.setProperty(CDKConstants.CASRN, rs.getString(2));
! 				mol.setProperty(CDKConstants.BEILSTEINRN, rs.getString(3));
  			}
  			rs.close();

Index: DBWriter.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/DBWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DBWriter.java	20 Sep 2002 09:12:06 -0000	1.3
--- DBWriter.java	5 Oct 2002 14:48:46 -0000	1.4
***************
*** 1,5 ****
! /* DBWriter.java
!  *
!  * $RCSfile$    $Author$    $Date$    $Revision$
   * 
   * Copyright (C) 1997-2002  The Chemistry Development Kit (CDK) project
--- 1,6 ----
! /* $RCSfile$    
!  * $Author$    
!  * $Date$    
!  * $Revision$
   * 
   * Copyright (C) 1997-2002  The Chemistry Development Kit (CDK) project
***************
*** 105,109 ****
  			ps = con.prepareStatement("INSERT INTO chemnames VALUES('', ?, ?)");
  			logger.info("Inserting molecule into chemnames...");
! 			ps.setString(1, mol.getAutonomName());
  			ps.setString(2, "");
  			logger.debug("SQL: " + ps.toString());
--- 106,110 ----
  			ps = con.prepareStatement("INSERT INTO chemnames VALUES('', ?, ?)");
  			logger.info("Inserting molecule into chemnames...");
! 			ps.setString(1, (String)mol.getProperty(CDKConstants.AUTONOMNAME));
  			ps.setString(2, "");
  			logger.debug("SQL: " + ps.toString());
***************
*** 115,120 ****
  			ps = con.prepareStatement("INSERT INTO indices VALUES('', ?, ?)");
  			logger.info("Inserting molecule into indices...");
! 			ps.setString(1, mol.getCasRN());
! 			ps.setString(2, mol.getBeilsteinRN());
  			logger.debug("SQL: " + ps.toString());
  			ps.executeUpdate();
--- 116,121 ----
  			ps = con.prepareStatement("INSERT INTO indices VALUES('', ?, ?)");
  			logger.info("Inserting molecule into indices...");
! 			ps.setString(1, (String)mol.getProperty(CDKConstants.CASRN));
! 			ps.setString(2, (String)mol.getProperty(CDKConstants.BEILSTEINRN));
  			logger.debug("SQL: " + ps.toString());
  			ps.executeUpdate();
***************
*** 124,139 ****
  
  			con.setAutoCommit(true);
- 
- 			// some old stuff i should have a look at
- 			// ps.setInt(4, new Integer(elementFormula.substring(elementFormula.indexOf("C") + 1, elementFormula.indexOf("H"))).intValue());
- 			// ps.setInt(5, new Integer(elementFormula.substring(elementFormula.indexOf("H") + 1, elementFormula.indexOf("N"))).intValue());
- 			// ps.setInt(6, new Integer(elementFormula.substring(elementFormula.indexOf("N") + 1, elementFormula.indexOf("O"))).intValue());
- 			// ps.setInt(7, new Integer(elementFormula.substring(elementFormula.indexOf("O") + 1, elementFormula.indexOf("S"))).intValue());
- 			// ps.setInt(8, new Integer(elementFormula.substring(elementFormula.indexOf("S") + 1, elementFormula.indexOf("P"))).intValue());
- 			// ps.setInt(9, new Integer(elementFormula.substring(elementFormula.indexOf("P") + 1, elementFormula.indexOf("F"))).intValue());
- 			// ps.setInt(10, new Integer(elementFormula.substring(elementFormula.indexOf("F") + 1, elementFormula.indexOf("Cl"))).intValue());
- 			// ps.setInt(11, new Integer(elementFormula.substring(elementFormula.indexOf("Cl") + 2, elementFormula.indexOf("Br"))).intValue());
- 			// ps.setInt(12, new Integer(elementFormula.substring(elementFormula.indexOf("Br") + 2, elementFormula.indexOf("I"))).intValue());
- 			// ps.setInt(13, new Integer(elementFormula.substring(elementFormula.indexOf("I") + 1)).intValue());
      	} catch(Exception exc) {
          	System.out.println("Error while trying to add molecule to table");
--- 125,128 ----