Index: backup/cc/restore_cc.php
===================================================================
RCS file: /cvsroot/moodle/moodle/backup/cc/restore_cc.php,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 restore_cc.php
--- backup/cc/restore_cc.php	19 Oct 2009 17:19:20 -0000	1.1.2.2
+++ backup/cc/restore_cc.php	6 Aug 2010 19:37:06 -0000
@@ -24,6 +24,32 @@
 require_once($CFG->dirroot . '/backup/cc/includes/constants.php');
 require_once($CFG->dirroot . '/backup/cc/cc2moodle.php');
 
+function cc_convert_errors (){
+    $errors = libxml_get_errors();
+    $result = array();
+    foreach($errors as $error){
+        $result[ $error->level] [] = $error;
+    }
+    krsort($result);
+    libxml_use_internal_errors(false);    
+    return $result;
+}
+
+function cc_convert_errors_notify($errors){
+    foreach($errors as $level => $level_errors){
+        foreach($level_errors as $error){
+            notify("File: 
+                    {$error->file} Line: 
+                    {$error->line} Column: 
+                    {$error->column} Level: 
+                    {$error->level}<br />\nError: 
+                    {$error->message}"
+                    , "notifyproblem imscc_level_{$level}"
+                    , 'left');
+        }
+    }
+}
+
 function cc_convert ($dir) {
 
     $manifest_file = $dir . DIRECTORY_SEPARATOR . 'imsmanifest.xml';
@@ -65,30 +91,40 @@
             echo get_string('cc2moodle_checking_schema', 'imscc') . '<br />';
 
             $cc_manifest = new DOMDocument();
+            $cc_manifest->validateOnParse = false;
+            
+            libxml_use_internal_errors(true);
+            $loaded = $cc_manifest->load($manifest_file);
+            if (!$loaded) {
+                cc_convert_errors_notify(cc_convert_errors());                
+                notify(get_string('cc2moodle_manifest_dont_load', 'imscc'));
+                return false;                                
+            } 
+            
+            $valid = $cc_manifest->schemaValidate($schema_file);
+            if (!$valid) {
+                cc_convert_errors_notify(cc_convert_errors());                
+                notify(get_string('cc2moodle_invalid_schema', 'imscc'));
+                return false;
+            }
 
-            if ($cc_manifest->load($manifest_file)) {
-                if ($cc_manifest->schemaValidate($schema_file)) {
-
-                    echo get_string('cc2moodle_valid_schema', 'imscc') . '<br />';
-
-                    $cc2moodle = new cc2moodle($manifest_file);
-
-                    if (!$cc2moodle->is_auth()) {
-                        return $cc2moodle->generate_moodle_xml();
-                    } else {
-                        notify(get_string('cc2moodle_req_auth', 'imscc'));
-                        return false;
-                    }
-
-                } else {
-                    notify(get_string('cc2moodle_invalid_schema', 'imscc'));
-                    return false;
+            echo get_string('cc2moodle_valid_schema', 'imscc') . '<br />';
+
+            $cc2moodle = new cc2moodle($manifest_file);
+            
+            $result = false;
+            
+            if (!$cc2moodle->is_auth()) {
+                $result = $cc2moodle->generate_moodle_xml();
+                if (!$result) {
+                    cc_convert_errors_notify(cc_convert_errors());                
                 }
-
             } else {
-                notify(get_string('cc2moodle_manifest_dont_load', 'imscc'));
-                return false;
+                cc_convert_errors_notify(cc_convert_errors());                
+                notify(get_string('cc2moodle_req_auth', 'imscc'));
             }
+            
+            return $result;
         }
     }