Author: sevein
Date: Tue Jul 10 19:40:25 2012
New Revision: 11896

Log:
Bump db version and update arUpgrader120 with fixes for issue 2344 and r11890

Modified:
   trunk/data/fixtures/settings.yml
   trunk/lib/task/migrate/arUpgrader120.class.php

Modified: trunk/data/fixtures/settings.yml
==============================================================================
--- trunk/data/fixtures/settings.yml    Tue Jul 10 19:38:19 2012        (r11895)
+++ trunk/data/fixtures/settings.yml    Tue Jul 10 19:40:25 2012        (r11896)
@@ -3,7 +3,7 @@
     name: version
     editable: 0
     deleteable: 0
-    value: 85
+    value: 87
   QubitSetting_2:
     name: upload_dir
     editable: 0

Modified: trunk/lib/task/migrate/arUpgrader120.class.php
==============================================================================
--- trunk/lib/task/migrate/arUpgrader120.class.php      Tue Jul 10 19:38:19 
2012        (r11895)
+++ trunk/lib/task/migrate/arUpgrader120.class.php      Tue Jul 10 19:40:25 
2012        (r11896)
@@ -267,8 +267,63 @@
 
         break;
 
-      // TODO Fix r11890
-      // TODO Fix issue 2344
+      // Fix typo: r11890
+      case 85:
+        $sql  = 'UPDATE '.QubitTermI18n::TABLE_NAME;
+        $sql .= ' SET '.QubitTermI18n::NAME.' = "Disseminate"';
+        $sql .= ' WHERE '.QubitTermI18n::CULTURE.' = "en"';
+        $sql .= ' AND '.QubitTermI18n::NAME.' = "Disemanite"';
+        QubitPdo::modify($sql);
+
+        break;
+
+      // Fix issue 2344
+      case 86:
+        // Type of relation: right
+        // Check first wether it exists
+        $criteria = new Criteria;
+        $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
+        $criteria->add(QubitTerm::TAXONOMY_ID, 
QubitTaxonomy::RELATION_TYPE_ID);
+        $criteria->add(QubitTermI18n::CULTURE, 'en');
+        $criteria->add(QubitTermI18n::NAME, 'Right');
+
+        if (null === QubitTerm::getOne($criteria))
+        {
+          $term = new QubitTerm;
+          $term->id = QubitTerm::RIGHT_ID;
+          $term->parentId = QubitTerm::ROOT_ID;
+          $term->taxonomyId = QubitTaxonomy::RELATION_TYPE_ID;
+          $term->sourceCulture = 'en';
+          $termI18n = new QubitTermI18n;
+          $termI18n->name = 'Right';
+          $termI18n->culture = 'en';
+          $term->termI18ns[] = $termI18n;
+          QubitMigrate::addTerm($term, $configuration);
+        }
+
+        // Type of relation: donor
+        // Check first wether it exists
+        $criteria = new Criteria;
+        $criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
+        $criteria->add(QubitTerm::TAXONOMY_ID, 
QubitTaxonomy::RELATION_TYPE_ID);
+        $criteria->add(QubitTermI18n::CULTURE, 'en');
+        $criteria->add(QubitTermI18n::NAME, 'Donor');
+
+        if (null === QubitTerm::getOne($criteria))
+        {
+          $term = new QubitTerm;
+          $term->id = QubitTerm::DONOR_ID;
+          $term->parentId = QubitTerm::ROOT_ID;
+          $term->taxonomyId = QubitTaxonomy::RELATION_TYPE_ID;
+          $term->sourceCulture = 'en';
+          $termI18n = new QubitTermI18n;
+          $termI18n->name = 'Donor';
+          $termI18n->culture = 'en';
+          $term->termI18ns[] = $termI18n;
+          QubitMigrate::addTerm($term, $configuration);
+        }
+
+        break;
 
       // Return false if no upgrade available
       default:

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