Author: david
Date: Fri Jun 24 16:37:07 2011
New Revision: 9174

Log:
Rollback accidental commit in r9173

Modified:
   trunk/data/fixtures/settings.yml
   trunk/lib/task/migrate/QubitMigrate110.class.php
   trunk/lib/task/migrate/QubitMigrateFactory.class.php   (props changed)

Modified: trunk/data/fixtures/settings.yml
==============================================================================
--- trunk/data/fixtures/settings.yml    Fri Jun 24 16:34:29 2011        (r9173)
+++ trunk/data/fixtures/settings.yml    Fri Jun 24 16:37:07 2011        (r9174)
@@ -3,7 +3,7 @@
     name: version
     editable: 0
     deleteable: 0
-    value: 64
+    value: 63
   QubitSetting_2:
     name: upload_dir
     editable: 0

Modified: trunk/lib/task/migrate/QubitMigrate110.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate110.class.php    Fri Jun 24 16:34:29 
2011        (r9173)
+++ trunk/lib/task/migrate/QubitMigrate110.class.php    Fri Jun 24 16:37:07 
2011        (r9174)
@@ -27,34 +27,17 @@
  */
 class QubitMigrate110 extends QubitMigrate
 {
-  const 
-    MILESTONE = '1.1',
-    INIT_VERSION = 62,
-    FINAL_VERSION = null;
-
-  public function execute()
-  {
-    $this->slugData();
-    $this->alterData();
-    $this->sortData();
-
-    return $this->getData();
-  }
-
   /**
    * Controller for calling methods to alter data
    *
    * @return QubitMigrate110 this object
    */
-  protected function alterData()
+  protected function alterData($version)
   {
-    switch ($this->version)
+    switch ($version)
     {
       case 62:
-        $this->addAccessioningFixtures();
-      
-      case 63:
-        $this->moveRelationNotesToI18n();
+        addAccessioningFixtures();
     }
 
     // Delete "stub" objects
@@ -87,11 +70,11 @@
     $this->data['QubitTerm']['QubitTerm_accession_resource_type_public'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_resource_type',
       'source_culture' => 'en',
-      'name' => array('en' => 'Public transfer'));
+      'name' => array('en' => 'Public transfer')
     $this->data['QubitTerm']['QubitTerm_accession_resource_type_private'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_resource_type',
       'source_culture' => 'en',
-      'name' => array('en' => 'Private transfer'));
+      'name' => array('en' => 'Private transfer')
 
     // Acquisition type taxonomy and terms
     $this->data['QubitTaxonomy']['QubitTaxonomy_accession_acquisition_type'] = 
array(
@@ -101,19 +84,19 @@
     $this->data['QubitTerm']['QubitTerm_accession_acquisition_type_deposit'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_acquisition_type',
       'source_culture' => 'en',
-      'name' => array('en' => 'Deposit'));
+      'name' => array('en' => 'Deposit')
     $this->data['QubitTerm']['QubitTerm_accession_acquisition_type_gift'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_acquisition_type',
       'source_culture' => 'en',
-      'name' => array('en' => 'Gift'));
+      'name' => array('en' => 'Gift')
     $this->data['QubitTerm']['QubitTerm_accession_acquisition_type_purchase'] 
= array(
       'taxonomy_id' => 'QubitTaxonomy_accession_acquisition_type',
       'source_culture' => 'en',
-      'name' => array('en' => 'Purchase'));
+      'name' => array('en' => 'Purchase')
     $this->data['QubitTerm']['QubitTerm_accession_acquisition_type_transfer'] 
= array(
       'taxonomy_id' => 'QubitTaxonomy_accession_acquisition_type',
       'source_culture' => 'en',
-      'name' => array('en' => 'Transfer'));
+      'name' => array('en' => 'Transfer')
 
     // Processing priority taxonomy and terms
     
$this->data['QubitTaxonomy']['QubitTaxonomy_accession_processing_priority'] = 
array(
@@ -123,15 +106,15 @@
     $this->data['QubitTerm']['QubitTerm_accession_processing_priority_high'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_processing_priority',
       'source_culture' => 'en',
-      'name' => array('en' => 'High'));
+      'name' => array('en' => 'High')
     $this->data['QubitTerm']['QubitTerm_accession_processing_priority_medium'] 
= array(
       'taxonomy_id' => 'QubitTaxonomy_accession_processing_priority',
       'source_culture' => 'en',
-      'name' => array('en' => 'Medium'));
+      'name' => array('en' => 'Medium')
     $this->data['QubitTerm']['QubitTerm_accession_processing_priority_low'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_processing_priority',
       'source_culture' => 'en',
-      'name' => array('en' => 'Low'));
+      'name' => array('en' => 'Low')
 
     // Processing status taxonomy and terms
     $this->data['QubitTaxonomy']['QubitTaxonomy_accession_processing_status'] 
= array(
@@ -141,11 +124,11 @@
     $this->data['QubitTerm']['QubitTerm_accession_processing_status_complete'] 
= array(
       'taxonomy_id' => 'QubitTaxonomy_accession_processing_status',
       'source_culture' => 'en',
-      'name' => array('en' => 'Complete'));
+      'name' => array('en' => 'Complete')
     
$this->data['QubitTerm']['QubitTerm_accession_processing_status_incomplete'] = 
array(
       'taxonomy_id' => 'QubitTaxonomy_accession_processing_status',
       'source_culture' => 'en',
-      'name' => array('en' => 'Incomplete'));
+      'name' => array('en' => 'Incomplete')
 
     // Deaccession scope taxonomy and terms
     $this->data['QubitTaxonomy']['QubitTaxonomy_deaccession_scope'] = array(
@@ -155,51 +138,11 @@
     $this->data['QubitTerm']['QubitTerm_deaccession_scope_whole'] = array(
       'taxonomy_id' => 'QubitTaxonomy_deaccession_scope',
       'source_culture' => 'en',
-      'name' => array('en' => 'Whole'));
+      'name' => array('en' => 'Whole')
     $this->data['QubitTerm']['QubitTerm_deaccession_scope_part'] = array(
       'taxonomy_id' => 'QubitTaxonomy_deaccession_scope',
       'source_culture' => 'en',
-      'name' => array('en' => 'Part'));
-
-    return $this;
-  }
-
-  /**
-   * Migrate relation notes for date and description to relation_i18n table 
-   *
-   * @return QubitMigrate110 this object
-   */
-  protected function moveRelationNotesToI18n()
-  {
-    // Search for relation notes 
-    foreach ($this->data['QubitNote'] as &$item)
-    {
-      if (isset($item['type_id']))
-      {
-        switch ($item['type_id'])
-        {
-          case 'QubitTerm::RELATION_NOTE_DATE_ID':
-            $colname = 'date';
-            break;
-
-          case 'QubitTerm::RELATION_NOTE_DESCRIPTION_ID':
-            $colname = 'description';
-            break;
-
-          default:
-            continue 2;
-        }
-
-        // Replace relation note with relation_i18n row
-        if (isset($this->data['QubitRelation'][$item['object_id']]) && 
isset($item['content']))
-        {
-          $this->data['QubitRelation'][$item['object_id']]['source_culture'] = 
$item['source_culture'];
-          $this->data['QubitRelation'][$item['object_id']][$colname] = 
$item['content'];
-        }
-
-        unset($item);
-      }
-    }
+      'name' => array('en' => 'Part')
 
     return $this;
   }
@@ -256,6 +199,33 @@
     return $this;
   }
 
+  public function execute()
+  {
+    $this->slugData();
+
+    // Find version
+    foreach ($this->data['QubitSetting'] as $key => $value)
+    {
+      if ('version' == $value['name'])
+      {
+        $version = $value['value'][$value['source_culture']];
+        break;
+      }
+    }
+
+    $this->alterData($version);
+
+    $parser = new sfYamlParser;
+    $data = 
$parser->parse(file_get_contents(sfConfig::get('sf_data_dir').'/fixtures/settings.yml'));
+
+    // Update version
+    
$this->data['QubitSetting'][$key]['value'][$this->data['QubitSetting'][$key]['source_culture']]
 = $data['QubitSetting']['version']['value'];
+
+    $this->sortData();
+
+    return $this->getData();
+  }
+
   /**
    * Sort information objects by lft value so that parent objects are inserted
    * before their children.

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