Index: openacs-4/packages/imsld/tcl/imsld-xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-xowiki-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/imsld/tcl/imsld-xowiki-procs.tcl	1 Jul 2009 11:05:40 -0000	1.5
+++ openacs-4/packages/imsld/tcl/imsld-xowiki-procs.tcl	29 Oct 2009 11:09:59 -0000	1.6
@@ -156,17 +156,25 @@
     # attribute) will be a file in XoWiki, while links (URLs
     # referenced by the ALT attribute.
 
-    # small hack to avoid tDOM to escape the LD tags :(
-    regsub {<ld:([^\s]+)} $content {<ld\1} content
-
-    set document [dom parse -html $content]
+    if { [catch {dom parse $content document} errmsg] } {
+	ns_log notice "imsld::xowiki::convert_syntax ERROR: Not a valid XML file, aborting parse process!"
+	# the docuemnt is not an xml file, just return it
+	return $content
+    } 
     set root [$document documentElement]
 
     if { $root eq "" } {
 	# Content is too generic, we cannot proceed
 	return $content
     }
 
+    # Since XoWiki will crop the IMS LD namespace, we need to include
+    # it within each LD tag.
+    set ld_tags [$root selectNodes -namespaces {imsld "http://www.imsglobal.org/xsd/imsld_v1p0"} //imsld:*]
+    foreach ld_tag $ld_tags {
+	$ld_tag setAttribute xmlns:[$ld_tag prefix] [$ld_tag namespaceURI]
+    }
+
     # Changing links
     foreach link [$root selectNodes //a] {
 	if { ![catch {set href [$link getAttribute href]}] } {
@@ -222,9 +230,6 @@
 
     set wiki_content [$root asXML]
 
-    # small hack to avoid tDOM to escape the LD tags :(
-    regsub {<ld([^\s]+)} $wiki_content {<ld:\1} content
-
     return $wiki_content    
 }