Author: sevein
Date: Mon Jun 27 22:03:07 2011
New Revision: 9202
Log:
Add more fields to accession db module
Modified:
trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql
trunk/lib/model/QubitTaxonomy.php
trunk/lib/model/map/TermTableMap.php
trunk/lib/model/om/BaseTerm.php
trunk/plugins/qtAccessionPlugin/config/schema.yml
trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Modified: trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql
==============================================================================
--- trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql Mon Jun
27 17:51:50 2011 (r9201)
+++ trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql Mon Jun
27 22:03:07 2011 (r9202)
@@ -13,8 +13,12 @@
CREATE TABLE `accession`
(
`id` INTEGER NOT NULL,
+ `acquisition_type_id` INTEGER,
`date` DATE,
`identifier` VARCHAR(255),
+ `processing_priority_id` INTEGER,
+ `processing_status_id` INTEGER,
+ `resource_type_id` INTEGER,
`created_at` DATETIME NOT NULL,
`updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
@@ -22,7 +26,23 @@
CONSTRAINT `accession_FK_1`
FOREIGN KEY (`id`)
REFERENCES `object` (`id`)
- ON DELETE CASCADE
+ ON DELETE CASCADE,
+ INDEX `accession_FI_2` (`acquisition_type_id`),
+ CONSTRAINT `accession_FK_2`
+ FOREIGN KEY (`acquisition_type_id`)
+ REFERENCES `term` (`id`),
+ INDEX `accession_FI_3` (`processing_priority_id`),
+ CONSTRAINT `accession_FK_3`
+ FOREIGN KEY (`processing_priority_id`)
+ REFERENCES `term` (`id`),
+ INDEX `accession_FI_4` (`processing_status_id`),
+ CONSTRAINT `accession_FK_4`
+ FOREIGN KEY (`processing_status_id`)
+ REFERENCES `term` (`id`),
+ INDEX `accession_FI_5` (`resource_type_id`),
+ CONSTRAINT `accession_FK_5`
+ FOREIGN KEY (`resource_type_id`)
+ REFERENCES `term` (`id`)
)Engine=InnoDB;
#-----------------------------------------------------------------------------
@@ -34,7 +54,15 @@
CREATE TABLE `accession_i18n`
(
+ `archival_history` TEXT,
+ `condition` TEXT,
+ `content` TEXT,
+ `creator` VARCHAR(255),
`date` VARCHAR(255),
+ `location_information` TEXT,
+ `processing_notes` TEXT,
+ `received_extent_units` VARCHAR(255),
+ `source_of_acquisition` TEXT,
`title` VARCHAR(255),
`id` INTEGER NOT NULL,
`culture` VARCHAR(7) NOT NULL,
@@ -56,6 +84,7 @@
(
`id` INTEGER NOT NULL,
`date` DATE,
+ `scope_id` INTEGER,
`created_at` DATETIME NOT NULL,
`updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
@@ -63,7 +92,11 @@
CONSTRAINT `deaccession_FK_1`
FOREIGN KEY (`id`)
REFERENCES `object` (`id`)
- ON DELETE CASCADE
+ ON DELETE CASCADE,
+ INDEX `deaccession_FI_2` (`scope_id`),
+ CONSTRAINT `deaccession_FK_2`
+ FOREIGN KEY (`scope_id`)
+ REFERENCES `term` (`id`)
)Engine=InnoDB;
#-----------------------------------------------------------------------------
@@ -76,6 +109,9 @@
CREATE TABLE `deaccession_i18n`
(
`date` VARCHAR(255),
+ `description` TEXT,
+ `extent` TEXT,
+ `reason` TEXT,
`id` INTEGER NOT NULL,
`culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`,`culture`),
Modified: trunk/lib/model/QubitTaxonomy.php
==============================================================================
--- trunk/lib/model/QubitTaxonomy.php Mon Jun 27 17:51:50 2011 (r9201)
+++ trunk/lib/model/QubitTaxonomy.php Mon Jun 27 22:03:07 2011 (r9202)
@@ -59,7 +59,11 @@
ACCESSION_ACQUISITION_TYPE_ID = 63,
ACCESSION_PROCESSING_PRIORITY_ID = 64,
ACCESSION_PROCESSING_STATUS_ID = 65,
- DEACCESSION_SCOPE_ID = 66;
+ DEACCESSION_SCOPE_ID = 66,
+
+ // Rights taxonomies
+ RIGHTS_STATUS_ID = 67,
+ RIGHTS_TYPE_ID = 68;
public static
$lockedTaxonomies = array(
Modified: trunk/lib/model/map/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php Mon Jun 27 17:51:50 2011
(r9201)
+++ trunk/lib/model/map/TermTableMap.php Mon Jun 27 22:03:07 2011
(r9202)
@@ -54,6 +54,11 @@
$this->addRelation('object', 'object', RelationMap::MANY_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::MANY_TO_ONE,
array('taxonomy_id' => 'id', ), 'CASCADE', null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
+ $this->addRelation('accessionRelatedByacquisitionTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'acquisition_type_id', ), null, null);
+ $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), null,
null);
+ $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), null, null);
+ $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), null, null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), null, null);
$this->addRelation('actorRelatedByentityTypeId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'entity_type_id', ), 'SET NULL', null);
$this->addRelation('actorRelatedBydescriptionStatusId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'description_status_id', ), 'SET NULL',
null);
$this->addRelation('actorRelatedBydescriptionDetailId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'description_detail_id', ), 'SET NULL',
null);
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Mon Jun 27 17:51:50 2011 (r9201)
+++ trunk/lib/model/om/BaseTerm.php Mon Jun 27 22:03:07 2011 (r9202)
@@ -109,6 +109,31 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('deaccessions' == $name)
+ {
+ return true;
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
return true;
@@ -323,6 +348,91 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByresourceTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
self::getaccessionsRelatedByresourceTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByresourceTypeId'];
+ }
+
+ if ('deaccessions' == $name)
+ {
+ if (!isset($this->refFkValues['deaccessions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['deaccessions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['deaccessions'] =
self::getdeaccessionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['deaccessions'];
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
if (!isset($this->refFkValues['actorsRelatedByentityTypeId']))
@@ -1119,6 +1229,106 @@
return $criteria;
}
+ public static function
addaccessionsRelatedByacquisitionTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::ACQUISITION_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByacquisitionTypeIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByacquisitionTypeIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingPriorityIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_PRIORITY_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingPriorityIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingPriorityIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingStatusIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_STATUS_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingStatusIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingStatusIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByresourceTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::RESOURCE_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByresourceTypeIdById($id, array
$options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByresourceTypeIdCriteria(Criteria
$criteria)
+ {
+ return self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function adddeaccessionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitDeaccession::SCOPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getdeaccessionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::adddeaccessionsCriteriaById($criteria, $id);
+
+ return QubitDeaccession::get($criteria, $options);
+ }
+
+ public function adddeaccessionsCriteria(Criteria $criteria)
+ {
+ return self::adddeaccessionsCriteriaById($criteria, $this->id);
+ }
+
public static function addactorsRelatedByentityTypeIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitActor::ENTITY_TYPE_ID, $id);
Modified: trunk/plugins/qtAccessionPlugin/config/schema.yml
==============================================================================
--- trunk/plugins/qtAccessionPlugin/config/schema.yml Mon Jun 27 17:51:50
2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/config/schema.yml Mon Jun 27 22:03:07
2011 (r9202)
@@ -3,41 +3,36 @@
accession:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
- # acquisition_type_id: { type: integer, foreignTable: term,
foreignReference: id }
+ acquisition_type_id: { type: integer, foreignTable: term,
foreignReference: id }
date: bu_date
- # expected_completion_date: bu_date
identifier: varchar(255)
- # processing_priority_id: { type: integer, foreignTable: term,
foreignReference: id }
- # processing_status_id: { type: integer, foreignTable: term,
foreignReference: id }
- # type_id: { type: integer, foreignTable: term, foreignReference: id }
+ processing_priority_id: { type: integer, foreignTable: term,
foreignReference: id }
+ processing_status_id: { type: integer, foreignTable: term,
foreignReference: id }
+ resource_type_id: { type: integer, foreignTable: term, foreignReference:
id }
created_at:
updated_at:
accession_i18n:
- # archival_history: longvarchar
- # condition_description: longvarchar
- # content_description: longvarchar
+ archival_history: longvarchar
+ condition: longvarchar
+ content: longvarchar
+ creator: varchar(255)
date: varchar(255)
- # expected_completion_date: bu_date
- # inventory: longvarchar
- # notes: longvarchar
- # processing_notes: longvarchar
- # received_extent_units: longvarchar
- # source_of_acquisition: longvarchar
+ location_information: longvarchar
+ processing_notes: longvarchar
+ received_extent_units: varchar(255)
+ source_of_acquisition: longvarchar
title: varchar(255)
- # unprocessed_extent_units: longvarchar
deaccession:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
date: bu_date
- # scope_id: { type: integer, foreignTable: term, foreignReference: id }
+ scope_id: { type: integer, foreignTable: term, foreignReference: id }
created_at:
updated_at:
deaccession_i18n:
date: varchar(255)
- # description: longvarchar
- # disposition: longvarchar
- # extent: longvarchar
- # notification: longvarchar
- # reason: longvarchar
+ description: longvarchar
+ extent: longvarchar
+ reason: longvarchar
Modified:
trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
Mon Jun 27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
Mon Jun 27 22:03:07 2011 (r9202)
@@ -36,7 +36,15 @@
$this->setPackage('plugins.qtAccessionPlugin.lib.model');
$this->setUseIdGenerator(false);
// columns
+ $this->addColumn('ARCHIVAL_HISTORY', 'archivalHistory',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('CONDITION', 'condition', 'LONGVARCHAR',
false, null, null);
+ $this->addColumn('CONTENT', 'content', 'LONGVARCHAR', false,
null, null);
+ $this->addColumn('CREATOR', 'creator', 'VARCHAR', false, 255,
null);
$this->addColumn('DATE', 'date', 'VARCHAR', false, 255, null);
+ $this->addColumn('LOCATION_INFORMATION', 'locationInformation',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('PROCESSING_NOTES', 'processingNotes',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('RECEIVED_EXTENT_UNITS',
'receivedExtentUnits', 'VARCHAR', false, 255, null);
+ $this->addColumn('SOURCE_OF_ACQUISITION',
'sourceOfAcquisition', 'LONGVARCHAR', false, null, null);
$this->addColumn('TITLE', 'title', 'VARCHAR', false, 255, null);
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' ,
'accession', 'ID', true, null, null);
$this->addPrimaryKey('CULTURE', 'culture', 'VARCHAR', true, 7,
null);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php Mon Jun
27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionTableMap.php Mon Jun
27 22:03:07 2011 (r9202)
@@ -37,8 +37,12 @@
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'object',
'ID', true, null, null);
+ $this->addForeignKey('ACQUISITION_TYPE_ID',
'acquisitionTypeId', 'INTEGER', 'term', 'ID', false, null, null);
$this->addColumn('DATE', 'date', 'DATE', false, null, null);
$this->addColumn('IDENTIFIER', 'identifier', 'VARCHAR', false,
255, null);
+ $this->addForeignKey('PROCESSING_PRIORITY_ID',
'processingPriorityId', 'INTEGER', 'term', 'ID', false, null, null);
+ $this->addForeignKey('PROCESSING_STATUS_ID',
'processingStatusId', 'INTEGER', 'term', 'ID', false, null, null);
+ $this->addForeignKey('RESOURCE_TYPE_ID', 'resourceTypeId',
'INTEGER', 'term', 'ID', false, null, null);
$this->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null, null);
$this->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null, null);
$this->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7, null);
@@ -51,6 +55,10 @@
public function buildRelations()
{
$this->addRelation('object', 'object', RelationMap::MANY_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
+ $this->addRelation('termRelatedByacquisitionTypeId', 'term',
RelationMap::MANY_TO_ONE, array('acquisition_type_id' => 'id', ), null, null);
+ $this->addRelation('termRelatedByprocessingPriorityId', 'term',
RelationMap::MANY_TO_ONE, array('processing_priority_id' => 'id', ), null,
null);
+ $this->addRelation('termRelatedByprocessingStatusId', 'term',
RelationMap::MANY_TO_ONE, array('processing_status_id' => 'id', ), null, null);
+ $this->addRelation('termRelatedByresourceTypeId', 'term',
RelationMap::MANY_TO_ONE, array('resource_type_id' => 'id', ), null, null);
$this->addRelation('accessionI18n', 'accessionI18n',
RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
Modified:
trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
Mon Jun 27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
Mon Jun 27 22:03:07 2011 (r9202)
@@ -37,6 +37,9 @@
$this->setUseIdGenerator(false);
// columns
$this->addColumn('DATE', 'date', 'VARCHAR', false, 255, null);
+ $this->addColumn('DESCRIPTION', 'description', 'LONGVARCHAR',
false, null, null);
+ $this->addColumn('EXTENT', 'extent', 'LONGVARCHAR', false,
null, null);
+ $this->addColumn('REASON', 'reason', 'LONGVARCHAR', false,
null, null);
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' ,
'deaccession', 'ID', true, null, null);
$this->addPrimaryKey('CULTURE', 'culture', 'VARCHAR', true, 7,
null);
// validators
Modified: trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
Mon Jun 27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionTableMap.php
Mon Jun 27 22:03:07 2011 (r9202)
@@ -38,6 +38,7 @@
// columns
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'object',
'ID', true, null, null);
$this->addColumn('DATE', 'date', 'DATE', false, null, null);
+ $this->addForeignKey('SCOPE_ID', 'scopeId', 'INTEGER', 'term',
'ID', false, null, null);
$this->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null, null);
$this->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null, null);
$this->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7, null);
@@ -50,6 +51,7 @@
public function buildRelations()
{
$this->addRelation('object', 'object', RelationMap::MANY_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
+ $this->addRelation('term', 'term', RelationMap::MANY_TO_ONE,
array('scope_id' => 'id', ), null, null);
$this->addRelation('deaccessionI18n', 'deaccessionI18n',
RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php Mon Jun
27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccession.php Mon Jun
27 22:03:07 2011 (r9202)
@@ -8,8 +8,12 @@
TABLE_NAME = 'accession',
ID = 'accession.ID',
+ ACQUISITION_TYPE_ID = 'accession.ACQUISITION_TYPE_ID',
DATE = 'accession.DATE',
IDENTIFIER = 'accession.IDENTIFIER',
+ PROCESSING_PRIORITY_ID = 'accession.PROCESSING_PRIORITY_ID',
+ PROCESSING_STATUS_ID = 'accession.PROCESSING_STATUS_ID',
+ RESOURCE_TYPE_ID = 'accession.RESOURCE_TYPE_ID',
CREATED_AT = 'accession.CREATED_AT',
UPDATED_AT = 'accession.UPDATED_AT',
SOURCE_CULTURE = 'accession.SOURCE_CULTURE';
@@ -21,8 +25,12 @@
$criteria->addJoin(QubitAccession::ID, QubitObject::ID);
$criteria->addSelectColumn(QubitAccession::ID);
+ $criteria->addSelectColumn(QubitAccession::ACQUISITION_TYPE_ID);
$criteria->addSelectColumn(QubitAccession::DATE);
$criteria->addSelectColumn(QubitAccession::IDENTIFIER);
+ $criteria->addSelectColumn(QubitAccession::PROCESSING_PRIORITY_ID);
+ $criteria->addSelectColumn(QubitAccession::PROCESSING_STATUS_ID);
+ $criteria->addSelectColumn(QubitAccession::RESOURCE_TYPE_ID);
$criteria->addSelectColumn(QubitAccession::CREATED_AT);
$criteria->addSelectColumn(QubitAccession::UPDATED_AT);
$criteria->addSelectColumn(QubitAccession::SOURCE_CULTURE);
@@ -220,6 +228,34 @@
return $this;
}
+ public static function addJoinacquisitionTypeCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitAccession::ACQUISITION_TYPE_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
+ public static function addJoinprocessingPriorityCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitAccession::PROCESSING_PRIORITY_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
+ public static function addJoinprocessingStatusCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitAccession::PROCESSING_STATUS_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
+ public static function addJoinresourceTypeCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitAccession::RESOURCE_TYPE_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
public static function addaccessionI18nsCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitAccessionI18n::ID, $id);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php Mon Jun
27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php Mon Jun
27 22:03:07 2011 (r9202)
@@ -7,14 +7,30 @@
TABLE_NAME = 'accession_i18n',
+ ARCHIVAL_HISTORY = 'accession_i18n.ARCHIVAL_HISTORY',
+ CONDITION = 'accession_i18n.CONDITION',
+ CONTENT = 'accession_i18n.CONTENT',
+ CREATOR = 'accession_i18n.CREATOR',
DATE = 'accession_i18n.DATE',
+ LOCATION_INFORMATION = 'accession_i18n.LOCATION_INFORMATION',
+ PROCESSING_NOTES = 'accession_i18n.PROCESSING_NOTES',
+ RECEIVED_EXTENT_UNITS = 'accession_i18n.RECEIVED_EXTENT_UNITS',
+ SOURCE_OF_ACQUISITION = 'accession_i18n.SOURCE_OF_ACQUISITION',
TITLE = 'accession_i18n.TITLE',
ID = 'accession_i18n.ID',
CULTURE = 'accession_i18n.CULTURE';
public static function addSelectColumns(Criteria $criteria)
{
+ $criteria->addSelectColumn(QubitAccessionI18n::ARCHIVAL_HISTORY);
+ $criteria->addSelectColumn(QubitAccessionI18n::CONDITION);
+ $criteria->addSelectColumn(QubitAccessionI18n::CONTENT);
+ $criteria->addSelectColumn(QubitAccessionI18n::CREATOR);
$criteria->addSelectColumn(QubitAccessionI18n::DATE);
+ $criteria->addSelectColumn(QubitAccessionI18n::LOCATION_INFORMATION);
+ $criteria->addSelectColumn(QubitAccessionI18n::PROCESSING_NOTES);
+ $criteria->addSelectColumn(QubitAccessionI18n::RECEIVED_EXTENT_UNITS);
+ $criteria->addSelectColumn(QubitAccessionI18n::SOURCE_OF_ACQUISITION);
$criteria->addSelectColumn(QubitAccessionI18n::TITLE);
$criteria->addSelectColumn(QubitAccessionI18n::ID);
$criteria->addSelectColumn(QubitAccessionI18n::CULTURE);
@@ -32,8 +48,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[2];
- $keys['culture'] = $row[3];
+ $keys['id'] = $row[10];
+ $keys['culture'] = $row[11];
$key = serialize($keys);
if (!isset(self::$accessionI18ns[$key]))
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php Mon Jun
27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccession.php Mon Jun
27 22:03:07 2011 (r9202)
@@ -9,6 +9,7 @@
ID = 'deaccession.ID',
DATE = 'deaccession.DATE',
+ SCOPE_ID = 'deaccession.SCOPE_ID',
CREATED_AT = 'deaccession.CREATED_AT',
UPDATED_AT = 'deaccession.UPDATED_AT',
SOURCE_CULTURE = 'deaccession.SOURCE_CULTURE';
@@ -21,6 +22,7 @@
$criteria->addSelectColumn(QubitDeaccession::ID);
$criteria->addSelectColumn(QubitDeaccession::DATE);
+ $criteria->addSelectColumn(QubitDeaccession::SCOPE_ID);
$criteria->addSelectColumn(QubitDeaccession::CREATED_AT);
$criteria->addSelectColumn(QubitDeaccession::UPDATED_AT);
$criteria->addSelectColumn(QubitDeaccession::SOURCE_CULTURE);
@@ -218,6 +220,13 @@
return $this;
}
+ public static function addJoinscopeCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitDeaccession::SCOPE_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
public static function adddeaccessionI18nsCriteriaById(Criteria $criteria,
$id)
{
$criteria->add(QubitDeaccessionI18n::ID, $id);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Mon Jun 27 17:51:50 2011 (r9201)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Mon Jun 27 22:03:07 2011 (r9202)
@@ -8,12 +8,18 @@
TABLE_NAME = 'deaccession_i18n',
DATE = 'deaccession_i18n.DATE',
+ DESCRIPTION = 'deaccession_i18n.DESCRIPTION',
+ EXTENT = 'deaccession_i18n.EXTENT',
+ REASON = 'deaccession_i18n.REASON',
ID = 'deaccession_i18n.ID',
CULTURE = 'deaccession_i18n.CULTURE';
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(QubitDeaccessionI18n::DATE);
+ $criteria->addSelectColumn(QubitDeaccessionI18n::DESCRIPTION);
+ $criteria->addSelectColumn(QubitDeaccessionI18n::EXTENT);
+ $criteria->addSelectColumn(QubitDeaccessionI18n::REASON);
$criteria->addSelectColumn(QubitDeaccessionI18n::ID);
$criteria->addSelectColumn(QubitDeaccessionI18n::CULTURE);
@@ -30,8 +36,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[1];
- $keys['culture'] = $row[2];
+ $keys['id'] = $row[4];
+ $keys['culture'] = $row[5];
$key = serialize($keys);
if (!isset(self::$deaccessionI18ns[$key]))
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
