Author: sevein
Date: Tue Sep 6 10:11:57 2011
New Revision: 9662
Log:
Remove unused entities and related classes: historical_event, keymap, map,
map_i18n, place, place_i18n, place_map_relation, system_event
Deleted:
trunk/lib/model/QubitHistoricalEvent.php
trunk/lib/model/QubitKeymap.php
trunk/lib/model/QubitMap.php
trunk/lib/model/QubitMapI18n.php
trunk/lib/model/QubitPlace.php
trunk/lib/model/QubitPlaceI18n.php
trunk/lib/model/QubitPlaceMapRelation.php
trunk/lib/model/QubitSystemEvent.php
trunk/lib/model/map/HistoricalEventTableMap.php
trunk/lib/model/map/KeymapTableMap.php
trunk/lib/model/map/MapI18nTableMap.php
trunk/lib/model/map/MapTableMap.php
trunk/lib/model/map/PlaceI18nTableMap.php
trunk/lib/model/map/PlaceMapRelationTableMap.php
trunk/lib/model/map/PlaceTableMap.php
trunk/lib/model/map/SystemEventTableMap.php
trunk/lib/model/om/BaseHistoricalEvent.php
trunk/lib/model/om/BaseKeymap.php
trunk/lib/model/om/BaseMap.php
trunk/lib/model/om/BaseMapI18n.php
trunk/lib/model/om/BasePlace.php
trunk/lib/model/om/BasePlaceI18n.php
trunk/lib/model/om/BasePlaceMapRelation.php
trunk/lib/model/om/BaseSystemEvent.php
Modified:
trunk/config/schema.yml
trunk/lib/model/map/ActorTableMap.php
trunk/lib/model/map/DigitalObjectTableMap.php
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/TermTableMap.php
trunk/lib/model/map/UserTableMap.php
trunk/lib/model/om/BaseDigitalObject.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseUser.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Tue Sep 6 09:59:55 2011 (r9661)
+++ trunk/config/schema.yml Tue Sep 6 10:11:57 2011 (r9662)
@@ -103,14 +103,6 @@
rules: longvarchar
sources: longvarchar
- historical_event:
- id: { type: integer, required: true, primaryKey: true, foreignTable: term,
foreignReference: id, onDelete: cascade, inheritanceKey: true }
- type_id: { type: integer, foreignTable: term, foreignReference: id }
- start_date: bu_date
- start_time: time
- end_date: bu_date
- end_time: time
-
information_object:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
identifier: varchar(255)
@@ -149,20 +141,6 @@
sources: longvarchar
revision_history: longvarchar
- keymap:
- source_id: { type: varchar(255), index: true }
- target_id: { type: integer, index: true }
- source: { type: varchar(255), index: true }
- target: { type: varchar(255), index: true }
-
- map:
- created_at:
- updated_at:
-
- map_i18n:
- title: varchar(255)
- description: longvarchar
-
menu:
parent_id: { type: integer, foreignTable: menu, foreignReference: id,
onDelete: cascade }
name: varchar(255)
@@ -240,28 +218,6 @@
description: longvarchar
location: longvarchar
- place:
- id: { type: integer, required: true, primaryKey: true, foreignTable: term,
foreignReference: id, onDelete: cascade, inheritanceKey: true }
- country_id: { type: integer, foreignTable: term, foreignReference: id }
- type_id: { type: integer, foreignTable: term, foreignReference: id }
- longtitude: float
- latitude: float
- altitude: float
-
- place_i18n:
- street_address: longvarchar
- city: varchar(255)
- region: varchar(255)
- postal_code: varchar(255)
-
- place_map_relation:
- id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
- place_id: { type: integer, required: true, foreignTable: place,
foreignReference: id, onDelete: cascade }
- map_id: { type: integer, required: true, foreignTable: map,
foreignReference: id, onDelete: cascade }
- map_icon_image_id: { type: integer, foreignTable: digital_object,
foreignReference: id }
- map_icon_description: longvarchar
- type_id: { type: integer, foreignTable: term, foreignReference: id }
-
property:
object_id: { type: integer, required: true, foreignTable: object,
foreignReference: id, onDelete: cascade }
scope: varchar(255)
@@ -358,17 +314,6 @@
type_id: { type: integer, foreignTable: term, foreignReference: id,
onDelete: cascade }
status_id: { type: integer, foreignTable: term, foreignReference: id,
onDelete: cascade }
- system_event:
- type_id: { type: integer, foreignTable: term, foreignReference: id }
- object_class: varchar(255)
- object_id: integer
- pre_event_snapshot: longvarchar
- post_event_snapshot: longvarchar
- date: timestamp
- user_id:
- created_at:
- updated_at:
-
taxonomy:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
usage: varchar(255)
Modified: trunk/lib/model/map/ActorTableMap.php
==============================================================================
--- trunk/lib/model/map/ActorTableMap.php Tue Sep 6 09:59:55 2011
(r9661)
+++ trunk/lib/model/map/ActorTableMap.php Tue Sep 6 10:11:57 2011
(r9662)
@@ -60,7 +60,6 @@
$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);
@@ -69,6 +68,7 @@
$this->addRelation('rights', 'rights', RelationMap::ONE_TO_MANY,
array('id' => 'rights_holder_id', ), 'SET NULL', null);
$this->addRelation('rightsHolder', 'rightsHolder',
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/DigitalObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/DigitalObjectTableMap.php Tue Sep 6 09:59:55
2011 (r9661)
+++ trunk/lib/model/map/DigitalObjectTableMap.php Tue Sep 6 10:11:57
2011 (r9662)
@@ -64,7 +64,6 @@
$this->addRelation('termRelatedBymediaTypeId', 'term',
RelationMap::MANY_TO_ONE, array('media_type_id' => 'id', ), 'SET NULL', null);
$this->addRelation('digitalObjectRelatedByparentId', 'digitalObject',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
$this->addRelation('digitalObjectRelatedByparentId', 'digitalObject',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
- $this->addRelation('placeMapRelation', 'placeMapRelation',
RelationMap::ONE_TO_MANY, array('id' => 'map_icon_image_id', ), null, null);
} // buildRelations()
} // DigitalObjectTableMap
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Tue Sep 6 09:59:55 2011
(r9661)
+++ trunk/lib/model/map/ObjectTableMap.php Tue Sep 6 10:11:57 2011
(r9662)
@@ -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);
@@ -61,7 +60,6 @@
$this->addRelation('objectTermRelationRelatedByobjectId',
'objectTermRelation', RelationMap::ONE_TO_MANY, array('id' => 'object_id', ),
'CASCADE', null);
$this->addRelation('otherName', 'otherName', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('physicalObject', 'physicalObject',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('placeMapRelation', 'placeMapRelation',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('property', 'property', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('relationRelatedByid', 'relation',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('relationRelatedBysubjectId', 'relation',
RelationMap::ONE_TO_MANY, array('id' => 'subject_id', ), null, null);
@@ -72,7 +70,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/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php Tue Sep 6 09:59:55 2011
(r9661)
+++ trunk/lib/model/map/TermTableMap.php Tue Sep 6 10:11:57 2011
(r9662)
@@ -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', ), 'SET NULL',
null);
- $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), 'SET
NULL', null);
- $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), 'SET NULL',
null);
- $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), 'SET NULL',
null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), 'SET 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);
@@ -68,8 +63,6 @@
$this->addRelation('functionRelatedBytypeId', 'function',
RelationMap::ONE_TO_MANY, array('id' => 'type_id', ), null, null);
$this->addRelation('functionRelatedBydescriptionStatusId', 'function',
RelationMap::ONE_TO_MANY, array('id' => 'description_status_id', ), null, null);
$this->addRelation('functionRelatedBydescriptionDetailId', 'function',
RelationMap::ONE_TO_MANY, array('id' => 'description_detail_id', ), null, null);
- $this->addRelation('historicalEventRelatedByid', 'historicalEvent',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('historicalEventRelatedBytypeId', 'historicalEvent',
RelationMap::ONE_TO_MANY, array('id' => 'type_id', ), null, null);
$this->addRelation('informationObjectRelatedBylevelOfDescriptionId',
'informationObject', RelationMap::ONE_TO_MANY, array('id' =>
'level_of_description_id', ), 'SET NULL', null);
$this->addRelation('informationObjectRelatedBycollectionTypeId',
'informationObject', RelationMap::ONE_TO_MANY, array('id' =>
'collection_type_id', ), null, null);
$this->addRelation('informationObjectRelatedBydescriptionStatusId',
'informationObject', RelationMap::ONE_TO_MANY, array('id' =>
'description_status_id', ), 'SET NULL', null);
@@ -78,10 +71,6 @@
$this->addRelation('objectTermRelation', 'objectTermRelation',
RelationMap::ONE_TO_MANY, array('id' => 'term_id', ), 'CASCADE', null);
$this->addRelation('otherName', 'otherName', RelationMap::ONE_TO_MANY,
array('id' => 'type_id', ), 'SET NULL', null);
$this->addRelation('physicalObject', 'physicalObject',
RelationMap::ONE_TO_MANY, array('id' => 'type_id', ), 'SET NULL', null);
- $this->addRelation('placeRelatedByid', 'place', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('placeRelatedBycountryId', 'place',
RelationMap::ONE_TO_MANY, array('id' => 'country_id', ), null, null);
- $this->addRelation('placeRelatedBytypeId', 'place',
RelationMap::ONE_TO_MANY, array('id' => 'type_id', ), null, null);
- $this->addRelation('placeMapRelation', 'placeMapRelation',
RelationMap::ONE_TO_MANY, array('id' => 'type_id', ), null, null);
$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);
@@ -90,9 +79,13 @@
$this->addRelation('rightsRelatedBycopyrightStatusId', 'rights',
RelationMap::ONE_TO_MANY, array('id' => 'copyright_status_id', ), 'SET 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', ), 'SET NULL',
null);
+ $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), 'SET
NULL', null);
+ $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), 'SET NULL',
null);
+ $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), 'SET NULL',
null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), 'SET NULL', null);
} // buildRelations()
} // TermTableMap
Modified: trunk/lib/model/map/UserTableMap.php
==============================================================================
--- trunk/lib/model/map/UserTableMap.php Tue Sep 6 09:59:55 2011
(r9661)
+++ trunk/lib/model/map/UserTableMap.php Tue Sep 6 10:11:57 2011
(r9662)
@@ -50,10 +50,9 @@
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);
} // buildRelations()
} // UserTableMap
Modified: trunk/lib/model/om/BaseDigitalObject.php
==============================================================================
--- trunk/lib/model/om/BaseDigitalObject.php Tue Sep 6 09:59:55 2011
(r9661)
+++ trunk/lib/model/om/BaseDigitalObject.php Tue Sep 6 10:11:57 2011
(r9662)
@@ -122,11 +122,6 @@
return true;
}
- if ('placeMapRelations' == $name)
- {
- return true;
- }
-
if ('ancestors' == $name)
{
return true;
@@ -175,23 +170,6 @@
return $this->refFkValues['digitalObjectsRelatedByparentId'];
}
- if ('placeMapRelations' == $name)
- {
- if (!isset($this->refFkValues['placeMapRelations']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['placeMapRelations'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['placeMapRelations'] =
self::getplaceMapRelationsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['placeMapRelations'];
- }
-
if ('ancestors' == $name)
{
if (!isset($this->values['ancestors']))
@@ -373,26 +351,6 @@
return self::adddigitalObjectsRelatedByparentIdCriteriaById($criteria,
$this->id);
}
- public static function addplaceMapRelationsCriteriaById(Criteria $criteria,
$id)
- {
- $criteria->add(QubitPlaceMapRelation::MAP_ICON_IMAGE_ID, $id);
-
- return $criteria;
- }
-
- public static function getplaceMapRelationsById($id, array $options =
array())
- {
- $criteria = new Criteria;
- self::addplaceMapRelationsCriteriaById($criteria, $id);
-
- return QubitPlaceMapRelation::get($criteria, $options);
- }
-
- public function addplaceMapRelationsCriteria(Criteria $criteria)
- {
- return self::addplaceMapRelationsCriteriaById($criteria, $this->id);
- }
-
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitDigitalObject::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitDigitalObject::RGT, $this->rgt,
Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Tue Sep 6 09:59:55 2011 (r9661)
+++ trunk/lib/model/om/BaseObject.php Tue Sep 6 10:11:57 2011 (r9662)
@@ -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/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Tue Sep 6 09:59:55 2011 (r9661)
+++ trunk/lib/model/om/BaseTerm.php Tue Sep 6 10:11:57 2011 (r9662)
@@ -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;
@@ -179,11 +154,6 @@
return true;
}
- if ('historicalEventsRelatedBytypeId' == $name)
- {
- return true;
- }
-
if ('informationObjectsRelatedBylevelOfDescriptionId' == $name)
{
return true;
@@ -224,72 +194,77 @@
return true;
}
- if ('placesRelatedBycountryId' == $name)
+ if ('relations' == $name)
+ {
+ return true;
+ }
+
+ if ('repositorysRelatedBydescStatusId' == $name)
{
return true;
}
- if ('placesRelatedBytypeId' == $name)
+ if ('repositorysRelatedBydescDetailId' == $name)
{
return true;
}
- if ('placeMapRelations' == $name)
+ if ('rightssRelatedBybasisId' == $name)
{
return true;
}
- if ('relations' == $name)
+ if ('rightssRelatedByactId' == $name)
{
return true;
}
- if ('repositorysRelatedBydescStatusId' == $name)
+ if ('rightssRelatedBycopyrightStatusId' == $name)
{
return true;
}
- if ('repositorysRelatedBydescDetailId' == $name)
+ if ('statussRelatedBytypeId' == $name)
{
return true;
}
- if ('rightssRelatedBybasisId' == $name)
+ if ('statussRelatedBystatusId' == $name)
{
return true;
}
- if ('rightssRelatedByactId' == $name)
+ if ('termsRelatedByparentId' == $name)
{
return true;
}
- if ('rightssRelatedBycopyrightStatusId' == $name)
+ if ('termI18ns' == $name)
{
return true;
}
- if ('statussRelatedBytypeId' == $name)
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
{
return true;
}
- if ('statussRelatedBystatusId' == $name)
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
{
return true;
}
- if ('systemEvents' == $name)
+ if ('accessionsRelatedByprocessingStatusId' == $name)
{
return true;
}
- if ('termsRelatedByparentId' == $name)
+ if ('accessionsRelatedByresourceTypeId' == $name)
{
return true;
}
- if ('termI18ns' == $name)
+ if ('deaccessions' == $name)
{
return true;
}
@@ -338,91 +313,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']))
@@ -576,23 +466,6 @@
return $this->refFkValues['functionsRelatedBydescriptionDetailId'];
}
- if ('historicalEventsRelatedBytypeId' == $name)
- {
- if (!isset($this->refFkValues['historicalEventsRelatedBytypeId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['historicalEventsRelatedBytypeId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['historicalEventsRelatedBytypeId'] =
self::gethistoricalEventsRelatedBytypeIdById($this->id, array('self' => $this)
+ $options);
- }
- }
-
- return $this->refFkValues['historicalEventsRelatedBytypeId'];
- }
-
if ('informationObjectsRelatedBylevelOfDescriptionId' == $name)
{
if
(!isset($this->refFkValues['informationObjectsRelatedBylevelOfDescriptionId']))
@@ -729,57 +602,6 @@
return $this->refFkValues['physicalObjects'];
}
- if ('placesRelatedBycountryId' == $name)
- {
- if (!isset($this->refFkValues['placesRelatedBycountryId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['placesRelatedBycountryId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['placesRelatedBycountryId'] =
self::getplacesRelatedBycountryIdById($this->id, array('self' => $this) +
$options);
- }
- }
-
- return $this->refFkValues['placesRelatedBycountryId'];
- }
-
- if ('placesRelatedBytypeId' == $name)
- {
- if (!isset($this->refFkValues['placesRelatedBytypeId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['placesRelatedBytypeId'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['placesRelatedBytypeId'] =
self::getplacesRelatedBytypeIdById($this->id, array('self' => $this) +
$options);
- }
- }
-
- return $this->refFkValues['placesRelatedBytypeId'];
- }
-
- if ('placeMapRelations' == $name)
- {
- if (!isset($this->refFkValues['placeMapRelations']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['placeMapRelations'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['placeMapRelations'] =
self::getplaceMapRelationsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['placeMapRelations'];
- }
-
if ('relations' == $name)
{
if (!isset($this->refFkValues['relations']))
@@ -916,23 +738,6 @@
return $this->refFkValues['statussRelatedBystatusId'];
}
- if ('systemEvents' == $name)
- {
- if (!isset($this->refFkValues['systemEvents']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['systemEvents'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['systemEvents'];
- }
-
if ('termsRelatedByparentId' == $name)
{
if (!isset($this->refFkValues['termsRelatedByparentId']))
@@ -967,64 +772,149 @@
return $this->refFkValues['termI18ns'];
}
- try
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
{
- if (1 > strlen($value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__get'),
$args)) && !empty($options['cultureFallback']))
+ if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
{
- return
call_user_func_array(array($this->getCurrenttermI18n(array('sourceCulture' =>
true) + $options), '__get'), $args);
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
}
- return $value;
- }
- catch (sfException $e)
- {
+ return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
}
- if ('ancestors' == $name)
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
{
- if (!isset($this->values['ancestors']))
+ if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
{
- if ($this->new)
+ if (!isset($this->id))
{
- $this->values['ancestors'] = QubitQuery::create(array('self' =>
$this) + $options);
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
}
else
{
- $criteria = new Criteria;
- $this->addAncestorsCriteria($criteria);
- $this->addOrderByPreorder($criteria);
- $this->values['ancestors'] = self::get($criteria, array('self' =>
$this) + $options);
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
}
}
- return $this->values['ancestors'];
+ return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
}
- if ('descendants' == $name)
+ if ('accessionsRelatedByprocessingStatusId' == $name)
{
- if (!isset($this->values['descendants']))
+ if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
{
- if ($this->new)
+ if (!isset($this->id))
{
- $this->values['descendants'] = QubitQuery::create(array('self' =>
$this) + $options);
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
}
else
{
- $criteria = new Criteria;
- $this->addDescendantsCriteria($criteria);
- $this->addOrderByPreorder($criteria);
- $this->values['descendants'] = self::get($criteria, array('self' =>
$this) + $options);
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
}
}
- return $this->values['descendants'];
+ return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
}
- throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
- }
-
- public function __set($name, $value)
- {
+ 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']))
+ {
+ return
call_user_func_array(array($this->getCurrenttermI18n(array('sourceCulture' =>
true) + $options), '__get'), $args);
+ }
+
+ return $value;
+ }
+ catch (sfException $e)
+ {
+ }
+
+ if ('ancestors' == $name)
+ {
+ if (!isset($this->values['ancestors']))
+ {
+ if ($this->new)
+ {
+ $this->values['ancestors'] = QubitQuery::create(array('self' =>
$this) + $options);
+ }
+ else
+ {
+ $criteria = new Criteria;
+ $this->addAncestorsCriteria($criteria);
+ $this->addOrderByPreorder($criteria);
+ $this->values['ancestors'] = self::get($criteria, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->values['ancestors'];
+ }
+
+ if ('descendants' == $name)
+ {
+ if (!isset($this->values['descendants']))
+ {
+ if ($this->new)
+ {
+ $this->values['descendants'] = QubitQuery::create(array('self' =>
$this) + $options);
+ }
+ else
+ {
+ $criteria = new Criteria;
+ $this->addDescendantsCriteria($criteria);
+ $this->addOrderByPreorder($criteria);
+ $this->values['descendants'] = self::get($criteria, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->values['descendants'];
+ }
+
+ throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
+ }
+
+ public function __set($name, $value)
+ {
$args = func_get_args();
$options = array();
@@ -1185,106 +1075,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);
@@ -1465,26 +1255,6 @@
return
self::addfunctionsRelatedBydescriptionDetailIdCriteriaById($criteria,
$this->id);
}
- public static function
addhistoricalEventsRelatedBytypeIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitHistoricalEvent::TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function gethistoricalEventsRelatedBytypeIdById($id, array
$options = array())
- {
- $criteria = new Criteria;
- self::addhistoricalEventsRelatedBytypeIdCriteriaById($criteria, $id);
-
- return QubitHistoricalEvent::get($criteria, $options);
- }
-
- public function addhistoricalEventsRelatedBytypeIdCriteria(Criteria
$criteria)
- {
- return self::addhistoricalEventsRelatedBytypeIdCriteriaById($criteria,
$this->id);
- }
-
public static function
addinformationObjectsRelatedBylevelOfDescriptionIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitInformationObject::LEVEL_OF_DESCRIPTION_ID, $id);
@@ -1645,66 +1415,6 @@
return self::addphysicalObjectsCriteriaById($criteria, $this->id);
}
- public static function addplacesRelatedBycountryIdCriteriaById(Criteria
$criteria, $id)
- {
- $criteria->add(QubitPlace::COUNTRY_ID, $id);
-
- return $criteria;
- }
-
- public static function getplacesRelatedBycountryIdById($id, array $options =
array())
- {
- $criteria = new Criteria;
- self::addplacesRelatedBycountryIdCriteriaById($criteria, $id);
-
- return QubitPlace::get($criteria, $options);
- }
-
- public function addplacesRelatedBycountryIdCriteria(Criteria $criteria)
- {
- return self::addplacesRelatedBycountryIdCriteriaById($criteria, $this->id);
- }
-
- public static function addplacesRelatedBytypeIdCriteriaById(Criteria
$criteria, $id)
- {
- $criteria->add(QubitPlace::TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getplacesRelatedBytypeIdById($id, array $options =
array())
- {
- $criteria = new Criteria;
- self::addplacesRelatedBytypeIdCriteriaById($criteria, $id);
-
- return QubitPlace::get($criteria, $options);
- }
-
- public function addplacesRelatedBytypeIdCriteria(Criteria $criteria)
- {
- return self::addplacesRelatedBytypeIdCriteriaById($criteria, $this->id);
- }
-
- public static function addplaceMapRelationsCriteriaById(Criteria $criteria,
$id)
- {
- $criteria->add(QubitPlaceMapRelation::TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getplaceMapRelationsById($id, array $options =
array())
- {
- $criteria = new Criteria;
- self::addplaceMapRelationsCriteriaById($criteria, $id);
-
- return QubitPlaceMapRelation::get($criteria, $options);
- }
-
- public function addplaceMapRelationsCriteria(Criteria $criteria)
- {
- return self::addplaceMapRelationsCriteriaById($criteria, $this->id);
- }
-
public static function addrelationsCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitRelation::TYPE_ID, $id);
@@ -1865,26 +1575,6 @@
return self::addstatussRelatedBystatusIdCriteriaById($criteria, $this->id);
}
- public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitSystemEvent::TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getsystemEventsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addsystemEventsCriteriaById($criteria, $id);
-
- return QubitSystemEvent::get($criteria, $options);
- }
-
- public function addsystemEventsCriteria(Criteria $criteria)
- {
- return self::addsystemEventsCriteriaById($criteria, $this->id);
- }
-
public static function addtermsRelatedByparentIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitTerm::PARENT_ID, $id);
@@ -1925,6 +1615,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 Sep 6 09:59:55 2011 (r9661)
+++ trunk/lib/model/om/BaseUser.php Tue Sep 6 10:11:57 2011 (r9662)
@@ -82,22 +82,17 @@
{
}
- if ('notes' == $name)
- {
- return true;
- }
-
- if ('systemEvents' == $name)
+ if ('aclPermissions' == $name)
{
return true;
}
- if ('aclPermissions' == $name)
+ if ('aclUserGroups' == $name)
{
return true;
}
- if ('aclUserGroups' == $name)
+ if ('notes' == $name)
{
return true;
}
@@ -123,117 +118,60 @@
{
}
- if ('notes' == $name)
- {
- if (!isset($this->refFkValues['notes']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['notes'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['notes'];
- }
-
- if ('systemEvents' == $name)
+ if ('aclPermissions' == $name)
{
- if (!isset($this->refFkValues['systemEvents']))
+ if (!isset($this->refFkValues['aclPermissions']))
{
if (!isset($this->id))
{
- $this->refFkValues['systemEvents'] = QubitQuery::create();
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
}
else
{
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['systemEvents'];
+ return $this->refFkValues['aclPermissions'];
}
- if ('aclPermissions' == $name)
+ if ('aclUserGroups' == $name)
{
- if (!isset($this->refFkValues['aclPermissions']))
+ if (!isset($this->refFkValues['aclUserGroups']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ $this->refFkValues['aclUserGroups'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclPermissions'];
+ return $this->refFkValues['aclUserGroups'];
}
- if ('aclUserGroups' == $name)
+ if ('notes' == $name)
{
- if (!isset($this->refFkValues['aclUserGroups']))
+ if (!isset($this->refFkValues['notes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclUserGroups'] = QubitQuery::create();
+ $this->refFkValues['notes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclUserGroups'];
+ return $this->refFkValues['notes'];
}
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
- public static function addnotesCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitNote::USER_ID, $id);
-
- return $criteria;
- }
-
- public static function getnotesById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addnotesCriteriaById($criteria, $id);
-
- return QubitNote::get($criteria, $options);
- }
-
- public function addnotesCriteria(Criteria $criteria)
- {
- return self::addnotesCriteriaById($criteria, $this->id);
- }
-
- public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitSystemEvent::USER_ID, $id);
-
- return $criteria;
- }
-
- public static function getsystemEventsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addsystemEventsCriteriaById($criteria, $id);
-
- return QubitSystemEvent::get($criteria, $options);
- }
-
- public function addsystemEventsCriteria(Criteria $criteria)
- {
- return self::addsystemEventsCriteriaById($criteria, $this->id);
- }
-
public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitAclPermission::USER_ID, $id);
@@ -273,4 +211,24 @@
{
return self::addaclUserGroupsCriteriaById($criteria, $this->id);
}
+
+ public static function addnotesCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitNote::USER_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getnotesById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addnotesCriteriaById($criteria, $id);
+
+ return QubitNote::get($criteria, $options);
+ }
+
+ public function addnotesCriteria(Criteria $criteria)
+ {
+ return self::addnotesCriteriaById($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.
