Author: sevein
Date: Tue Jul 19 16:44:02 2011
New Revision: 9339
Log:
Add columns to right entity
Modified:
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/lib/model/map/ActorTableMap.php
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/RightTableMap.php
trunk/lib/model/map/TermTableMap.php
trunk/lib/model/map/UserTableMap.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseRight.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseUser.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Tue Jul 19 16:41:48 2011 (r9338)
+++ trunk/config/schema.yml Tue Jul 19 16:44:02 2011 (r9339)
@@ -310,7 +310,8 @@
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
start_date: bu_date
end_date: bu_date
- copyright_status_id: { type: integer, foreignTable: term,
foreignReference: id }
+ basis_id: { type: integer, foreignTable: term, foreignReference: id }
+ act_id: { type: integer, foreignTable: term, foreignReference: id }
right_i18n:
copyright_note: longvarchar
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Tue Jul 19 16:41:48 2011 (r9338)
+++ trunk/data/sql/lib.model.schema.sql Tue Jul 19 16:44:02 2011 (r9339)
@@ -1059,16 +1059,21 @@
`id` INTEGER NOT NULL,
`start_date` DATE,
`end_date` DATE,
- `copyright_status_id` INTEGER,
+ `basis_id` INTEGER,
+ `act_id` INTEGER,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `right_FK_1`
FOREIGN KEY (`id`)
REFERENCES `object` (`id`)
ON DELETE CASCADE,
- INDEX `right_FI_2` (`copyright_status_id`),
+ INDEX `right_FI_2` (`basis_id`),
CONSTRAINT `right_FK_2`
- FOREIGN KEY (`copyright_status_id`)
+ FOREIGN KEY (`basis_id`)
+ REFERENCES `term` (`id`),
+ INDEX `right_FI_3` (`act_id`),
+ CONSTRAINT `right_FK_3`
+ FOREIGN KEY (`act_id`)
REFERENCES `term` (`id`)
)Engine=InnoDB;
Modified: trunk/lib/model/map/ActorTableMap.php
==============================================================================
--- trunk/lib/model/map/ActorTableMap.php Tue Jul 19 16:41:48 2011
(r9338)
+++ trunk/lib/model/map/ActorTableMap.php Tue Jul 19 16:44:02 2011
(r9339)
@@ -60,13 +60,13 @@
$this->addRelation('termRelatedBydescriptionStatusId', 'term',
RelationMap::MANY_TO_ONE, array('description_status_id' => 'id', ), 'SET NULL',
null);
$this->addRelation('termRelatedBydescriptionDetailId', 'term',
RelationMap::MANY_TO_ONE, array('description_detail_id' => 'id', ), 'SET NULL',
null);
$this->addRelation('actorRelatedByparentId', 'actor',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
- $this->addRelation('donor', 'donor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('actorRelatedByparentId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
$this->addRelation('actorI18n', 'actorI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('contactInformation', 'contactInformation',
RelationMap::ONE_TO_MANY, array('id' => 'actor_id', ), 'CASCADE', null);
$this->addRelation('event', 'event', RelationMap::ONE_TO_MANY, array('id'
=> 'actor_id', ), null, null);
$this->addRelation('repository', 'repository', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('user', 'user', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
+ $this->addRelation('donor', 'donor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
} // buildRelations()
} // ActorTableMap
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Tue Jul 19 16:41:48 2011
(r9338)
+++ trunk/lib/model/map/ObjectTableMap.php Tue Jul 19 16:44:02 2011
(r9339)
@@ -49,8 +49,7 @@
*/
public function buildRelations()
{
- $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('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_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);
@@ -72,7 +71,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('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);
} // buildRelations()
} // ObjectTableMap
Modified: trunk/lib/model/map/RightTableMap.php
==============================================================================
--- trunk/lib/model/map/RightTableMap.php Tue Jul 19 16:41:48 2011
(r9338)
+++ trunk/lib/model/map/RightTableMap.php Tue Jul 19 16:44:02 2011
(r9339)
@@ -39,7 +39,8 @@
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'object',
'ID', true, null, null);
$this->addColumn('START_DATE', 'startDate', 'DATE', false,
null, null);
$this->addColumn('END_DATE', 'endDate', 'DATE', false, null,
null);
- $this->addForeignKey('COPYRIGHT_STATUS_ID',
'copyrightStatusId', 'INTEGER', 'term', 'ID', false, null, null);
+ $this->addForeignKey('BASIS_ID', 'basisId', 'INTEGER', 'term',
'ID', false, null, null);
+ $this->addForeignKey('ACT_ID', 'actId', 'INTEGER', 'term',
'ID', false, null, null);
$this->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7, null);
// validators
} // initialize()
@@ -50,7 +51,8 @@
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('copyright_status_id' => 'id', ), null, null);
+ $this->addRelation('termRelatedBybasisId', 'term',
RelationMap::MANY_TO_ONE, array('basis_id' => 'id', ), null, null);
+ $this->addRelation('termRelatedByactId', 'term', RelationMap::MANY_TO_ONE,
array('act_id' => 'id', ), null, null);
$this->addRelation('rightI18n', 'rightI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
Modified: trunk/lib/model/map/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php Tue Jul 19 16:41:48 2011
(r9338)
+++ trunk/lib/model/map/TermTableMap.php Tue Jul 19 16:44:02 2011
(r9339)
@@ -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);
@@ -85,12 +80,18 @@
$this->addRelation('relation', 'relation', RelationMap::ONE_TO_MANY,
array('id' => 'type_id', ), null, null);
$this->addRelation('repositoryRelatedBydescStatusId', 'repository',
RelationMap::ONE_TO_MANY, array('id' => 'desc_status_id', ), 'SET NULL', null);
$this->addRelation('repositoryRelatedBydescDetailId', 'repository',
RelationMap::ONE_TO_MANY, array('id' => 'desc_detail_id', ), 'SET NULL', null);
- $this->addRelation('right', 'right', RelationMap::ONE_TO_MANY, array('id'
=> 'copyright_status_id', ), null, null);
+ $this->addRelation('rightRelatedBybasisId', 'right',
RelationMap::ONE_TO_MANY, array('id' => 'basis_id', ), null, null);
+ $this->addRelation('rightRelatedByactId', 'right',
RelationMap::ONE_TO_MANY, array('id' => 'act_id', ), null, null);
$this->addRelation('statusRelatedBytypeId', 'status',
RelationMap::ONE_TO_MANY, array('id' => 'type_id', ), 'CASCADE', null);
$this->addRelation('statusRelatedBystatusId', 'status',
RelationMap::ONE_TO_MANY, array('id' => 'status_id', ), 'CASCADE', null);
$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/map/UserTableMap.php
==============================================================================
--- trunk/lib/model/map/UserTableMap.php Tue Jul 19 16:41:48 2011
(r9338)
+++ trunk/lib/model/map/UserTableMap.php Tue Jul 19 16:44:02 2011
(r9339)
@@ -50,10 +50,10 @@
public function buildRelations()
{
$this->addRelation('actor', 'actor', RelationMap::MANY_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
- $this->addRelation('note', 'note', RelationMap::ONE_TO_MANY, array('id' =>
'user_id', ), null, null);
- $this->addRelation('systemEvent', 'systemEvent', RelationMap::ONE_TO_MANY,
array('id' => 'user_id', ), null, null);
$this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), 'CASCADE', null);
$this->addRelation('aclUserGroup', 'aclUserGroup',
RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), 'CASCADE', null);
+ $this->addRelation('note', 'note', RelationMap::ONE_TO_MANY, array('id' =>
'user_id', ), null, null);
+ $this->addRelation('systemEvent', 'systemEvent', RelationMap::ONE_TO_MANY,
array('id' => 'user_id', ), null, null);
} // buildRelations()
} // UserTableMap
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Tue Jul 19 16:41:48 2011 (r9338)
+++ trunk/lib/model/om/BaseObject.php Tue Jul 19 16:44:02 2011 (r9339)
@@ -180,6 +180,11 @@
}
}
+ if ('aclPermissions' == $name)
+ {
+ return true;
+ }
+
if ('notes' == $name)
{
return true;
@@ -220,11 +225,6 @@
return true;
}
- if ('aclPermissions' == $name)
- {
- return true;
- }
-
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -266,6 +266,23 @@
}
}
+ if ('aclPermissions' == $name)
+ {
+ if (!isset($this->refFkValues['aclPermissions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['aclPermissions'];
+ }
+
if ('notes' == $name)
{
if (!isset($this->refFkValues['notes']))
@@ -402,23 +419,6 @@
return $this->refFkValues['statuss'];
}
- if ('aclPermissions' == $name)
- {
- if (!isset($this->refFkValues['aclPermissions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['aclPermissions'];
- }
-
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -717,6 +717,26 @@
$this->setid($key);
}
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::OBJECT_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::OBJECT_ID, $id);
@@ -877,26 +897,6 @@
return self::addstatussCriteriaById($criteria, $this->id);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::OBJECT_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
public function __call($name, $args)
{
if ('get' == substr($name, 0, 3) || 'set' == substr($name, 0, 3))
Modified: trunk/lib/model/om/BaseRight.php
==============================================================================
--- trunk/lib/model/om/BaseRight.php Tue Jul 19 16:41:48 2011 (r9338)
+++ trunk/lib/model/om/BaseRight.php Tue Jul 19 16:44:02 2011 (r9339)
@@ -10,7 +10,8 @@
ID = 'right.ID',
START_DATE = 'right.START_DATE',
END_DATE = 'right.END_DATE',
- COPYRIGHT_STATUS_ID = 'right.COPYRIGHT_STATUS_ID',
+ BASIS_ID = 'right.BASIS_ID',
+ ACT_ID = 'right.ACT_ID',
SOURCE_CULTURE = 'right.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -22,7 +23,8 @@
$criteria->addSelectColumn(QubitRight::ID);
$criteria->addSelectColumn(QubitRight::START_DATE);
$criteria->addSelectColumn(QubitRight::END_DATE);
- $criteria->addSelectColumn(QubitRight::COPYRIGHT_STATUS_ID);
+ $criteria->addSelectColumn(QubitRight::BASIS_ID);
+ $criteria->addSelectColumn(QubitRight::ACT_ID);
$criteria->addSelectColumn(QubitRight::SOURCE_CULTURE);
return $criteria;
@@ -218,9 +220,16 @@
return $this;
}
- public static function addJoincopyrightStatusCriteria(Criteria $criteria)
+ public static function addJoinbasisCriteria(Criteria $criteria)
{
- $criteria->addJoin(QubitRight::COPYRIGHT_STATUS_ID, QubitTerm::ID);
+ $criteria->addJoin(QubitRight::BASIS_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
+ public static function addJoinactCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitRight::ACT_ID, QubitTerm::ID);
return $criteria;
}
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Tue Jul 19 16:41:48 2011 (r9338)
+++ trunk/lib/model/om/BaseTerm.php Tue Jul 19 16:44:02 2011 (r9339)
@@ -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;
@@ -254,7 +229,12 @@
return true;
}
- if ('rights' == $name)
+ if ('rightsRelatedBybasisId' == $name)
+ {
+ return true;
+ }
+
+ if ('rightsRelatedByactId' == $name)
{
return true;
}
@@ -284,6 +264,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']))
@@ -328,91 +333,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']))
@@ -821,21 +741,38 @@
return $this->refFkValues['repositorysRelatedBydescDetailId'];
}
- if ('rights' == $name)
+ if ('rightsRelatedBybasisId' == $name)
+ {
+ if (!isset($this->refFkValues['rightsRelatedBybasisId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['rightsRelatedBybasisId'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['rightsRelatedBybasisId'] =
self::getrightsRelatedBybasisIdById($this->id, array('self' => $this) +
$options);
+ }
+ }
+
+ return $this->refFkValues['rightsRelatedBybasisId'];
+ }
+
+ if ('rightsRelatedByactId' == $name)
{
- if (!isset($this->refFkValues['rights']))
+ if (!isset($this->refFkValues['rightsRelatedByactId']))
{
if (!isset($this->id))
{
- $this->refFkValues['rights'] = QubitQuery::create();
+ $this->refFkValues['rightsRelatedByactId'] = QubitQuery::create();
}
else
{
- $this->refFkValues['rights'] = self::getrightsById($this->id,
array('self' => $this) + $options);
+ $this->refFkValues['rightsRelatedByactId'] =
self::getrightsRelatedByactIdById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['rights'];
+ return $this->refFkValues['rightsRelatedByactId'];
}
if ('statussRelatedBytypeId' == $name)
@@ -923,6 +860,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']))
@@ -1141,106 +1163,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);
@@ -1721,24 +1643,44 @@
return self::addrepositorysRelatedBydescDetailIdCriteriaById($criteria,
$this->id);
}
- public static function addrightsCriteriaById(Criteria $criteria, $id)
+ public static function addrightsRelatedBybasisIdCriteriaById(Criteria
$criteria, $id)
{
- $criteria->add(QubitRight::COPYRIGHT_STATUS_ID, $id);
+ $criteria->add(QubitRight::BASIS_ID, $id);
return $criteria;
}
- public static function getrightsById($id, array $options = array())
+ public static function getrightsRelatedBybasisIdById($id, array $options =
array())
{
$criteria = new Criteria;
- self::addrightsCriteriaById($criteria, $id);
+ self::addrightsRelatedBybasisIdCriteriaById($criteria, $id);
return QubitRight::get($criteria, $options);
}
- public function addrightsCriteria(Criteria $criteria)
+ public function addrightsRelatedBybasisIdCriteria(Criteria $criteria)
{
- return self::addrightsCriteriaById($criteria, $this->id);
+ return self::addrightsRelatedBybasisIdCriteriaById($criteria, $this->id);
+ }
+
+ public static function addrightsRelatedByactIdCriteriaById(Criteria
$criteria, $id)
+ {
+ $criteria->add(QubitRight::ACT_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getrightsRelatedByactIdById($id, array $options =
array())
+ {
+ $criteria = new Criteria;
+ self::addrightsRelatedByactIdCriteriaById($criteria, $id);
+
+ return QubitRight::get($criteria, $options);
+ }
+
+ public function addrightsRelatedByactIdCriteria(Criteria $criteria)
+ {
+ return self::addrightsRelatedByactIdCriteriaById($criteria, $this->id);
}
public static function addstatussRelatedBytypeIdCriteriaById(Criteria
$criteria, $id)
@@ -1841,6 +1783,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/lib/model/om/BaseUser.php
==============================================================================
--- trunk/lib/model/om/BaseUser.php Tue Jul 19 16:41:48 2011 (r9338)
+++ trunk/lib/model/om/BaseUser.php Tue Jul 19 16:44:02 2011 (r9339)
@@ -82,22 +82,22 @@
{
}
- if ('notes' == $name)
+ if ('aclPermissions' == $name)
{
return true;
}
- if ('systemEvents' == $name)
+ if ('aclUserGroups' == $name)
{
return true;
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
return true;
}
- if ('aclUserGroups' == $name)
+ if ('systemEvents' == $name)
{
return true;
}
@@ -123,154 +123,154 @@
{
}
- if ('notes' == $name)
+ if ('aclPermissions' == $name)
{
- if (!isset($this->refFkValues['notes']))
+ if (!isset($this->refFkValues['aclPermissions']))
{
if (!isset($this->id))
{
- $this->refFkValues['notes'] = QubitQuery::create();
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
}
else
{
- $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['notes'];
+ return $this->refFkValues['aclPermissions'];
}
- if ('systemEvents' == $name)
+ if ('aclUserGroups' == $name)
{
- if (!isset($this->refFkValues['systemEvents']))
+ if (!isset($this->refFkValues['aclUserGroups']))
{
if (!isset($this->id))
{
- $this->refFkValues['systemEvents'] = QubitQuery::create();
+ $this->refFkValues['aclUserGroups'] = QubitQuery::create();
}
else
{
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['systemEvents'];
+ return $this->refFkValues['aclUserGroups'];
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
- if (!isset($this->refFkValues['aclPermissions']))
+ if (!isset($this->refFkValues['notes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ $this->refFkValues['notes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclPermissions'];
+ return $this->refFkValues['notes'];
}
- if ('aclUserGroups' == $name)
+ if ('systemEvents' == $name)
{
- if (!isset($this->refFkValues['aclUserGroups']))
+ if (!isset($this->refFkValues['systemEvents']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclUserGroups'] = QubitQuery::create();
+ $this->refFkValues['systemEvents'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclUserGroups'];
+ return $this->refFkValues['systemEvents'];
}
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
- public static function addnotesCriteriaById(Criteria $criteria, $id)
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitNote::USER_ID, $id);
+ $criteria->add(QubitAclPermission::USER_ID, $id);
return $criteria;
}
- public static function getnotesById($id, array $options = array())
+ public static function getaclPermissionsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addnotesCriteriaById($criteria, $id);
+ self::addaclPermissionsCriteriaById($criteria, $id);
- return QubitNote::get($criteria, $options);
+ return QubitAclPermission::get($criteria, $options);
}
- public function addnotesCriteria(Criteria $criteria)
+ public function addaclPermissionsCriteria(Criteria $criteria)
{
- return self::addnotesCriteriaById($criteria, $this->id);
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
}
- public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
+ public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitSystemEvent::USER_ID, $id);
+ $criteria->add(QubitAclUserGroup::USER_ID, $id);
return $criteria;
}
- public static function getsystemEventsById($id, array $options = array())
+ public static function getaclUserGroupsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addsystemEventsCriteriaById($criteria, $id);
+ self::addaclUserGroupsCriteriaById($criteria, $id);
- return QubitSystemEvent::get($criteria, $options);
+ return QubitAclUserGroup::get($criteria, $options);
}
- public function addsystemEventsCriteria(Criteria $criteria)
+ public function addaclUserGroupsCriteria(Criteria $criteria)
{
- return self::addsystemEventsCriteriaById($criteria, $this->id);
+ return self::addaclUserGroupsCriteriaById($criteria, $this->id);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ public static function addnotesCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitAclPermission::USER_ID, $id);
+ $criteria->add(QubitNote::USER_ID, $id);
return $criteria;
}
- public static function getaclPermissionsById($id, array $options = array())
+ public static function getnotesById($id, array $options = array())
{
$criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
+ self::addnotesCriteriaById($criteria, $id);
- return QubitAclPermission::get($criteria, $options);
+ return QubitNote::get($criteria, $options);
}
- public function addaclPermissionsCriteria(Criteria $criteria)
+ public function addnotesCriteria(Criteria $criteria)
{
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ return self::addnotesCriteriaById($criteria, $this->id);
}
- public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
+ public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitAclUserGroup::USER_ID, $id);
+ $criteria->add(QubitSystemEvent::USER_ID, $id);
return $criteria;
}
- public static function getaclUserGroupsById($id, array $options = array())
+ public static function getsystemEventsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addaclUserGroupsCriteriaById($criteria, $id);
+ self::addsystemEventsCriteriaById($criteria, $id);
- return QubitAclUserGroup::get($criteria, $options);
+ return QubitSystemEvent::get($criteria, $options);
}
- public function addaclUserGroupsCriteria(Criteria $criteria)
+ public function addsystemEventsCriteria(Criteria $criteria)
{
- return self::addaclUserGroupsCriteriaById($criteria, $this->id);
+ return self::addsystemEventsCriteriaById($criteria, $this->id);
}
}
--
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.
