loncom/homework/cleanxml/xml_to_loncapa.pm - diff

Return to xml_to_loncapa.pm CVS log

Up to [LON-CAPA] / loncom / homework / cleanxml

version 1.5, 2016/01/06 16:44:32	version 1.7, 2016/01/20 00:41:31
Line 81 sub node_to_string {	Line 81 sub node_to_string {
if (defined $parent->parentNode) {	if (defined $parent->parentNode) {
$grandparent_name = $parent->parentNode->nodeName;	$grandparent_name = $parent->parentNode->nodeName;
}	}
my @no_escape = ('m', 'script', 'display', 'parse', 'answer');	my @no_escape = ('m', 'script', 'style', 'display', 'parse', 'answer');
if (string_in_array(\@no_escape, $parent_name) &&	if (string_in_array(\@no_escape, $parent_name) &&
($parent_name ne 'answer' \|\|	($parent_name ne 'answer' \|\|
(defined $grandparent_name &&	(defined $grandparent_name &&
Line 255 sub add_endouttext {	Line 255 sub add_endouttext {
} else {	} else {
$parent->appendChild($endouttext);	$parent->appendChild($endouttext);
}	}
	# replace spaces afterwards by a \n + indentation
	my $next = $endouttext->nextSibling;
	if (defined $next && $next->nodeType == XML_TEXT_NODE) {
	my $v = $next->nodeValue;
	if ($v =~ /^ /) {
	$v =~ s/^ +//;
	if ($parent->firstChild->nodeType == XML_TEXT_NODE &&
	$parent->firstChild->nodeValue =~ /^\n +$/) {
	$v = $parent->firstChild->nodeValue.$v;
	} else {
	$v = "\n".$v;
	}
	$next->setData($v);
	}
	}
}	}

# Convert paragraph children when one contains an inline response into content + <br>	# Convert paragraph children when one contains an inline response into content + <br>