Author: sevein
Date: Fri Aug 12 16:54:07 2011
New Revision: 9485

Log:
FK in QubitRight to storage a single right holder

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/RightsTableMap.php
   trunk/lib/model/map/TermTableMap.php
   trunk/lib/model/om/BaseActor.php
   trunk/lib/model/om/BaseRights.php
   trunk/lib/model/om/BaseTerm.php

Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml     Fri Aug 12 16:26:29 2011        (r9484)
+++ trunk/config/schema.yml     Fri Aug 12 16:54:07 2011        (r9485)
@@ -312,7 +312,8 @@
     end_date: bu_date
     basis_id: { type: integer, foreignTable: term, foreignReference: id, 
onDelete: setnull }
     act_id: { type: integer, foreignTable: term, foreignReference: id, 
onDelete: setnull }
-    copyright_status_id: { type: integer, foreignTable: term, 
foreignReference: id, onDelete: setnull }
+    rights_holder_id: { type: integer, foreignTable: actor, foreignReference: 
id, onDelete: setnull }
+    copyright_status_id: { type: integer, foreignTable: term, 
foreignReference: id, onDelete: setnull }i
     copyright_status_date: bu_date
     copyright_jurisdiction: varchar(255)
     statute_determination_date: bu_date

Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Fri Aug 12 16:26:29 2011        (r9484)
+++ trunk/data/sql/lib.model.schema.sql Fri Aug 12 16:54:07 2011        (r9485)
@@ -1061,6 +1061,7 @@
        `end_date` DATE,
        `basis_id` INTEGER,
        `act_id` INTEGER,
+       `rights_holder_id` INTEGER,
        `copyright_status_id` INTEGER,
        `copyright_status_date` DATE,
        `copyright_jurisdiction` VARCHAR(255),
@@ -1081,8 +1082,13 @@
                FOREIGN KEY (`act_id`)
                REFERENCES `term` (`id`)
                ON DELETE SET NULL,
-       INDEX `rights_FI_4` (`copyright_status_id`),
+       INDEX `rights_FI_4` (`rights_holder_id`),
        CONSTRAINT `rights_FK_4`
+               FOREIGN KEY (`rights_holder_id`)
+               REFERENCES `actor` (`id`)
+               ON DELETE SET NULL,
+       INDEX `rights_FI_5` (`copyright_status_id`),
+       CONSTRAINT `rights_FK_5`
                FOREIGN KEY (`copyright_status_id`)
                REFERENCES `term` (`id`)
                ON DELETE SET NULL

Modified: trunk/lib/model/map/ActorTableMap.php
==============================================================================
--- trunk/lib/model/map/ActorTableMap.php       Fri Aug 12 16:26:29 2011        
(r9484)
+++ trunk/lib/model/map/ActorTableMap.php       Fri Aug 12 16:54:07 2011        
(r9485)
@@ -60,14 +60,15 @@
     $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('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/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php      Fri Aug 12 16:26:29 2011        
(r9484)
+++ trunk/lib/model/map/ObjectTableMap.php      Fri Aug 12 16:54:07 2011        
(r9485)
@@ -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);
@@ -73,6 +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('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/RightsTableMap.php
==============================================================================
--- trunk/lib/model/map/RightsTableMap.php      Fri Aug 12 16:26:29 2011        
(r9484)
+++ trunk/lib/model/map/RightsTableMap.php      Fri Aug 12 16:54:07 2011        
(r9485)
@@ -41,6 +41,7 @@
                $this->addColumn('END_DATE', 'endDate', 'DATE', 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->addForeignKey('RIGHTS_HOLDER_ID', 'rightsHolderId', 
'INTEGER', 'actor', 'ID', false, null, null);
                $this->addForeignKey('COPYRIGHT_STATUS_ID', 
'copyrightStatusId', 'INTEGER', 'term', 'ID', false, null, null);
                $this->addColumn('COPYRIGHT_STATUS_DATE', 
'copyrightStatusDate', 'DATE', false, null, null);
                $this->addColumn('COPYRIGHT_JURISDICTION', 
'copyrightJurisdiction', 'VARCHAR', false, 255, null);
@@ -57,6 +58,7 @@
     $this->addRelation('object', 'object', RelationMap::MANY_TO_ONE, 
array('id' => 'id', ), 'CASCADE', null);
     $this->addRelation('termRelatedBybasisId', 'term', 
RelationMap::MANY_TO_ONE, array('basis_id' => 'id', ), 'SET NULL', null);
     $this->addRelation('termRelatedByactId', 'term', RelationMap::MANY_TO_ONE, 
array('act_id' => 'id', ), 'SET NULL', null);
+    $this->addRelation('actor', 'actor', RelationMap::MANY_TO_ONE, 
array('rights_holder_id' => 'id', ), 'SET NULL', null);
     $this->addRelation('termRelatedBycopyrightStatusId', 'term', 
RelationMap::MANY_TO_ONE, array('copyright_status_id' => 'id', ), 'SET NULL', 
null);
     $this->addRelation('rightsI18n', 'rightsI18n', RelationMap::ONE_TO_MANY, 
array('id' => 'id', ), 'CASCADE', null);
        } // buildRelations()

Modified: trunk/lib/model/map/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php        Fri Aug 12 16:26:29 2011        
(r9484)
+++ trunk/lib/model/map/TermTableMap.php        Fri Aug 12 16:54:07 2011        
(r9485)
@@ -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);
@@ -93,6 +88,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', ), '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/om/BaseActor.php
==============================================================================
--- trunk/lib/model/om/BaseActor.php    Fri Aug 12 16:26:29 2011        (r9484)
+++ trunk/lib/model/om/BaseActor.php    Fri Aug 12 16:54:07 2011        (r9485)
@@ -137,6 +137,11 @@
       return true;
     }
 
+    if ('rightss' == $name)
+    {
+      return true;
+    }
+
     try
     {
       if (!$value = 
call_user_func_array(array($this->getCurrentactorI18n($options), '__isset'), 
$args) && !empty($options['cultureFallback']))
@@ -249,6 +254,23 @@
       return $this->refFkValues['events'];
     }
 
+    if ('rightss' == $name)
+    {
+      if (!isset($this->refFkValues['rightss']))
+      {
+        if (!isset($this->id))
+        {
+          $this->refFkValues['rightss'] = QubitQuery::create();
+        }
+        else
+        {
+          $this->refFkValues['rightss'] = self::getrightssById($this->id, 
array('self' => $this) + $options);
+        }
+      }
+
+      return $this->refFkValues['rightss'];
+    }
+
     try
     {
       if (1 > strlen($value = 
call_user_func_array(array($this->getCurrentactorI18n($options), '__get'), 
$args)) && !empty($options['cultureFallback']))
@@ -561,6 +583,26 @@
     return self::addeventsCriteriaById($criteria, $this->id);
   }
 
+  public static function addrightssCriteriaById(Criteria $criteria, $id)
+  {
+    $criteria->add(QubitRights::RIGHTS_HOLDER_ID, $id);
+
+    return $criteria;
+  }
+
+  public static function getrightssById($id, array $options = array())
+  {
+    $criteria = new Criteria;
+    self::addrightssCriteriaById($criteria, $id);
+
+    return QubitRights::get($criteria, $options);
+  }
+
+  public function addrightssCriteria(Criteria $criteria)
+  {
+    return self::addrightssCriteriaById($criteria, $this->id);
+  }
+
   public function getCurrentactorI18n(array $options = array())
   {
     if (!empty($options['sourceCulture']))

Modified: trunk/lib/model/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php   Fri Aug 12 16:26:29 2011        (r9484)
+++ trunk/lib/model/om/BaseRights.php   Fri Aug 12 16:54:07 2011        (r9485)
@@ -12,6 +12,7 @@
     END_DATE = 'rights.END_DATE',
     BASIS_ID = 'rights.BASIS_ID',
     ACT_ID = 'rights.ACT_ID',
+    RIGHTS_HOLDER_ID = 'rights.RIGHTS_HOLDER_ID',
     COPYRIGHT_STATUS_ID = 'rights.COPYRIGHT_STATUS_ID',
     COPYRIGHT_STATUS_DATE = 'rights.COPYRIGHT_STATUS_DATE',
     COPYRIGHT_JURISDICTION = 'rights.COPYRIGHT_JURISDICTION',
@@ -29,6 +30,7 @@
     $criteria->addSelectColumn(QubitRights::END_DATE);
     $criteria->addSelectColumn(QubitRights::BASIS_ID);
     $criteria->addSelectColumn(QubitRights::ACT_ID);
+    $criteria->addSelectColumn(QubitRights::RIGHTS_HOLDER_ID);
     $criteria->addSelectColumn(QubitRights::COPYRIGHT_STATUS_ID);
     $criteria->addSelectColumn(QubitRights::COPYRIGHT_STATUS_DATE);
     $criteria->addSelectColumn(QubitRights::COPYRIGHT_JURISDICTION);
@@ -242,6 +244,13 @@
     return $criteria;
   }
 
+  public static function addJoinrightsHolderCriteria(Criteria $criteria)
+  {
+    $criteria->addJoin(QubitRights::RIGHTS_HOLDER_ID, QubitActor::ID);
+
+    return $criteria;
+  }
+
   public static function addJoincopyrightStatusCriteria(Criteria $criteria)
   {
     $criteria->addJoin(QubitRights::COPYRIGHT_STATUS_ID, QubitTerm::ID);

Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php     Fri Aug 12 16:26:29 2011        (r9484)
+++ trunk/lib/model/om/BaseTerm.php     Fri Aug 12 16:54:07 2011        (r9485)
@@ -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;
@@ -294,6 +269,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']))
@@ -338,91 +338,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']))
@@ -967,6 +882,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']))
@@ -1185,106 +1185,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);
@@ -1925,6 +1825,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']))

-- 
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.

Reply via email to