diff --git a/content/content.importers.php b/content/content.importers.php index 0491900..7bdbcef 100644 --- a/content/content.importers.php +++ b/content/content.importers.php @@ -232,18 +232,18 @@ public function __viewRun() { )); $this->addFailedEntries($fieldset, $failed); + + ### + # Delegate: XMLImporterImportPostRunErrors + # Description: Notify Delegate for Errors + Symphony::ExtensionManager()->notifyMembers( + 'XMLImporterImportPostRunErrors', '/xmlimporter/importers/run/', + array( + $current['errors'] + ) + ); } - ### - # Delegate: XMLImporterImportPostRunErrors - # Description: Notify Delegate for Errors - Symphony::ExtensionManager()->notifyMembers( - 'XMLImporterImportPostRunErrors', '/xmlimporter/importers/run/', - array( - $current['errors'] - ) - ); - // Invalid entry: else if ($status == XMLImporter::__PARTIAL_OK__) { $fieldset->appendChild(new XMLElement( diff --git a/lib/class.xmlimporter.php b/lib/class.xmlimporter.php index 319b276..9908ee9 100644 --- a/lib/class.xmlimporter.php +++ b/lib/class.xmlimporter.php @@ -402,52 +402,21 @@ public function commit($status) { // Skip else { $entry->set('importer_status', 'skipped'); - continue; - } - - ### - # Delegate: XMLImporterEntryPostSkip - # Description: Skipping an entry. Entry object is provided. - Symphony::ExtensionManager()->notifyMembers( - 'XMLImporterEntryPostSkip', '/xmlimporter/importers/run/', - array( - 'section' => $section, - 'entry' => $entry, - 'fields' => $values - ) - ); - - // Create a new entry - else { - $entry->set('creation_date_gmt', DateTimeObj::getGMT('Y-m-d H:i:s')); - $entry->set('creation_date', DateTimeObj::get('Y-m-d H:i:s')); - - ### - # Delegate: XMLImporterEntryPreEdit - # Description: Just prior to editing of an Entry. - Symphony::ExtensionManager()->notifyMembers( - 'XMLImporterEntryPreEdit', '/xmlimporter/importers/run/', - array( - 'section' => $section, - 'fields' => &$values, - 'entry' => &$entry - ) - ); - EntryManager::edit($entry); - $entry->set('importer_status', 'updated'); + ### + # Delegate: XMLImporterEntryPostSkip + # Description: Skipping an entry. Entry object is provided. + Symphony::ExtensionManager()->notifyMembers( + 'XMLImporterEntryPostSkip', '/xmlimporter/importers/run/', + array( + 'section' => $section, + 'entry' => $entry, + 'fields' => $values + ) + ); - ### - # Delegate: XMLImporterEntryPostEdit - # Description: Editing an entry. Entry object is provided. - Symphony::ExtensionManager()->notifyMembers( - 'XMLImporterEntryPostEdit', '/xmlimporter/importers/run/', - array( - 'section' => $section, - 'entry' => $entry, - 'fields' => $values - ) - ); + continue; + } } // Create entry