Author: sevein
Date: Tue Jun 28 13:57:50 2011
New Revision: 9217
Log:
For accession and deaccession records, use only date column, i18n free text
field is not necessary
Modified:
trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql
trunk/lib/model/map/ObjectTableMap.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/DeaccessionI18nTableMap.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.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 Tue Jun
28 13:56:43 2011 (r9216)
+++ trunk/data/sql/plugins.qtAccessionPlugin.lib.model.schema.sql Tue Jun
28 13:57:50 2011 (r9217)
@@ -58,7 +58,6 @@
`condition` TEXT,
`content` TEXT,
`creator` VARCHAR(255),
- `date` VARCHAR(255),
`location_information` TEXT,
`processing_notes` TEXT,
`received_extent_units` VARCHAR(255),
@@ -108,7 +107,6 @@
CREATE TABLE `deaccession_i18n`
(
- `date` VARCHAR(255),
`description` TEXT,
`extent` TEXT,
`reason` TEXT,
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Tue Jun 28 13:56:43 2011
(r9216)
+++ trunk/lib/model/map/ObjectTableMap.php Tue Jun 28 13:57:50 2011
(r9217)
@@ -50,8 +50,6 @@
public function buildRelations()
{
$this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_id', ), 'CASCADE', null);
- $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('actor', 'actor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('digitalObject', 'digitalObject',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('event', 'event', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
@@ -74,6 +72,8 @@
$this->addRelation('status', 'status', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('term', 'term', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
+ $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
} // ObjectTableMap
Modified: trunk/lib/model/map/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php Tue Jun 28 13:56:43 2011
(r9216)
+++ trunk/lib/model/map/TermTableMap.php Tue Jun 28 13:57:50 2011
(r9217)
@@ -54,11 +54,6 @@
$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);
@@ -95,6 +90,11 @@
$this->addRelation('systemEvent', 'systemEvent', RelationMap::ONE_TO_MANY,
array('id' => 'type_id', ), null, null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
$this->addRelation('termI18n', 'termI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', 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);
} // buildRelations()
} // TermTableMap
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Tue Jun 28 13:56:43 2011 (r9216)
+++ trunk/lib/model/om/BaseTerm.php Tue Jun 28 13:57:50 2011 (r9217)
@@ -109,31 +109,6 @@
{
}
- 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;
@@ -304,6 +279,31 @@
return true;
}
+ 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;
+ }
+
try
{
if (!$value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__isset'),
$args) && !empty($options['cultureFallback']))
@@ -348,91 +348,6 @@
{
}
- 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']))
@@ -1011,6 +926,91 @@
return $this->refFkValues['termI18ns'];
}
+ 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'];
+ }
+
try
{
if (1 > strlen($value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__get'),
$args)) && !empty($options['cultureFallback']))
@@ -1229,106 +1229,6 @@
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);
@@ -2009,6 +1909,106 @@
return self::addtermI18nsCriteriaById($criteria, $this->id);
}
+ 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 function getCurrenttermI18n(array $options = array())
{
if (!empty($options['sourceCulture']))
Modified: trunk/plugins/qtAccessionPlugin/config/schema.yml
==============================================================================
--- trunk/plugins/qtAccessionPlugin/config/schema.yml Tue Jun 28 13:56:43
2011 (r9216)
+++ trunk/plugins/qtAccessionPlugin/config/schema.yml Tue Jun 28 13:57:50
2011 (r9217)
@@ -17,7 +17,6 @@
condition: longvarchar
content: longvarchar
creator: varchar(255)
- date: varchar(255)
location_information: longvarchar
processing_notes: longvarchar
received_extent_units: varchar(255)
@@ -32,7 +31,6 @@
updated_at:
deaccession_i18n:
- date: varchar(255)
description: longvarchar
extent: longvarchar
reason: longvarchar
Modified:
trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
Tue Jun 28 13:56:43 2011 (r9216)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/AccessionI18nTableMap.php
Tue Jun 28 13:57:50 2011 (r9217)
@@ -40,7 +40,6 @@
$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);
Modified:
trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
Tue Jun 28 13:56:43 2011 (r9216)
+++ trunk/plugins/qtAccessionPlugin/lib/model/map/DeaccessionI18nTableMap.php
Tue Jun 28 13:57:50 2011 (r9217)
@@ -36,7 +36,6 @@
$this->setPackage('plugins.qtAccessionPlugin.lib.model');
$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);
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php Tue Jun
28 13:56:43 2011 (r9216)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php Tue Jun
28 13:57:50 2011 (r9217)
@@ -11,7 +11,6 @@
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',
@@ -26,7 +25,6 @@
$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);
@@ -48,8 +46,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[10];
- $keys['culture'] = $row[11];
+ $keys['id'] = $row[9];
+ $keys['culture'] = $row[10];
$key = serialize($keys);
if (!isset(self::$accessionI18ns[$key]))
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Tue Jun 28 13:56:43 2011 (r9216)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Tue Jun 28 13:57:50 2011 (r9217)
@@ -7,7 +7,6 @@
TABLE_NAME = 'deaccession_i18n',
- DATE = 'deaccession_i18n.DATE',
DESCRIPTION = 'deaccession_i18n.DESCRIPTION',
EXTENT = 'deaccession_i18n.EXTENT',
REASON = 'deaccession_i18n.REASON',
@@ -16,7 +15,6 @@
public static function addSelectColumns(Criteria $criteria)
{
- $criteria->addSelectColumn(QubitDeaccessionI18n::DATE);
$criteria->addSelectColumn(QubitDeaccessionI18n::DESCRIPTION);
$criteria->addSelectColumn(QubitDeaccessionI18n::EXTENT);
$criteria->addSelectColumn(QubitDeaccessionI18n::REASON);
@@ -36,8 +34,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[4];
- $keys['culture'] = $row[5];
+ $keys['id'] = $row[3];
+ $keys['culture'] = $row[4];
$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.
