loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.494.4.3 and 1.494.4.5

version 1.494.4.3, 2010/01/28 18:46:47	version 1.494.4.5, 2010/10/01 14:21:55
Line 243 sub tokeninputfield {	Line 243 sub tokeninputfield {
document.tokeninput.barcode.value='';	document.tokeninput.barcode.value='';
}	}
</script>	</script>
<form method="post" name="tokeninput">	<form method="post" name="tokeninput" action="">
<table border="2" bgcolor="#FFFFBB">	<table border="2" bgcolor="#FFFFBB">
<tr><th>DocID Checkin</th></tr>	<tr><th>DocID Checkin</th></tr>
<tr><td>	<tr><td>
Line 251 sub tokeninputfield {	Line 251 sub tokeninputfield {
<tr>	<tr>
<td>Scan in Barcode</td>	<td>Scan in Barcode</td>
<td><input type="text" size="22" name="barcode"	<td><input type="text" size="22" name="barcode"
onChange="updatetoken()"/></td>	onchange="updatetoken()"/></td>
</tr>	</tr>
<tr><td><i>or</i> Type in DocID</td>	<tr><td><i>or</i> Type in DocID</td>
<td>	<td>
Line 260 onChange="updatetoken()"/></td>	Line 260 onChange="updatetoken()"/></td>
<input type="text" size="5" name="codetwo" />	<input type="text" size="5" name="codetwo" />
<b><font size="+2">*</font></b>	<b><font size="+2">*</font></b>
<input type="text" size="10" name="codethree" value="$defhost"	<input type="text" size="10" name="codethree" value="$defhost"
onChange="this.value=this.value.toUpperCase()" />	onchange="this.value=this.value.toUpperCase()" />
</td></tr>	</td></tr>
</table>	</table>
</td></tr>	</td></tr>
Line 1523 SIMPLECONTENT	Line 1523 SIMPLECONTENT

sub verify_html {	sub verify_html {
my ($filecontents)=@_;	my ($filecontents)=@_;
if ($filecontents!~/(?:\<\|\&lt\;)(?:html\|xml)[^\<]*(?:\>\|\&gt\;)/is) {	my ($is_html,$is_xml);
return &mt('File does not have [_1] or [_2] starting tag','<html>','<xml>');	if ($filecontents =~/(?:\<\|\&lt\;)\?xml[^\<]*\?(?:\>\|\&gt\;)/is) {
}	$is_xml = 1;
if ($filecontents!~/(?:\<\|\&lt\;)\/(?:html\|xml)(?:\>\|\&gt\;)/is) {	} elsif ($filecontents =~/(?:\<\|\&lt\;)html(?:\s+[^\<]+\|\s*)(?:\>\|\&gt\;)/is) {
return &mt('File does not have [_1] or [_2] ending tag','<html>','<xml>');	$is_html = 1;
}	}
if ($filecontents!~/(?:\<\|\&lt\;)(?:body\|frameset)[^\<]*(?:\>\|\&gt\;)/is) {	unless ($is_xml \|\| $is_html) {
return &mt('File does not have [_1] or [_2] starting tag','<body>','<frameset>');	return &mt('File does not have [_1] or [_2] starting tag','<html>','<?xml ?>');
}	}
if ($filecontents!~/(?:\<\|\&lt\;)\/(?:body\|frameset)[^\<]*(?:\>\|\&gt\;)/is) {	if ($is_html) {
return &mt('File does not have [_1] or [_2] ending tag','<body>','<frameset>');	if ($filecontents!~/(?:\<\|\&lt\;)\/html(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] ending tag','<html>');
	}
	if ($filecontents!~/(?:\<\|\&lt\;)(?:body\|frameset)[^\<]*(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] or [_2] starting tag','<body>','<frameset>');
	}
	if ($filecontents!~/(?:\<\|\&lt\;)\/(?:body\|frameset)[^\<]*(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] or [_2] ending tag','<body>','<frameset>');
	}
}	}
return '';	return '';
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.494.4.3
changed lines
	Added in v.1.494.4.5