Author: sevein
Date: Sat Aug 6 10:36:44 2011
New Revision: 9455
Log:
Update schema config file, SQL and model classes, according to latest Rights
specification
Added:
trunk/lib/model/QubitRightsHolder.php
trunk/lib/model/map/RightsHolderTableMap.php
trunk/lib/model/om/BaseRightsHolder.php
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/RightsI18nTableMap.php
trunk/lib/model/map/RightsTableMap.php
trunk/lib/model/map/TermTableMap.php
trunk/lib/model/om/BaseRights.php
trunk/lib/model/om/BaseRightsI18n.php
trunk/lib/model/om/BaseTerm.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Sat Aug 6 10:12:33 2011 (r9454)
+++ trunk/config/schema.yml Sat Aug 6 10:36:44 2011 (r9455)
@@ -312,9 +312,24 @@
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 }
+ copyright_status_date: bu_date
+ copyright_jurisdiction: varchar(255)
+ statute_determination_date: bu_date
rights_i18n:
+ restriction: longvarchar
+ right_note: longvarchar
copyright_note: longvarchar
+ license_identifier: longvarchar
+ license_terms: longvarchar
+ license_note: longvarchar
+ statute_jurisdiction: longvarchar
+ statute_citation: longvarchar
+ statute_note: longvarchar
+
+ rights_holder:
+ id: { type: integer, required: true, primaryKey: true, foreignTable:
actor, foreignReference: id, onDelete: cascade, inheritanceKey: true }
setting:
name: varchar(255)
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Sat Aug 6 10:12:33 2011 (r9454)
+++ trunk/data/sql/lib.model.schema.sql Sat Aug 6 10:36:44 2011 (r9455)
@@ -1061,6 +1061,10 @@
`end_date` DATE,
`basis_id` INTEGER,
`act_id` INTEGER,
+ `copyright_status_id` INTEGER,
+ `copyright_status_date` DATE,
+ `copyright_jurisdiction` VARCHAR(255),
+ `statute_determination_date` DATE,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `rights_FK_1`
@@ -1076,6 +1080,11 @@
CONSTRAINT `rights_FK_3`
FOREIGN KEY (`act_id`)
REFERENCES `term` (`id`)
+ ON DELETE SET NULL,
+ INDEX `rights_FI_4` (`copyright_status_id`),
+ CONSTRAINT `rights_FK_4`
+ FOREIGN KEY (`copyright_status_id`)
+ REFERENCES `term` (`id`)
ON DELETE SET NULL
)Engine=InnoDB;
@@ -1088,7 +1097,15 @@
CREATE TABLE `rights_i18n`
(
+ `restriction` TEXT,
+ `right_note` TEXT,
`copyright_note` TEXT,
+ `license_identifier` TEXT,
+ `license_terms` TEXT,
+ `license_note` TEXT,
+ `statute_jurisdiction` TEXT,
+ `statute_citation` TEXT,
+ `statute_note` TEXT,
`id` INTEGER NOT NULL,
`culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`,`culture`),
@@ -1099,6 +1116,23 @@
)Engine=InnoDB;
#-----------------------------------------------------------------------------
+#-- rights_holder
+#-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `rights_holder`;
+
+
+CREATE TABLE `rights_holder`
+(
+ `id` INTEGER NOT NULL,
+ PRIMARY KEY (`id`),
+ CONSTRAINT `rights_holder_FK_1`
+ FOREIGN KEY (`id`)
+ REFERENCES `actor` (`id`)
+ ON DELETE CASCADE
+)Engine=InnoDB;
+
+#-----------------------------------------------------------------------------
#-- setting
#-----------------------------------------------------------------------------
Added: trunk/lib/model/QubitRightsHolder.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/lib/model/QubitRightsHolder.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of Qubit Toolkit.
+ *
+ * Qubit Toolkit is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Qubit Toolkit is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class QubitRightsHolder extends BaseRightsHolder
+{
+}
Modified: trunk/lib/model/map/ActorTableMap.php
==============================================================================
--- trunk/lib/model/map/ActorTableMap.php Sat Aug 6 10:12:33 2011
(r9454)
+++ trunk/lib/model/map/ActorTableMap.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -60,13 +60,14 @@
$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('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 Sat Aug 6 10:12:33 2011
(r9454)
+++ trunk/lib/model/map/ObjectTableMap.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -50,6 +50,8 @@
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);
@@ -71,8 +73,6 @@
$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
Added: trunk/lib/model/map/RightsHolderTableMap.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/lib/model/map/RightsHolderTableMap.php Sat Aug 6 10:36:44
2011 (r9455)
@@ -0,0 +1,51 @@
+<?php
+
+
+/**
+ * This class defines the structure of the 'rights_holder' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column
used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY
case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package lib.model.map
+ */
+class RightsHolderTableMap extends TableMap {
+
+ /**
+ * The (dot-path) name of this class
+ */
+ const CLASS_NAME = 'lib.model.map.RightsHolderTableMap';
+
+ /**
+ * Initialize the table attributes, columns and validators
+ * Relations are not initialized by this method since they are lazy
loaded
+ *
+ * @return void
+ * @throws PropelException
+ */
+ public function initialize()
+ {
+ // attributes
+ $this->setName('rights_holder');
+ $this->setPhpName('rightsHolder');
+ $this->setClassname('QubitRightsHolder');
+ $this->setPackage('lib.model');
+ $this->setUseIdGenerator(false);
+ // columns
+ $this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'actor',
'ID', true, null, null);
+ // validators
+ } // initialize()
+
+ /**
+ * Build the RelationMap objects for this table relationships
+ */
+ public function buildRelations()
+ {
+ $this->addRelation('actor', 'actor', RelationMap::MANY_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
+ } // buildRelations()
+
+} // RightsHolderTableMap
Modified: trunk/lib/model/map/RightsI18nTableMap.php
==============================================================================
--- trunk/lib/model/map/RightsI18nTableMap.php Sat Aug 6 10:12:33 2011
(r9454)
+++ trunk/lib/model/map/RightsI18nTableMap.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -36,7 +36,15 @@
$this->setPackage('lib.model');
$this->setUseIdGenerator(false);
// columns
+ $this->addColumn('RESTRICTION', 'restriction', 'LONGVARCHAR',
false, null, null);
+ $this->addColumn('RIGHT_NOTE', 'rightNote', 'LONGVARCHAR',
false, null, null);
$this->addColumn('COPYRIGHT_NOTE', 'copyrightNote',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('LICENSE_IDENTIFIER', 'licenseIdentifier',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('LICENSE_TERMS', 'licenseTerms',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('LICENSE_NOTE', 'licenseNote', 'LONGVARCHAR',
false, null, null);
+ $this->addColumn('STATUTE_JURISDICTION', 'statuteJurisdiction',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('STATUTE_CITATION', 'statuteCitation',
'LONGVARCHAR', false, null, null);
+ $this->addColumn('STATUTE_NOTE', 'statuteNote', 'LONGVARCHAR',
false, null, null);
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'rights',
'ID', true, null, null);
$this->addPrimaryKey('CULTURE', 'culture', 'VARCHAR', true, 7,
null);
// validators
Modified: trunk/lib/model/map/RightsTableMap.php
==============================================================================
--- trunk/lib/model/map/RightsTableMap.php Sat Aug 6 10:12:33 2011
(r9454)
+++ trunk/lib/model/map/RightsTableMap.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -41,6 +41,10 @@
$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('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);
+ $this->addColumn('STATUTE_DETERMINATION_DATE',
'statuteDeterminationDate', 'DATE', false, null, null);
$this->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7, null);
// validators
} // initialize()
@@ -53,6 +57,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('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 Sat Aug 6 10:12:33 2011
(r9454)
+++ trunk/lib/model/map/TermTableMap.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -54,6 +54,11 @@
$this->addRelation('object', 'object', RelationMap::MANY_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::MANY_TO_ONE,
array('taxonomy_id' => 'id', ), 'CASCADE', null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
+ $this->addRelation('accessionRelatedByacquisitionTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'acquisition_type_id', ), '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);
@@ -82,16 +87,12 @@
$this->addRelation('repositoryRelatedBydescDetailId', 'repository',
RelationMap::ONE_TO_MANY, array('id' => 'desc_detail_id', ), 'SET NULL', null);
$this->addRelation('rightsRelatedBybasisId', 'rights',
RelationMap::ONE_TO_MANY, array('id' => 'basis_id', ), 'SET NULL', null);
$this->addRelation('rightsRelatedByactId', 'rights',
RelationMap::ONE_TO_MANY, array('id' => 'act_id', ), 'SET NULL', null);
+ $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/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php Sat Aug 6 10:12:33 2011 (r9454)
+++ trunk/lib/model/om/BaseRights.php Sat Aug 6 10:36:44 2011 (r9455)
@@ -12,6 +12,10 @@
END_DATE = 'rights.END_DATE',
BASIS_ID = 'rights.BASIS_ID',
ACT_ID = 'rights.ACT_ID',
+ COPYRIGHT_STATUS_ID = 'rights.COPYRIGHT_STATUS_ID',
+ COPYRIGHT_STATUS_DATE = 'rights.COPYRIGHT_STATUS_DATE',
+ COPYRIGHT_JURISDICTION = 'rights.COPYRIGHT_JURISDICTION',
+ STATUTE_DETERMINATION_DATE = 'rights.STATUTE_DETERMINATION_DATE',
SOURCE_CULTURE = 'rights.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -25,6 +29,10 @@
$criteria->addSelectColumn(QubitRights::END_DATE);
$criteria->addSelectColumn(QubitRights::BASIS_ID);
$criteria->addSelectColumn(QubitRights::ACT_ID);
+ $criteria->addSelectColumn(QubitRights::COPYRIGHT_STATUS_ID);
+ $criteria->addSelectColumn(QubitRights::COPYRIGHT_STATUS_DATE);
+ $criteria->addSelectColumn(QubitRights::COPYRIGHT_JURISDICTION);
+ $criteria->addSelectColumn(QubitRights::STATUTE_DETERMINATION_DATE);
$criteria->addSelectColumn(QubitRights::SOURCE_CULTURE);
return $criteria;
@@ -234,6 +242,13 @@
return $criteria;
}
+ public static function addJoincopyrightStatusCriteria(Criteria $criteria)
+ {
+ $criteria->addJoin(QubitRights::COPYRIGHT_STATUS_ID, QubitTerm::ID);
+
+ return $criteria;
+ }
+
public static function addrightsI18nsCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitRightsI18n::ID, $id);
Added: trunk/lib/model/om/BaseRightsHolder.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/lib/model/om/BaseRightsHolder.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -0,0 +1,64 @@
+<?php
+
+abstract class BaseRightsHolder extends QubitActor implements ArrayAccess
+{
+ const
+ DATABASE_NAME = 'propel',
+
+ TABLE_NAME = 'rights_holder',
+
+ ID = 'rights_holder.ID';
+
+ public static function addSelectColumns(Criteria $criteria)
+ {
+ parent::addSelectColumns($criteria);
+
+ $criteria->addJoin(QubitRightsHolder::ID, QubitActor::ID);
+
+ $criteria->addSelectColumn(QubitRightsHolder::ID);
+
+ return $criteria;
+ }
+
+ public static function get(Criteria $criteria, array $options = array())
+ {
+ if (!isset($options['connection']))
+ {
+ $options['connection'] =
Propel::getConnection(QubitRightsHolder::DATABASE_NAME);
+ }
+
+ self::addSelectColumns($criteria);
+
+ return QubitQuery::createFromCriteria($criteria, 'QubitRightsHolder',
$options);
+ }
+
+ public static function getAll(array $options = array())
+ {
+ return self::get(new Criteria, $options);
+ }
+
+ public static function getOne(Criteria $criteria, array $options = array())
+ {
+ $criteria->setLimit(1);
+
+ return self::get($criteria, $options)->__get(0, array('defaultValue' =>
null));
+ }
+
+ public static function getById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ $criteria->add(QubitRightsHolder::ID, $id);
+
+ if (1 == count($query = self::get($criteria, $options)))
+ {
+ return $query[0];
+ }
+ }
+
+ public function __construct()
+ {
+ parent::__construct();
+
+ $this->tables[] =
Propel::getDatabaseMap(QubitRightsHolder::DATABASE_NAME)->getTable(QubitRightsHolder::TABLE_NAME);
+ }
+}
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Sat Aug 6 10:12:33 2011
(r9454)
+++ trunk/lib/model/om/BaseRightsI18n.php Sat Aug 6 10:36:44 2011
(r9455)
@@ -7,13 +7,29 @@
TABLE_NAME = 'rights_i18n',
+ RESTRICTION = 'rights_i18n.RESTRICTION',
+ RIGHT_NOTE = 'rights_i18n.RIGHT_NOTE',
COPYRIGHT_NOTE = 'rights_i18n.COPYRIGHT_NOTE',
+ LICENSE_IDENTIFIER = 'rights_i18n.LICENSE_IDENTIFIER',
+ LICENSE_TERMS = 'rights_i18n.LICENSE_TERMS',
+ LICENSE_NOTE = 'rights_i18n.LICENSE_NOTE',
+ STATUTE_JURISDICTION = 'rights_i18n.STATUTE_JURISDICTION',
+ STATUTE_CITATION = 'rights_i18n.STATUTE_CITATION',
+ STATUTE_NOTE = 'rights_i18n.STATUTE_NOTE',
ID = 'rights_i18n.ID',
CULTURE = 'rights_i18n.CULTURE';
public static function addSelectColumns(Criteria $criteria)
{
+ $criteria->addSelectColumn(QubitRightsI18n::RESTRICTION);
+ $criteria->addSelectColumn(QubitRightsI18n::RIGHT_NOTE);
$criteria->addSelectColumn(QubitRightsI18n::COPYRIGHT_NOTE);
+ $criteria->addSelectColumn(QubitRightsI18n::LICENSE_IDENTIFIER);
+ $criteria->addSelectColumn(QubitRightsI18n::LICENSE_TERMS);
+ $criteria->addSelectColumn(QubitRightsI18n::LICENSE_NOTE);
+ $criteria->addSelectColumn(QubitRightsI18n::STATUTE_JURISDICTION);
+ $criteria->addSelectColumn(QubitRightsI18n::STATUTE_CITATION);
+ $criteria->addSelectColumn(QubitRightsI18n::STATUTE_NOTE);
$criteria->addSelectColumn(QubitRightsI18n::ID);
$criteria->addSelectColumn(QubitRightsI18n::CULTURE);
@@ -30,8 +46,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[1];
- $keys['culture'] = $row[2];
+ $keys['id'] = $row[9];
+ $keys['culture'] = $row[10];
$key = serialize($keys);
if (!isset(self::$rightsI18ns[$key]))
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Sat Aug 6 10:12:33 2011 (r9454)
+++ trunk/lib/model/om/BaseTerm.php Sat Aug 6 10:36:44 2011 (r9455)
@@ -109,6 +109,31 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('deaccessions' == $name)
+ {
+ return true;
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
return true;
@@ -239,6 +264,11 @@
return true;
}
+ if ('rightssRelatedBycopyrightStatusId' == $name)
+ {
+ return true;
+ }
+
if ('statussRelatedBytypeId' == $name)
{
return true;
@@ -264,31 +294,6 @@
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']))
@@ -333,6 +338,91 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByresourceTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
self::getaccessionsRelatedByresourceTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByresourceTypeId'];
+ }
+
+ if ('deaccessions' == $name)
+ {
+ if (!isset($this->refFkValues['deaccessions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['deaccessions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['deaccessions'] =
self::getdeaccessionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['deaccessions'];
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
if (!isset($this->refFkValues['actorsRelatedByentityTypeId']))
@@ -775,6 +865,23 @@
return $this->refFkValues['rightssRelatedByactId'];
}
+ if ('rightssRelatedBycopyrightStatusId' == $name)
+ {
+ if (!isset($this->refFkValues['rightssRelatedBycopyrightStatusId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['rightssRelatedBycopyrightStatusId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['rightssRelatedBycopyrightStatusId'] =
self::getrightssRelatedBycopyrightStatusIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['rightssRelatedBycopyrightStatusId'];
+ }
+
if ('statussRelatedBytypeId' == $name)
{
if (!isset($this->refFkValues['statussRelatedBytypeId']))
@@ -860,91 +967,6 @@
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']))
@@ -1163,6 +1185,106 @@
return $criteria;
}
+ public static function
addaccessionsRelatedByacquisitionTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::ACQUISITION_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByacquisitionTypeIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByacquisitionTypeIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingPriorityIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_PRIORITY_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingPriorityIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingPriorityIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingStatusIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_STATUS_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingStatusIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingStatusIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByresourceTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::RESOURCE_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByresourceTypeIdById($id, array
$options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByresourceTypeIdCriteria(Criteria
$criteria)
+ {
+ return self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function adddeaccessionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitDeaccession::SCOPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getdeaccessionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::adddeaccessionsCriteriaById($criteria, $id);
+
+ return QubitDeaccession::get($criteria, $options);
+ }
+
+ public function adddeaccessionsCriteria(Criteria $criteria)
+ {
+ return self::adddeaccessionsCriteriaById($criteria, $this->id);
+ }
+
public static function addactorsRelatedByentityTypeIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitActor::ENTITY_TYPE_ID, $id);
@@ -1683,6 +1805,26 @@
return self::addrightssRelatedByactIdCriteriaById($criteria, $this->id);
}
+ public static function
addrightssRelatedBycopyrightStatusIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitRights::COPYRIGHT_STATUS_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getrightssRelatedBycopyrightStatusIdById($id, array
$options = array())
+ {
+ $criteria = new Criteria;
+ self::addrightssRelatedBycopyrightStatusIdCriteriaById($criteria, $id);
+
+ return QubitRights::get($criteria, $options);
+ }
+
+ public function addrightssRelatedBycopyrightStatusIdCriteria(Criteria
$criteria)
+ {
+ return self::addrightssRelatedBycopyrightStatusIdCriteriaById($criteria,
$this->id);
+ }
+
public static function addstatussRelatedBytypeIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitStatus::TYPE_ID, $id);
@@ -1783,106 +1925,6 @@
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.
