Skip to content

Commit 5bbc166

Browse files
author
Meg Kumin
committed
Made changes to DatamodelGenerator to accomodate several changes:
- datamodel now includes PickList - datamodel now includes AppContext resources - added EntityResolver for the Hibernate3 dtd, because it was timing out. It now uses a local copy of the dtd, found in the root Hyla folder. Added new table definitions to the specify_tableid_listing.xml document Made Changes to PickList hbm - Had to provide fully qualifed name for DatamodelGenerator/DBTableMgr to work Added hibernate-mapping-3.0.dtd file git-svn-id: https://svn.code.sf.net/p/specify/code/trunk/Specify@752 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
1 parent 0a86694 commit 5bbc166

File tree

7 files changed

+1561
-403
lines changed

7 files changed

+1561
-403
lines changed

‎config/specify_datamodel.xml

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,37 @@
106106
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.ExchangeOut" relationshipname="exchangeOutSentToOrganizations" columnname="SentToOrganizationID"/>
107107
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.Agent" relationshipname="organization" columnname="ParentOrganizationID"/>
108108
</table>
109+
<table classname="edu.ku.brc.specify.datamodel.AppResource" table="appresource" tableid="83" lazy="true">
110+
<field column="Level" name="level" type="short"/>
111+
<field column="Name" name="name" type="java.lang.String" length="64"/>
112+
<field column="Description" name="description" type="java.lang.String" length="255"/>
113+
<field column="MetaData" name="metaData" type="java.lang.String" length="255"/>
114+
<field column="TimestampCreated" name="timestampCreated" type="java.sql.Timestamp" length="23"/>
115+
<field column="TimestampModified" name="timestampModified" type="java.sql.Timestamp" length="23"/>
116+
<field column="LastEditedBy" name="lastEditedBy" type="java.lang.String" length="50"/>
117+
<id column="AppResourceID" name="appResourceId" type="java.lang.Integer"/>
118+
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceDefault" relationshipname="appResourceDefaults" columnname="AppResourceID"/>
119+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceData" relationshipname="appResourceDatas" columnname="AppResourceID"/>
120+
</table>
121+
<table classname="edu.ku.brc.specify.datamodel.AppResourceData" table="appresourcedata" tableid="84" lazy="true">
122+
<field column="data" name="data" type="blob" length="1073741823"/>
123+
<id column="AppResourceDataID" name="appResourceDataId" type="java.lang.Integer"/>
124+
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.AppResource" relationshipname="appResource" columnname="AppResourceID"/>
125+
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.ViewSetObj" relationshipname="viewSetObj" columnname="ViewSetObjID"/>
126+
</table>
127+
<table classname="edu.ku.brc.specify.datamodel.AppResourceDefault" table="appresourcedefault" tableid="85" lazy="true">
128+
<field column="UserType" name="userType" type="java.lang.String" length="64"/>
129+
<field column="DisciplineType" name="disciplineType" type="java.lang.String" length="64"/>
130+
<field column="TimestampCreated" name="timestampCreated" type="java.sql.Timestamp" length="23"/>
131+
<field column="TimestampModified" name="timestampModified" type="java.sql.Timestamp" length="23"/>
132+
<field column="LastEditedBy" name="lastEditedBy" type="java.lang.String" length="50"/>
133+
<id column="AppResourceDefaultID" name="appResourceDefaultId" type="java.lang.Integer"/>
134+
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.AppResource" relationshipname="appResources" columnname="AppResourceDefaultID"/>
135+
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.ViewSetObj" relationshipname="viewSets" columnname="AppResourceDefaultID"/>
136+
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.CatalogSeries" relationshipname="catalogSeries" columnname="CatalogSeriesID"/>
137+
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.CollectionObjDef" relationshipname="collectionObjDef" columnname="CollectionObjDefID"/>
138+
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.SpecifyUser" relationshipname="specifyUser" columnname="SpecifyUserID"/>
139+
</table>
109140
<table classname="edu.ku.brc.specify.datamodel.AttributeDef" table="attributedef" tableid="16" lazy="true">
110141
<field column="TableType" name="tableType" type="short"/>
111142
<field column="FieldName" name="fieldName" type="java.lang.String" length="32"/>
@@ -205,6 +236,7 @@
205236
<field column="LastEditedBy" name="lastEditedBy" type="java.lang.String" length="50"/>
206237
<id column="CatalogSeriesID" name="catalogSeriesId" type="java.lang.Integer"/>
207238
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.CollectionObjDef" relationshipname="collectionObjDefItems" columnname="CatalogSeriesID"/>
239+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceDefault" relationshipname="appResourceDefaults" columnname="CatalogSeriesID"/>
208240
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.CatalogSeries" relationshipname="tissue" columnname="TissueID"/>
209241
</table>
210242
<table classname="edu.ku.brc.specify.datamodel.CollectingEvent" table="collectingevent" tableid="10" lazy="true" view="CollectingEvent">
@@ -249,6 +281,7 @@
249281
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.CatalogSeries" relationshipname="catalogSeries" columnname="CollectionObjDefID"/>
250282
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.AttributeDef" relationshipname="attributeDefs" columnname="CollectioObjDefID"/>
251283
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.Locality" relationshipname="localities" columnname="CollectionObjDefID"/>
284+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceDefault" relationshipname="appResourceDefaults" columnname="CollectionObjDefID"/>
252285
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.DataType" relationshipname="dataType" columnname="DataTypeID"/>
253286
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.SpecifyUser" relationshipname="specifyUser" columnname="SpecifyUserID"/>
254287
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.GeographyTreeDef" relationshipname="geographyTreeDef" columnname="GeographyTreeDefID"/>
@@ -428,7 +461,7 @@
428461
<field column="TimestampModified" name="timestampModified" type="java.sql.Timestamp" length="23"/>
429462
<field column="LastEditedBy" name="lastEditedBy" type="java.lang.String" length="50"/>
430463
<id column="DeterminationStatusID" name="determinationStatusId" type="java.lang.Integer"/>
431-
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.Determination" relationshipname="determinations" columnname="DeterminationID"/>
464+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.Determination" relationshipname="determinations" columnname="DeterminationStatusID"/>
432465
</table>
433466
<table classname="edu.ku.brc.specify.datamodel.ExchangeIn" table="exchangein" tableid="39" lazy="true">
434467
<field column="ExchangeDate" name="exchangeDate" type="calendar_date"/>
@@ -970,11 +1003,13 @@
9701003
</table>
9711004
<table classname="edu.ku.brc.specify.datamodel.SpecifyUser" table="specifyuser" tableid="72" lazy="true">
9721005
<field column="Name" name="name" type="java.lang.String" length="64"/>
973-
<field column="email" name="email" type="java.lang.String" length="64"/>
1006+
<field column="EMail" name="email" type="java.lang.String" length="64"/>
1007+
<field column="UserType" name="userType" type="java.lang.String" length="32"/>
9741008
<field column="PrivLevel" name="privLevel" type="short"/>
9751009
<id column="SpecifyUserID" name="specifyUserId" type="java.lang.Integer"/>
9761010
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.CollectionObjDef" relationshipname="collectionObjDef" columnname="SpecifyUserID"/>
977-
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.RecordSet" relationshipname="recordSets" columnname="CollectionObjectID"/>
1011+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.RecordSet" relationshipname="recordSets" columnname="SpecifyUserID"/>
1012+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceDefault" relationshipname="appResourceDefaults" columnname="SpecifyUserID"/>
9781013
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.UserGroup" relationshipname="userGroup" columnname="UserGroupID"/>
9791014
</table>
9801015
<table classname="edu.ku.brc.specify.datamodel.Stratigraphy" table="stratigraphy" tableid="73">
@@ -1029,7 +1064,7 @@
10291064
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.Taxon" relationshipname="acceptedChildren" columnname="AcceptedID"/>
10301065
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.TaxonCitation" relationshipname="taxonCitations" columnname="TaxonID"/>
10311066
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.ExternalResource" relationshipname="externalResources" columnname="TaxonID"/>
1032-
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.Taxon" relationshipname="children" columnname="ParentId"/>
1067+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.Taxon" relationshipname="children" columnname="ParentID"/>
10331068
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.Taxon" relationshipname="acceptedTaxon" columnname="AcceptedID"/>
10341069
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.TaxonTreeDef" relationshipname="definition" columnname="TaxonTreeDefID"/>
10351070
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.TaxonTreeDefItem" relationshipname="definitionItem" columnname="TaxonTreeDefItemID"/>
@@ -1076,6 +1111,18 @@
10761111
<id column="UserGroupID" name="userGroupId" type="java.lang.Integer"/>
10771112
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.SpecifyUser" relationshipname="specifyUsers" columnname="UserGroupID"/>
10781113
</table>
1114+
<table classname="edu.ku.brc.specify.datamodel.ViewSetObj" table="viewsetobj" tableid="86" lazy="true">
1115+
<field column="Level" name="level" type="short"/>
1116+
<field column="Name" name="name" type="java.lang.String" length="64"/>
1117+
<field column="Description" name="description" type="java.lang.String" length="255"/>
1118+
<field column="MetaData" name="metaData" type="java.lang.String" length="255"/>
1119+
<field column="TimestampCreated" name="timestampCreated" type="java.sql.Timestamp" length="23"/>
1120+
<field column="TimestampModified" name="timestampModified" type="java.sql.Timestamp" length="23"/>
1121+
<field column="LastEditedBy" name="lastEditedBy" type="java.lang.String" length="50"/>
1122+
<id column="ViewSetObjID" name="viewSetObjId" type="java.lang.Integer"/>
1123+
<relationship type="many-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceDefault" relationshipname="appResourceDefaults" columnname="ViewSetObjID"/>
1124+
<relationship type="one-to-many" classname="edu.ku.brc.specify.datamodel.AppResourceData" relationshipname="appResourceDatas" columnname="ViewSetObjID"/>
1125+
</table>
10791126
<table classname="edu.ku.brc.specify.datamodel.Workbench" table="workbench" tableid="79" lazy="false">
10801127
<field column="Name" name="name" type="java.lang.String" length="64"/>
10811128
<field column="TableID" name="tableId" type="int"/>
@@ -1118,4 +1165,11 @@
11181165
<id column="WorkbenchTemplateMappingItemID" name="workbenchTemplateMappingItemID" type="java.lang.Integer"/>
11191166
<relationship type="many-to-one" classname="edu.ku.brc.specify.datamodel.WorkbenchTemplate" relationshipname="workbenchTemplates" columnname="WorkbenchTemplateID"/>
11201167
</table>
1168+
<table classname="edu.ku.brc.ui.db.PickList" table="picklist" tableid="500" view="PickList">
1169+
<field column="name" name="name" type="java.lang.String" length="64"/>
1170+
<field column="readOnly" name="readOnly" type="boolean"/>
1171+
<field column="sizeLimit" name="sizeLimit" type="java.lang.Integer" length="10"/>
1172+
<field column="created" name="created" type="java.util.Date"/>
1173+
<id column="PickListID" name="pickListId" type="int"/>
1174+
</table>
11211175
</database>

‎config/specify_tableid_listing.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
23
<tableIdMapping>
4+
35
<database>
46
<table name="edu.ku.brc.specify.datamodel.Accession" id="7" view="Accession"/>
57
<table name="edu.ku.brc.specify.datamodel.AccessionAgents" id="12"/>
@@ -74,6 +76,12 @@
7476
<table name="edu.ku.brc.specify.datamodel.WorkbenchDataItem" id="80"/>
7577
<table name="edu.ku.brc.specify.datamodel.WorkbenchTemplate" id="81"/>
7678
<table name="edu.ku.brc.specify.datamodel.WorkbenchTemplateMappingItem" id="82"/>
77-
<table name="edu.ku.brc.specify.datamodel.PickList" id="500" view="PickList"/>
79+
<table name="edu.ku.brc.ui.db.PickList" id="500" view="PickList"/>
80+
<table name="edu.ku.brc.specify.datamodel.AppResource" id="83" view=""/>
81+
<table name="edu.ku.brc.specify.datamodel.AppResourceData" id="84" view=""/>
82+
<table name="edu.ku.brc.specify.datamodel.AppResourceDefault" id="85" view=""/>
83+
<table name="edu.ku.brc.specify.datamodel.ViewSetObj" id="86" view=""/>
7884
</database>
85+
7986
</tableIdMapping>
87+

0 commit comments

Comments
 (0)