Author: sevein
Date: Tue Jul 10 17:32:18 2012
New Revision: 11892
Log:
Rename methods so they can be also used for adding non-constant terms or
taxonomies
Modified:
trunk/lib/task/migrate/QubitMigrate.class.php
trunk/lib/task/migrate/arUpgrader120.class.php
Modified: trunk/lib/task/migrate/QubitMigrate.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate.class.php Tue Jul 10 16:38:50
2012 (r11891)
+++ trunk/lib/task/migrate/QubitMigrate.class.php Tue Jul 10 17:32:18
2012 (r11892)
@@ -455,7 +455,7 @@
return $columns;
}
- public static function addTermConstant(QubitTerm $object, $configuration)
+ public static function addTerm(QubitTerm $object, $configuration)
{
$connection = Propel::getConnection();
@@ -464,7 +464,7 @@
try
{
// Check if it already exists
- if (null !== QubitTerm::getById($object->id))
+ if (isset($object->id) && null !== QubitTerm::getById($object->id))
{
$connection->exec('SET FOREIGN_KEY_CHECKS = 0');
@@ -494,7 +494,7 @@
$connection->commit();
}
- public static function addTaxonomyConstant(QubitTaxonomy $object,
$configuration)
+ public static function addTaxonomy(QubitTaxonomy $object, $configuration)
{
$connection = Propel::getConnection();
@@ -503,7 +503,7 @@
try
{
// Check if it already exists
- if (null !== QubitTaxonomy::getById($object->id))
+ if (isset($object->id) && null !== QubitTaxonomy::getById($object->id))
{
$connection->exec('SET FOREIGN_KEY_CHECKS = 0');
Modified: trunk/lib/task/migrate/arUpgrader120.class.php
==============================================================================
--- trunk/lib/task/migrate/arUpgrader120.class.php Tue Jul 10 16:38:50
2012 (r11891)
+++ trunk/lib/task/migrate/arUpgrader120.class.php Tue Jul 10 17:32:18
2012 (r11892)
@@ -263,12 +263,10 @@
$termI18n->culture = 'en';
$termI18n->name = 'Accrual';
$term->termI18ns[] = $termI18n;
-
- QubitMigrate::addTermConstant($term, $configuration);
+ QubitMigrate::addTerm($term, $configuration);
break;
- // TODO ensure that all the terms has parent_id = ROOT_ID instead of null
// TODO Fix r11890
// TODO Fix issue 2344
--
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.
