Author: sevein
Date: Fri Sep 16 21:33:14 2011
New Revision: 9751
Log:
In rights, set restriction field as boolean
Modified:
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/lib/model/map/RightsI18nTableMap.php
trunk/lib/model/map/RightsTableMap.php
trunk/lib/model/om/BaseRights.php
trunk/lib/model/om/BaseRightsI18n.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Fri Sep 16 21:31:42 2011 (r9750)
+++ trunk/config/schema.yml Fri Sep 16 21:33:14 2011 (r9751)
@@ -273,6 +273,7 @@
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
start_date: bu_date
end_date: bu_date
+ restriction: { type: boolean, default: true }
basis_id: { type: integer, foreignTable: term, foreignReference: id,
onDelete: setnull }
act_id: { type: integer, foreignTable: term, foreignReference: id,
onDelete: setnull }
rights_holder_id: { type: integer, foreignTable: actor, foreignReference:
id, onDelete: setnull }
@@ -282,7 +283,6 @@
statute_determination_date: bu_date
rights_i18n:
- restriction: longvarchar
rights_note: longvarchar
copyright_note: longvarchar
license_identifier: longvarchar
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Fri Sep 16 21:31:42 2011 (r9750)
+++ trunk/data/sql/lib.model.schema.sql Fri Sep 16 21:33:14 2011 (r9751)
@@ -900,6 +900,7 @@
`id` INTEGER NOT NULL,
`start_date` DATE,
`end_date` DATE,
+ `restriction` TINYINT default 1,
`basis_id` INTEGER,
`act_id` INTEGER,
`rights_holder_id` INTEGER,
@@ -944,7 +945,6 @@
CREATE TABLE `rights_i18n`
(
- `restriction` TEXT,
`rights_note` TEXT,
`copyright_note` TEXT,
`license_identifier` TEXT,
Modified: trunk/lib/model/map/RightsI18nTableMap.php
==============================================================================
--- trunk/lib/model/map/RightsI18nTableMap.php Fri Sep 16 21:31:42 2011
(r9750)
+++ trunk/lib/model/map/RightsI18nTableMap.php Fri Sep 16 21:33:14 2011
(r9751)
@@ -36,7 +36,6 @@
$this->setPackage('lib.model');
$this->setUseIdGenerator(false);
// columns
- $this->addColumn('RESTRICTION', 'restriction', 'LONGVARCHAR',
false, null, null);
$this->addColumn('RIGHTS_NOTE', 'rightsNote', 'LONGVARCHAR',
false, null, null);
$this->addColumn('COPYRIGHT_NOTE', 'copyrightNote',
'LONGVARCHAR', false, null, null);
$this->addColumn('LICENSE_IDENTIFIER', 'licenseIdentifier',
'LONGVARCHAR', false, null, null);
Modified: trunk/lib/model/map/RightsTableMap.php
==============================================================================
--- trunk/lib/model/map/RightsTableMap.php Fri Sep 16 21:31:42 2011
(r9750)
+++ trunk/lib/model/map/RightsTableMap.php Fri Sep 16 21:33:14 2011
(r9751)
@@ -39,6 +39,7 @@
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' , 'object',
'ID', true, null, null);
$this->addColumn('START_DATE', 'startDate', 'DATE', false,
null, null);
$this->addColumn('END_DATE', 'endDate', 'DATE', false, null,
null);
+ $this->addColumn('RESTRICTION', 'restriction', 'BOOLEAN',
false, null, true);
$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);
Modified: trunk/lib/model/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php Fri Sep 16 21:31:42 2011 (r9750)
+++ trunk/lib/model/om/BaseRights.php Fri Sep 16 21:33:14 2011 (r9751)
@@ -10,6 +10,7 @@
ID = 'rights.ID',
START_DATE = 'rights.START_DATE',
END_DATE = 'rights.END_DATE',
+ RESTRICTION = 'rights.RESTRICTION',
BASIS_ID = 'rights.BASIS_ID',
ACT_ID = 'rights.ACT_ID',
RIGHTS_HOLDER_ID = 'rights.RIGHTS_HOLDER_ID',
@@ -28,6 +29,7 @@
$criteria->addSelectColumn(QubitRights::ID);
$criteria->addSelectColumn(QubitRights::START_DATE);
$criteria->addSelectColumn(QubitRights::END_DATE);
+ $criteria->addSelectColumn(QubitRights::RESTRICTION);
$criteria->addSelectColumn(QubitRights::BASIS_ID);
$criteria->addSelectColumn(QubitRights::ACT_ID);
$criteria->addSelectColumn(QubitRights::RIGHTS_HOLDER_ID);
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Fri Sep 16 21:31:42 2011
(r9750)
+++ trunk/lib/model/om/BaseRightsI18n.php Fri Sep 16 21:33:14 2011
(r9751)
@@ -7,7 +7,6 @@
TABLE_NAME = 'rights_i18n',
- RESTRICTION = 'rights_i18n.RESTRICTION',
RIGHTS_NOTE = 'rights_i18n.RIGHTS_NOTE',
COPYRIGHT_NOTE = 'rights_i18n.COPYRIGHT_NOTE',
LICENSE_IDENTIFIER = 'rights_i18n.LICENSE_IDENTIFIER',
@@ -21,7 +20,6 @@
public static function addSelectColumns(Criteria $criteria)
{
- $criteria->addSelectColumn(QubitRightsI18n::RESTRICTION);
$criteria->addSelectColumn(QubitRightsI18n::RIGHTS_NOTE);
$criteria->addSelectColumn(QubitRightsI18n::COPYRIGHT_NOTE);
$criteria->addSelectColumn(QubitRightsI18n::LICENSE_IDENTIFIER);
@@ -46,8 +44,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[9];
- $keys['culture'] = $row[10];
+ $keys['id'] = $row[8];
+ $keys['culture'] = $row[9];
$key = serialize($keys);
if (!isset(self::$rightsI18ns[$key]))
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
