Author: sevein
Date: Tue Jul 19 16:41:48 2011
New Revision: 9338
Log:
Rename and update right taxonomies
Modified:
trunk/data/fixtures/taxonomyTerms.yml
trunk/lib/model/QubitTaxonomy.php
trunk/lib/task/migrate/QubitMigrate110.class.php
Modified: trunk/data/fixtures/taxonomyTerms.yml
==============================================================================
--- trunk/data/fixtures/taxonomyTerms.yml Tue Jul 19 16:41:15 2011
(r9337)
+++ trunk/data/fixtures/taxonomyTerms.yml Tue Jul 19 16:41:48 2011
(r9338)
@@ -357,18 +357,18 @@
parent_id: QubitTaxonomy_root
name:
en: 'Deaccession scope'
- QubitTaxonomy_rights_type:
+ QubitTaxonomy_right_type:
source_culture: en
- id: <?php echo QubitTaxonomy::RIGHTS_TYPE_ID."\n" ?>
+ id: <?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>
parent_id: QubitTaxonomy_root
name:
- en: 'Rights type'
- QubitTaxonomy_rights_status:
+ en: 'Right basis'
+ QubitTaxonomy_right_act:
source_culture: en
- id: <?php echo QubitTaxonomy::RIGHTS_STATUS_ID."\n" ?>
+ id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
parent_id: QubitTaxonomy_root
name:
- en: 'Rights status'
+ en: 'Right act'
QubitTerm:
QubitTerm_110:
taxonomy_id: <?php echo QubitTaxonomy::ROOT_ID."\n" ?>
@@ -2285,42 +2285,103 @@
source_culture: en
name:
en: Part
- QubitTerm_rights_type_intellectual_property:
- taxonomy_id: <?php echo QubitTaxonomy::RIGHTS_TYPE_ID."\n" ?>
+
+ QubitTerm_right_basis_copyright:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: 'Intellectual property'
- QubitTerm_rights_type_license:
- taxonomy_id: <?php echo QubitTaxonomy::RIGHTS_TYPE_ID."\n" ?>
+ en: 'Copyright'
+ QubitTerm_right_basis_license:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
en: License
- QubitTerm_rights_type_statue:
- taxonomy_id: <?php echo QubitTaxonomy::RIGHTS_TYPE_ID."\n" ?>
+ QubitTerm_right_basis_statute:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: Statue
- QubitTerm_rights_status_copyright:
- taxonomy_id: <?php echo QubitTaxonomy::RIGHTS_STATUS_ID."\n" ?>
+ en: Statute
+ QubitTerm_right_act_reproduction:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: Copyright
- QubitTerm_rights_status_public_domain:
- taxonomy_id: <?php echo QubitTaxonomy::RIGHTS_STATUS_ID."\n" ?>
+ en: Reproduction
+ QubitTerm_right_act_preservation:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: Preservation
+ QubitTerm_right_act_make_available:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: 'Make available'
+ QubitTerm_right_act_exhibition:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: Exhibition
+ QubitTerm_right_act_preservation:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: Preservation
+ QubitTerm_right_act_publication:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: Publication
+ QubitTerm_right_act_perform:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: 'Perform in public'
+ QubitTerm_right_act_broadcast:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: 'Broadcast'
+ QubitTerm_right_act_distribution:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: 'Distribution of copies'
+ QubitTerm_right_act_translation_conversion:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: 'Translation and conversion'
+ QubitTerm_right_act_description:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
+ parent_id: QubitTerm_110
+ source_culture: en
+ name:
+ en: Description
+ QubitTerm_right_act_publicization:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: 'Public domain'
- QubitTerm_rights_status_unknown:
- taxonomy_id: <?php echo QubitTaxonomy::RIGHTS_STATUS_ID."\n" ?>
+ en: Publicization
+ QubitTerm_right_act_promotion:
+ taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: Unknown
+ en: Promotion
QubitNote:
QubitNote_1:
object_id: QubitTerm_111
Modified: trunk/lib/model/QubitTaxonomy.php
==============================================================================
--- trunk/lib/model/QubitTaxonomy.php Tue Jul 19 16:41:15 2011 (r9337)
+++ trunk/lib/model/QubitTaxonomy.php Tue Jul 19 16:41:48 2011 (r9338)
@@ -61,9 +61,9 @@
ACCESSION_PROCESSING_STATUS_ID = 65,
DEACCESSION_SCOPE_ID = 66,
- // Rights taxonomies
- RIGHTS_STATUS_ID = 67,
- RIGHTS_TYPE_ID = 68;
+ // Right taxonomies
+ RIGHT_ACT_ID = 67,
+ RIGHT_BASIS_ID = 68;
public static
$lockedTaxonomies = array(
Modified: trunk/lib/task/migrate/QubitMigrate110.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate110.class.php Tue Jul 19 16:41:15
2011 (r9337)
+++ trunk/lib/task/migrate/QubitMigrate110.class.php Tue Jul 19 16:41:48
2011 (r9338)
@@ -264,41 +264,85 @@
'source_culture' => 'en',
'name' => array('en' => 'Part'));
- // Rights status taxonomy and terms
- $this->data['QubitTaxonomy']['QubitTaxonomy_rights_status'] = array(
+ // Right act taxonomy and terms
+ $this->data['QubitTaxonomy']['QubitTaxonomy_right_act'] = array(
'source_culture' => 'en',
- 'id' => '<?php echo QubitTaxonomy::RIGHTS_STATUS_ID."\n" ?>',
- 'name' => array('en' => 'Rights status'));
- $this->data['QubitTerm']['QubitTerm_rights_status_copyright'] = array(
- 'taxonomy_id' => 'QubitTaxonomy_rights_status',
+ 'id' => '<?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>',
+ 'name' => array('en' => 'Right act'));
+ $this->data['QubitTerm']['QubitTerm_right_act_fix'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
'source_culture' => 'en',
- 'name' => array('en' => 'Copyright'));
- $this->data['QubitTerm']['QubitTerm_rights_status_public_domain'] = array(
- 'taxonomy_id' => 'QubitTaxonomy_rights_status',
+ 'name' => array('en' => 'Fix'));
+ $this->data['QubitTerm']['QubitTerm_right_act_reproduction'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Reproduction'));
+ $this->data['QubitTerm']['QubitTerm_right_act_preservation'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Preservation'));
+ $this->data['QubitTerm']['QubitTerm_right_act_make_available'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Make available'));
+ $this->data['QubitTerm']['QubitTerm_right_act_exhibition'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Exhibition'));
+ $this->data['QubitTerm']['QubitTerm_right_act_presentation'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Presentation'));
+ $this->data['QubitTerm']['QubitTerm_right_act_publication'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Publication'));
+ $this->data['QubitTerm']['QubitTerm_right_act_perform'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Perform in public'));
+ $this->data['QubitTerm']['QubitTerm_right_act_broadcast'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Broadcast'));
+ $this->data['QubitTerm']['QubitTerm_right_act_distribution'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
'source_culture' => 'en',
- 'name' => array('en' => 'Public domain'));
- $this->data['QubitTerm']['QubitTerm_rights_status_unknown'] = array(
- 'taxonomy_id' => 'QubitTaxonomy_rights_status',
- 'source_culture' => 'en',
- 'name' => array('en' => 'Unknown'));
-
- // Rights types taxonomy and terms
- $this->data['QubitTaxonomy']['QubitTaxonomy_rights_type'] = array(
- 'source_culture' => 'en',
- 'id' => '<?php echo QubitTaxonomy::RIGHTS_TYPE_ID."\n" ?>',
- 'name' => array('en' => 'Rights type'));
- $this->data['QubitTerm']['QubitTerm_rights_type_intellectual_property'] =
array(
- 'taxonomy_id' => 'QubitTaxonomy_rights_type',
- 'source_culture' => 'en',
- 'name' => array('en' => 'Intellectual property'));
- $this->data['QubitTerm']['QubitTerm_rights_type_license'] = array(
- 'taxonomy_id' => 'QubitTaxonomy_rights_type',
+ 'name' => array('en' => 'Distribution of copies'));
+ $this->data['QubitTerm']['QubitTerm_right_act_translation_conversion'] =
array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Translation and conversion'));
+ $this->data['QubitTerm']['QubitTerm_right_act_description'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Description'));
+ $this->data['QubitTerm']['QubitTerm_right_act_publicization'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Publicization'));
+ $this->data['QubitTerm']['QubitTerm_right_act_promotion'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_act',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Promotion'));
+
+ // Right basis taxonomy and terms
+ $this->data['QubitTaxonomy']['QubitTaxonomy_right_basis'] = array(
+ 'source_culture' => 'en',
+ 'id' => '<?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>',
+ 'name' => array('en' => 'Right basis'));
+ $this->data['QubitTerm']['QubitTerm_right_basis_copyright'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_basis',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Copyright'));
+ $this->data['QubitTerm']['QubitTerm_right_basis_license'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_basis',
'source_culture' => 'en',
'name' => array('en' => 'License'));
- $this->data['QubitTerm']['QubitTerm_rights_type_statue'] = array(
- 'taxonomy_id' => 'QubitTaxonomy_rights_type',
+ $this->data['QubitTerm']['QubitTerm_right_basis_statute'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_basis',
'source_culture' => 'en',
- 'name' => array('en' => 'Statue'));
+ 'name' => array('en' => 'Statute'));
return $this;
}
--
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.
