diff --git a/home/ims/ims_import.php b/home/ims/ims_import.php index 57ba69c0..949a69af 100644 --- a/home/ims/ims_import.php +++ b/home/ims/ims_import.php @@ -212,9 +212,8 @@ function checkResources($import_path){ $errors = libxml_get_errors(); foreach ($errors as $error) { //suppress warnings - if ($error->level==LIBXML_ERR_WARNING){ - continue; - } + if ($error->level==LIBXML_ERR_WARNING) continue; + $msg->addError(array('IMPORT_CARTRIDGE_FAILED', libxml_display_error($error))); } libxml_clear_errors(); @@ -1375,8 +1374,9 @@ function glossaryCharacterData($parser, $data){ $xml_content = @file_get_contents($import_path . $forum_link); $dt_parser->parse($xml_content); $forum_obj = $dt_parser->getDt(); - $dt_import->import($forum_obj, $items[$item_id]['real_content_id'], $_course_id); - $added_dt[$forum_ref] = $dt_import->getFid(); + $result = $dt_import->import($forum_obj, $items[$item_id]['real_content_id'], $_course_id); + if ($result) + $added_dt[$forum_ref] = $dt_import->getFid(); } } @@ -1445,4 +1445,4 @@ function glossaryCharacterData($parser, $data){ } exit; -?> \ No newline at end of file +?> diff --git a/include/classes/DiscussionTools/DiscussionToolsImport.class.php b/include/classes/DiscussionTools/DiscussionToolsImport.class.php index 5ccd4f6f..28638eda 100644 --- a/include/classes/DiscussionTools/DiscussionToolsImport.class.php +++ b/include/classes/DiscussionTools/DiscussionToolsImport.class.php @@ -32,7 +32,11 @@ function import($forum_obj, $cid, $course_id){ $text = $forum_obj->getText(); $this->fid = $this->createForum($title, $text, $course_id); - $this->associateForum($cid, $this->fid); + if ($this->fid) { + $this->associateForum($cid, $this->fid); + return true; + } else + return false; } @@ -45,9 +49,10 @@ function import($forum_obj, $cid, $course_id){ function createForum($title, $text, $course_id){ $forumsDAO = new ForumsDAO(); $forums_id = $forumsDAO->Create($title, $text); - - $forumsCoursesDAO = new ForumsCoursesDAO(); - $forumsCoursesDAO->Create($forums_id, $course_id); + if ($forums_id) { + $forumsCoursesDAO = new ForumsCoursesDAO(); + $forumsCoursesDAO->Create($forums_id, $course_id); + } return $forums_id; } @@ -71,4 +76,4 @@ function getFid(){ return $this->fid; } } -?> \ No newline at end of file +?>