summaryrefslogtreecommitdiffstats
path: root/migrate.module
diff options
context:
space:
mode:
authorMike Ryan2009-11-06 18:53:14 +0000
committerMike Ryan2009-11-06 18:53:14 +0000
commit27f48e8b3371b991877049580a09e2d29f81c3b7 (patch)
tree0e901d3d6207ee66baa4d245eb6128b37fff6320 /migrate.module
parent33b9aa7e89b7125e5e3d7c9da8b721182271593a (diff)
#619250 by mikeryan: Continue with remaining content sets when one is busy
Diffstat (limited to 'migrate.module')
-rwxr-xr-xmigrate.module7
1 files changed, 4 insertions, 3 deletions
diff --git a/migrate.module b/migrate.module
index 47cc427..11ce356 100755
--- a/migrate.module
+++ b/migrate.module
@@ -820,7 +820,7 @@ function migrate_content_process_all(&$messages = array(), &$options = array())
}
while ($row = db_fetch_object($result)) {
$status = migrate_content_process_clear($row->mcsid, $messages, $options);
- if ($status != MIGRATE_STATUS_SUCCESS) {
+ if ($status != MIGRATE_STATUS_SUCCESS && $status != MIGRATE_STATUS_IN_PROGRESS) {
break;
}
$options['opcount']++;
@@ -833,7 +833,7 @@ function migrate_content_process_all(&$messages = array(), &$options = array())
ORDER BY weight");
while ($row = db_fetch_object($result)) {
$status = migrate_content_process_import($row->mcsid, $messages, $options);
- if ($status != MIGRATE_STATUS_SUCCESS) {
+ if ($status != MIGRATE_STATUS_SUCCESS && $status != MIGRATE_STATUS_IN_PROGRESS) {
break;
}
$options['opcount']++;
@@ -1101,7 +1101,8 @@ function migrate_schema_alter(&$schema) {
db_set_active('default');
$sourceschema = $inspect[$tablename];
// If the PK of the content set is defined, make sure we have a mapping table
- if ($sourcekey = $content_set->sourcekey) {
+ $sourcekey = $content_set->sourcekey;
+ if ($sourcekey) {
$sourcefield = $sourceschema['fields'][$sourcekey];
if (!$sourcefield) {
// strip base table name if views prepended it