[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map DBAtomMapBuilder.java,
Brought to you by:
steinbeck
Menu
▾
▴
[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map DBAtomMapBuilder.java,1.4,1.5 DBBondMapBuilder.java,1.4,1.5 DBCanonicalNameMapBuilder.java,1.4,1.5 DBChemicalNameMapBuilder.java,1.4,1.5 DBMeasurementConditionMapBuilder.java,1.4,1.5 DBMoleculeMapBuilder.java,1.4,1.5 DBSignalMapBuilder.java,1.4,1.5 DBSpectrumMapBuilder.java,1.4,1.5 DBSpectrumTypeMapBuilder.java,1.4,1.5
|
From: Stefan K. <sk...@us...> - 2002-03-11 13:23:29
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map
In directory usw-pr-cvs1:/tmp/cvs-serv19108/map
Modified Files:
DBAtomMapBuilder.java DBBondMapBuilder.java
DBCanonicalNameMapBuilder.java DBChemicalNameMapBuilder.java
DBMeasurementConditionMapBuilder.java
DBMoleculeMapBuilder.java DBSignalMapBuilder.java
DBSpectrumMapBuilder.java DBSpectrumTypeMapBuilder.java
Log Message:
added fingerprint fields 1-16
Index: DBAtomMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBAtomMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBAtomMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBAtomMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 24,28 ****
/** ATOM.ATOM_ID */
! public static String getDBAtom_AtomId()
{
return getTable() + ".ATOM_ID";
--- 24,28 ----
/** ATOM.ATOM_ID */
! public static String getDBAtom_AtomId()
{
return getTable() + ".ATOM_ID";
***************
*** 73,78 ****
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
!
! tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
--- 73,78 ----
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
!
! tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
***************
*** 80,84 ****
tMap.addPrimaryKey ( getDBAtom_AtomId(), new Integer(0) );
! tMap.addColumn ( getDBAtom_Symbol(), new String() );
tMap.addColumn ( getDBAtom_SerializedAtom(), new String() );
--- 80,84 ----
tMap.addPrimaryKey ( getDBAtom_AtomId(), new Integer(0) );
! tMap.addColumn ( getDBAtom_Symbol(), new String() );
tMap.addColumn ( getDBAtom_SerializedAtom(), new String() );
Index: DBBondMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBBondMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBBondMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBBondMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 27,31 ****
{
return getTable() + ".BOND_ID";
! }
/** BOND.DEGREE */
--- 27,31 ----
{
return getTable() + ".BOND_ID";
! }
/** BOND.DEGREE */
***************
*** 74,78 ****
TableMap tMap = dbMap.getTable(getTable());
! tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
--- 74,78 ----
TableMap tMap = dbMap.getTable(getTable());
! tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
***************
*** 83,87 ****
tMap.addColumn ( getDBBond_SerializedBond(), new String() );
!
tMap.addForeignKey ( getDBBond_MoleculeId(), new Integer(0) , "MOLECULE" , "MOLECULE_ID" );
--- 83,87 ----
tMap.addColumn ( getDBBond_SerializedBond(), new String() );
!
tMap.addForeignKey ( getDBBond_MoleculeId(), new Integer(0) , "MOLECULE" , "MOLECULE_ID" );
Index: DBCanonicalNameMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBCanonicalNameMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBCanonicalNameMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBCanonicalNameMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 35,39 ****
}
! /** CANONICAL_NAME.TYPE */
public static String getDBCanonicalName_Type()
{
--- 35,39 ----
}
! /** CANONICAL_NAME.TYPE */
public static String getDBCanonicalName_Type()
{
Index: DBChemicalNameMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBChemicalNameMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBChemicalNameMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBChemicalNameMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 55,59 ****
}
! /** gets the databasemap this map builder built. */
public DatabaseMap getDatabaseMap()
{
--- 55,59 ----
}
! /** gets the databasemap this map builder built. */
public DatabaseMap getDatabaseMap()
{
Index: DBMeasurementConditionMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBMeasurementConditionMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBMeasurementConditionMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBMeasurementConditionMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 34,38 ****
return getTable() + ".TEMPERATURE";
}
!
/** MEASUREMENT_CONDITION.FIELD_STRENGTH */
public static String getDBMeasurementCondition_FieldStrength()
--- 34,38 ----
return getTable() + ".TEMPERATURE";
}
!
/** MEASUREMENT_CONDITION.FIELD_STRENGTH */
public static String getDBMeasurementCondition_FieldStrength()
***************
*** 90,94 ****
tMap.addColumn ( getDBMeasurementCondition_FieldStrength(), new Integer(0) );
! tMap.addColumn ( getDBMeasurementCondition_Solvent(), new String() );
tMap.addForeignKey ( getDBMeasurementCondition_UserId(), new Integer(0) , "NMRSHIFTDB_USER" , "USER_ID" );
--- 90,94 ----
tMap.addColumn ( getDBMeasurementCondition_FieldStrength(), new Integer(0) );
! tMap.addColumn ( getDBMeasurementCondition_Solvent(), new String() );
tMap.addForeignKey ( getDBMeasurementCondition_UserId(), new Integer(0) , "NMRSHIFTDB_USER" , "USER_ID" );
Index: DBMoleculeMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBMoleculeMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBMoleculeMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBMoleculeMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 32,36 ****
public static String getDBMolecule_Date()
{
! return getTable() + ".DATE";
}
--- 32,36 ----
public static String getDBMolecule_Date()
{
! return getTable() + ".DATE";
}
***************
*** 77,80 ****
--- 77,176 ----
}
+ /** 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";
+ }
+
/** MOLECULE.USER_ID */
public static String getDBMolecule_UserId()
***************
*** 104,108 ****
/** the doBuild() method builds the DatabaseMap */
public void doBuild() throws Exception
! {
dbMap = TurbineDB.getDatabaseMap("nmrshiftdb");
--- 200,204 ----
/** the doBuild() method builds the DatabaseMap */
public void doBuild() throws Exception
! {
dbMap = TurbineDB.getDatabaseMap("nmrshiftdb");
***************
*** 113,117 ****
!
tMap.addPrimaryKey ( getDBMolecule_MoleculeId(), new Integer(0) );
--- 209,213 ----
!
tMap.addPrimaryKey ( getDBMolecule_MoleculeId(), new Integer(0) );
***************
*** 131,134 ****
--- 227,262 ----
tMap.addColumn ( getDBMolecule_Fingerprint(), new Object() );
+
+ 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.addForeignKey ( getDBMolecule_UserId(), new Integer(0) , "NMRSHIFTDB_USER" , "USER_ID" );
Index: DBSignalMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBSignalMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBSignalMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBSignalMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 35,39 ****
}
! /** SIGNAL.SHIFT_1 */
public static String getDBSignal_Shift1()
{
--- 35,39 ----
}
! /** SIGNAL.SHIFT_1 */
public static String getDBSignal_Shift1()
{
***************
*** 91,95 ****
*/
public boolean isBuilt()
! {
if ( dbMap != null )
return true;
--- 91,95 ----
*/
public boolean isBuilt()
! {
if ( dbMap != null )
return true;
Index: DBSpectrumMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBSpectrumMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBSpectrumMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBSpectrumMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 1,3 ****
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
--- 1,3 ----
! package org.openscience.nmrshiftdb.om.map;
import java.util.*;
***************
*** 24,28 ****
/** SPECTRUM.SPECTRUM_ID */
! public static String getDBSpectrum_SpectrumId()
{
return getTable() + ".SPECTRUM_ID";
--- 24,28 ----
/** SPECTRUM.SPECTRUM_ID */
! public static String getDBSpectrum_SpectrumId()
{
return getTable() + ".SPECTRUM_ID";
***************
*** 59,68 ****
}
- /** SPECTRUM.FINGERPRINT */
- public static String getDBSpectrum_Fingerprint()
- {
- return getTable() + ".FINGERPRINT";
- }
-
/** SPECTRUM.USER_ID */
public static String getDBSpectrum_UserId()
--- 59,62 ----
***************
*** 86,90 ****
public static String getDBSpectrum_MoleculeId()
{
! return getTable() + ".MOLECULE_ID";
}
--- 80,84 ----
public static String getDBSpectrum_MoleculeId()
{
! return getTable() + ".MOLECULE_ID";
}
***************
*** 132,137 ****
tMap.addColumn ( getDBSpectrum_ReviewFlag(), new String() );
- tMap.addColumn ( getDBSpectrum_Fingerprint(), new Object() );
-
tMap.addForeignKey ( getDBSpectrum_UserId(), new Integer(0) , "NMRSHIFTDB_USER" , "USER_ID" );
--- 126,129 ----
***************
*** 144,146 ****
}
! }
--- 136,138 ----
}
! }
Index: DBSpectrumTypeMapBuilder.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/om/map/DBSpectrumTypeMapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DBSpectrumTypeMapBuilder.java 7 Mar 2002 13:55:30 -0000 1.4
--- DBSpectrumTypeMapBuilder.java 11 Mar 2002 13:23:26 -0000 1.5
***************
*** 104,108 ****
TableMap tMap = dbMap.getTable(getTable());
! tMap.setPrimaryKeyMethod(TableMap.IDBROKERTABLE);
--- 104,108 ----
TableMap tMap = dbMap.getTable(getTable());
! tMap.setPrimaryKeyMethod("IdBroker");
|
