[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map DBMoleculeHyperlinkMap
Brought to you by:
steinbeck
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map
In directory usw-pr-cvs1:/tmp/cvs-serv18766/nmrshiftdb/om/map
Modified Files:
DBMoleculeMapBuilder.java DBSpectrumMapBuilder.java
Added Files:
DBMoleculeHyperlinkMapBuilder.java
DBSpectrumHyperlinkMapBuilder.java
Log Message:
added MoleculeHyperlink, SpectrumHyperlink, removed fingerprint1-16
--- NEW FILE: DBMoleculeHyperlinkMapBuilder.java ---
package org.openscience.nmrshiftdb.om.map;
import java.util.*;
import java.math.*;
import org.apache.turbine.services.db.PoolBrokerService;
import org.apache.turbine.services.db.TurbineDB;
import org.apache.turbine.util.db.map.MapBuilder;
import org.apache.turbine.util.db.map.DatabaseMap;
import org.apache.turbine.util.db.map.TableMap;
/**
*/
public class DBMoleculeHyperlinkMapBuilder implements MapBuilder
{
/** the name of this class */
public static final String CLASS_NAME = "org.openscience.nmrshiftdb.om.map.DBMoleculeHyperlinkMapBuilder";
/** item */
public static String getTable( )
{
return "MOLECULE_HYPERLINK";
}
/** MOLECULE_HYPERLINK.MOLECULE_ID */
public static String getDBMoleculeHyperlink_MoleculeId()
{
return getTable() + ".MOLECULE_ID";
}
/** MOLECULE_HYPERLINK.HYPERLINK */
public static String getDBMoleculeHyperlink_Hyperlink()
{
return getTable() + ".HYPERLINK";
}
/** MOLECULE_HYPERLINK.DESCRIPTION */
public static String getDBMoleculeHyperlink_Description()
{
return getTable() + ".DESCRIPTION";
}
/** the database map */
private DatabaseMap dbMap = null;
/**
tells us if this DatabaseMapBuilder is built so that we don't have
to re-build it every time
*/
public boolean isBuilt()
{
if ( dbMap != null )
return true;
return false;
}
/** gets the databasemap this map builder built. */
public DatabaseMap getDatabaseMap()
{
return this.dbMap;
}
/** the doBuild() method builds the DatabaseMap */
public void doBuild() throws Exception
{
dbMap = TurbineDB.getDatabaseMap("default");
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
tMap.setPrimaryKeyMethod("none");
tMap.addForeignPrimaryKey ( getDBMoleculeHyperlink_MoleculeId(), new Integer(0) , "MOLECULE" , "MOLECULE_ID" );
tMap.addPrimaryKey ( getDBMoleculeHyperlink_Hyperlink(), new String() );
tMap.addColumn ( getDBMoleculeHyperlink_Description(), new String() );
}
}
--- NEW FILE: DBSpectrumHyperlinkMapBuilder.java ---
package org.openscience.nmrshiftdb.om.map;
import java.util.*;
import java.math.*;
import org.apache.turbine.services.db.PoolBrokerService;
import org.apache.turbine.services.db.TurbineDB;
import org.apache.turbine.util.db.map.MapBuilder;
import org.apache.turbine.util.db.map.DatabaseMap;
import org.apache.turbine.util.db.map.TableMap;
/**
*/
public class DBSpectrumHyperlinkMapBuilder implements MapBuilder
{
/** the name of this class */
public static final String CLASS_NAME = "org.openscience.nmrshiftdb.om.map.DBSpectrumHyperlinkMapBuilder";
/** item */
public static String getTable( )
{
return "SPECTRUM_HYPERLINK";
}
/** SPECTRUM_HYPERLINK.SPECTRUM_ID */
public static String getDBSpectrumHyperlink_SpectrumId()
{
return getTable() + ".SPECTRUM_ID";
}
/** SPECTRUM_HYPERLINK.HYPERLINK */
public static String getDBSpectrumHyperlink_Hyperlink()
{
return getTable() + ".HYPERLINK";
}
/** SPECTRUM_HYPERLINK.DESCRIPTION */
public static String getDBSpectrumHyperlink_Description()
{
return getTable() + ".DESCRIPTION";
}
/** the database map */
private DatabaseMap dbMap = null;
/**
tells us if this DatabaseMapBuilder is built so that we don't have
to re-build it every time
*/
public boolean isBuilt()
{
if ( dbMap != null )
return true;
return false;
}
/** gets the databasemap this map builder built. */
public DatabaseMap getDatabaseMap()
{
return this.dbMap;
}
/** the doBuild() method builds the DatabaseMap */
public void doBuild() throws Exception
{
dbMap = TurbineDB.getDatabaseMap("default");
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
tMap.setPrimaryKeyMethod("none");
tMap.addForeignPrimaryKey ( getDBSpectrumHyperlink_SpectrumId(), new Integer(0) , "SPECTRUM" , "SPECTRUM_ID" );
tMap.addPrimaryKey ( getDBSpectrumHyperlink_Hyperlink(), new String() );
tMap.addColumn ( getDBSpectrumHyperlink_Description(), new String() );
}
}
Index: DBMoleculeMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBMoleculeMapBuilder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** DBMoleculeMapBuilder.java 27 May 2002 13:57:11 -0000 1.14
--- DBMoleculeMapBuilder.java 30 May 2002 15:08:00 -0000 1.15
***************
*** 38,42 ****
public static String getDBMolecule_StructureFile()
{
! return getTable() + ".STRUCTURE_FILE";
}
--- 38,42 ----
public static String getDBMolecule_StructureFile()
{
! return getTable() + ".STRUCTURE_FILE";
}
***************
*** 55,59 ****
/** MOLECULE.CAS_NUMBER */
public static String getDBMolecule_CasNumber()
! {
return getTable() + ".CAS_NUMBER";
}
--- 55,59 ----
/** MOLECULE.CAS_NUMBER */
public static String getDBMolecule_CasNumber()
! {
return getTable() + ".CAS_NUMBER";
}
***************
*** 71,168 ****
}
! /** MOLECULE.FINGERPRINT_1 */
! public static String getDBMolecule_Fingerprint1()
! {
! return getTable() + ".FINGERPRINT_1";
! }
!
! /** MOLECULE.FINGERPRINT_2 */
! public static String getDBMolecule_Fingerprint2()
! {
! return getTable() + ".FINGERPRINT_2";
! }
!
! /** MOLECULE.FINGERPRINT_3 */
! public static String getDBMolecule_Fingerprint3()
! {
! return getTable() + ".FINGERPRINT_3";
! }
!
! /** MOLECULE.FINGERPRINT_4 */
! public static String getDBMolecule_Fingerprint4()
! {
! return getTable() + ".FINGERPRINT_4";
! }
!
! /** MOLECULE.FINGERPRINT_5 */
! public static String getDBMolecule_Fingerprint5()
! {
! return getTable() + ".FINGERPRINT_5";
! }
!
! /** MOLECULE.FINGERPRINT_6 */
! public static String getDBMolecule_Fingerprint6()
! {
! return getTable() + ".FINGERPRINT_6";
! }
!
! /** MOLECULE.FINGERPRINT_7 */
! public static String getDBMolecule_Fingerprint7()
! {
! return getTable() + ".FINGERPRINT_7";
! }
!
! /** MOLECULE.FINGERPRINT_8 */
! public static String getDBMolecule_Fingerprint8()
! {
! return getTable() + ".FINGERPRINT_8";
! }
!
! /** MOLECULE.FINGERPRINT_9 */
! public static String getDBMolecule_Fingerprint9()
! {
! return getTable() + ".FINGERPRINT_9";
! }
!
! /** MOLECULE.FINGERPRINT_10 */
! public static String getDBMolecule_Fingerprint10()
! {
! return getTable() + ".FINGERPRINT_10";
! }
!
! /** MOLECULE.FINGERPRINT_11 */
! public static String getDBMolecule_Fingerprint11()
! {
! return getTable() + ".FINGERPRINT_11";
! }
!
! /** MOLECULE.FINGERPRINT_12 */
! public static String getDBMolecule_Fingerprint12()
! {
! return getTable() + ".FINGERPRINT_12";
! }
!
! /** MOLECULE.FINGERPRINT_13 */
! public static String getDBMolecule_Fingerprint13()
! {
! return getTable() + ".FINGERPRINT_13";
! }
!
! /** MOLECULE.FINGERPRINT_14 */
! public static String getDBMolecule_Fingerprint14()
{
! return getTable() + ".FINGERPRINT_14";
! }
!
! /** MOLECULE.FINGERPRINT_15 */
! public static String getDBMolecule_Fingerprint15()
! {
! return getTable() + ".FINGERPRINT_15";
! }
!
! /** MOLECULE.FINGERPRINT_16 */
! public static String getDBMolecule_Fingerprint16()
! {
! return getTable() + ".FINGERPRINT_16";
}
--- 71,78 ----
}
! /** MOLECULE.FINGERPRINT */
! public static String getDBMolecule_Fingerprint()
{
! return getTable() + ".FINGERPRINT";
}
***************
*** 206,210 ****
public boolean isBuilt()
{
! if ( dbMap != null )
return true;
return false;
--- 116,120 ----
public boolean isBuilt()
{
! if ( dbMap != null )
return true;
return false;
***************
*** 223,227 ****
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
!
tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
--- 133,137 ----
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
!
tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
***************
*** 233,237 ****
tMap.addColumn ( getDBMolecule_StructureFile(), new String() );
!
tMap.addColumn ( getDBMolecule_MolecularFormula(), new String() );
--- 143,147 ----
tMap.addColumn ( getDBMolecule_StructureFile(), new String() );
!
tMap.addColumn ( getDBMolecule_MolecularFormula(), new String() );
***************
*** 244,283 ****
tMap.addColumn ( getDBMolecule_MolecularWeight(), new Double(0) );
! tMap.addColumn ( getDBMolecule_Fingerprint1(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint2(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint3(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint4(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint5(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint6(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint7(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint8(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint9(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint10(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint11(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint12(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint13(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint14(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint15(), new Long(0) );
!
! tMap.addColumn ( getDBMolecule_Fingerprint16(), new Long(0) );
!
tMap.addColumn ( getDBMolecule_SmilesString(), new Object() );
tMap.addColumn ( getDBMolecule_ElementCount(), new Integer(0) );
!
tMap.addColumn ( getDBMolecule_CanonicalName(), new String() );
--- 154,163 ----
tMap.addColumn ( getDBMolecule_MolecularWeight(), new Double(0) );
! tMap.addColumn ( getDBMolecule_Fingerprint(), new String() );
!
tMap.addColumn ( getDBMolecule_SmilesString(), new Object() );
tMap.addColumn ( getDBMolecule_ElementCount(), new Integer(0) );
!
tMap.addColumn ( getDBMolecule_CanonicalName(), new String() );
Index: DBSpectrumMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBSpectrumMapBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** DBSpectrumMapBuilder.java 23 May 2002 11:25:24 -0000 1.10
--- DBSpectrumMapBuilder.java 30 May 2002 15:08:00 -0000 1.11
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 38,42 ****
public static String getDBSpectrum_Specfile()
{
! return getTable() + ".SPECFILE";
}
--- 38,42 ----
public static String getDBSpectrum_Specfile()
{
! return getTable() + ".SPECFILE";
}
***************
*** 77,81 ****
}
! /** SPECTRUM.USER_ID */
public static String getDBSpectrum_UserId()
{
--- 77,81 ----
}
! /** SPECTRUM.USER_ID */
public static String getDBSpectrum_UserId()
{
***************
*** 116,120 ****
/** the doBuild() method builds the DatabaseMap */
public void doBuild() throws Exception
! {
dbMap = TurbineDB.getDatabaseMap("default");
--- 116,120 ----
/** the doBuild() method builds the DatabaseMap */
public void doBuild() throws Exception
! {
dbMap = TurbineDB.getDatabaseMap("default");
|