loncom/homework/edit.pm - diff

Return to edit.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/edit.pm between versions 1.62 and 1.63

version 1.62, 2003/09/08 21:17:54	version 1.63, 2003/09/08 21:22:15
Line 45 $Apache::edit::bgimgsrc='';	Line 45 $Apache::edit::bgimgsrc='';
$Apache::edit::bgimgsrccurdepth='';	$Apache::edit::bgimgsrccurdepth='';

sub initialize_edit {	sub initialize_edit {
$Apache::edit::colordepth=0;	$Apache::edit::colordepth=0;
@Apache::edit::inserttag=();	@Apache::edit::inserttag=();
}	}

sub tag_start {	sub tag_start {
my ($target,$token,$description) = @_;	my ($target,$token,$description) = @_;
my $result='';	my $result='';
if ($target eq "edit") {	if ($target eq "edit") {
my $tag=$token->[1];	my $tag=$token->[1];
if (!$description) {	if (!$description) {
$description=&Apache::lonxml::description($token);	$description=&Apache::lonxml::description($token);
if (!$description) { $description="<$tag>"; }	if (!$description) { $description="<$tag>"; }
}	}
$result.= &start_table($token)."<tr><td>$description</td>	$result.= &start_table($token)."<tr><td>$description</td>
<td>Delete".	<td>Delete".
&deletelist($target,$token)	&deletelist($target,$token)
."</td>	."</td>
<td>".	<td>".
&insertlist($target,$token);	&insertlist($target,$token);
#<td>".	#<td>".
# &movebuttons($target,$token).	# &movebuttons($target,$token).
# "</tr><tr><td colspan=\"3\">\n";	# "</tr><tr><td colspan=\"3\">\n";
my @help;# = Apache::lonxml::helpinfo($token);	my @help;# = Apache::lonxml::helpinfo($token);
if ($help[0]) {	if ($help[0]) {
$result .= '<td align="right" valign="top">' .	$result .= '<td align="right" valign="top">' .
Apache::loncommon::help_open_topic(@help) .	Apache::loncommon::help_open_topic(@help) .
'</td>';	'</td>';
} else { $result .= "<td> </td>"; }	} else { $result .= "<td> </td>"; }
$result .= &end_row().&start_spanning_row();	$result .= &end_row().&start_spanning_row();
}	}
return $result;	return $result;
}	}

sub tag_end {	sub tag_end {
my ($target,$token,$description) = @_;	my ($target,$token,$description) = @_;
my $result='';	my $result='';
if ($target eq 'edit') {	if ($target eq 'edit') {
$result.="</td></tr>".&end_table()."\n";	$result.="</td></tr>".&end_table()."\n";
}	}
return $result;	return $result;
}	}

sub start_table {	sub start_table {
my ($token)=@_;	my ($token)=@_;
my $tag = $token->[1];	my $tag = $token->[1];
my $tagnum;	my $tagnum;
foreach my $namespace (reverse @Apache::lonxml::namespace) {	foreach my $namespace (reverse @Apache::lonxml::namespace) {
my $testtag=$namespace.'::'.$tag;	my $testtag=$namespace.'::'.$tag;
$tagnum=$Apache::lonxml::insertlist{"$testtag.num"};	$tagnum=$Apache::lonxml::insertlist{"$testtag.num"};
if (defined($tagnum)) { last; }	if (defined($tagnum)) { last; }
}	}
if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }	if (!defined ($tagnum)) {$tagnum=$Apache::lonxml::insertlist{"$tag.num"};}
my $color = $Apache::lonxml::insertlist{"$tagnum.color"};	my $color = $Apache::lonxml::insertlist{"$tagnum.color"};
if (!defined($color)) {	if (!defined($color)) {
$color = $Apache::edit::colorlist[$Apache::edit::colordepth];	$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
}	}
$Apache::edit::colordepth++;	$Apache::edit::colordepth++;
push(@Apache::edit::inserttag,$token->[1]);	push(@Apache::edit::inserttag,$token->[1]);
my $result='<div align="right">';	my $result='<div align="right">';
$result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';	$result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';
return $result;	return $result;
}	}

sub end_table {	sub end_table {
$Apache::edit::colordepth--;	$Apache::edit::colordepth--;
my $result='</table></div>';	my $result='</table></div>';
$result.="<table><tr><td>";	$result.="<table><tr><td>";

my ($tagname,$closingtag);	my ($tagname,$closingtag);
if (defined($Apache::edit::inserttag[-2])) {	if (defined($Apache::edit::inserttag[-2])) {
$tagname=$Apache::edit::inserttag[-2];	$tagname=$Apache::edit::inserttag[-2];
} else {$tagname='problem';}	} else {$tagname='problem';}
if (defined($Apache::edit::inserttag[-1])) {	if (defined($Apache::edit::inserttag[-1])) {
$closingtag=$Apache::edit::inserttag[-1];	$closingtag=$Apache::edit::inserttag[-1];
}	}
$result.=&innerinsertlist('edit',$tagname,$closingtag).	$result.=&innerinsertlist('edit',$tagname,$closingtag).
"</td></tr></table>";	"</td></tr></table>";
pop(@Apache::edit::inserttag);	pop(@Apache::edit::inserttag);
return $result;	return $result;
}	}

sub start_spanning_row { return '<tr><td colspan="4" bgcolor="#DDDDDD">';}	sub start_spanning_row { return '<tr><td colspan="4" bgcolor="#DDDDDD">';}
Line 131 sub start_row { return '<tr><td	Line 131 sub start_row { return '<tr><td
sub end_row { return '</td></tr>'; }	sub end_row { return '</td></tr>'; }

sub movebuttons {	sub movebuttons {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $result='<input type="submit" name="moveup.'.	my $result='<input type="submit" name="moveup.'.
$Apache::lonxml::curdepth.'" value="Move Up" />';	$Apache::lonxml::curdepth.'" value="Move Up" />';
$result.='<input type="submit" name="movedown.'.	$result.='<input type="submit" name="movedown.'.
$Apache::lonxml::curdepth.'" value="Move Down" />';	$Apache::lonxml::curdepth.'" value="Move Down" />';
return $result;	return $result;
}	}

sub deletelist {	sub deletelist {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">	my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
<option></option>	<option></option>
<option>Yes</option>	<option>Yes</option>
</select>";	</select>";
return $result;	return $result;
}	}

sub handle_delete {	sub handle_delete {
if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }	if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result=0;	my $result=0;
if ($space) {	if ($space) {
my $sub1="$space\:\:delete_$token->[1]";	my $sub1="$space\:\:delete_$token->[1]";
{	{
no strict 'refs';	no strict 'refs';
if (defined &$sub1) {	if (defined &$sub1) {
$result=&$sub1($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);	$result=&$sub1($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
}	}
}	}
}	}
if (!$result) {	if (!$result) {
my $endtag='/'.$token->[1];	my $endtag='/'.$token->[1];
my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);	my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
$$parser['-1']->get_token();	$$parser['-1']->get_token();
&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");	&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
&Apache::lonxml::end_tag($tagstack,$parstack,$token);	&Apache::lonxml::end_tag($tagstack,$parstack,$token);
}	}
return 1;	return 1;
}	}

sub get_insert_list {	sub get_insert_list {
my ($tagname) = @_;	my ($tagname) = @_;
my $result='';	my $result='';
my @tagnums= ();	my @tagnums= ();
#&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));	#&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
if ($Apache::lonxml::insertlist{"$tagname.which"}) {	if ($Apache::lonxml::insertlist{"$tagname.which"}) {
push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} });	push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
}	}
foreach my $namespace (@Apache::lonxml::namespace) {	foreach my $namespace (@Apache::lonxml::namespace) {
if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {	if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {
push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });	push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
}	}
}	}
if (@tagnums) {	if (@tagnums) {
my %options;	my %options;
foreach my $tagnum (@tagnums) {	foreach my $tagnum (@tagnums) {
my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"};	my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"};
$options{$descrip} ="<option value=\"$tagnum\">".$descrip."</option>\n";	$options{$descrip} ="<option value=\"$tagnum\">".
}	$descrip."</option>\n";
foreach my $option (sort(keys(%options))) { $result.=$options{$option}; }	}
if ($result) { $result='<option selected="on"></option>'.$result; }	foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
}	if ($result) { $result='<option selected="on"></option>'.$result; }
return $result;	}
	return $result;
}	}

sub insertlist {	sub insertlist {
my ($target,$token) = @_;	my ($target,$token) = @_;
return &innerinsertlist($target,$token->[1]);	return &innerinsertlist($target,$token->[1]);
}	}

sub innerinsertlist {	sub innerinsertlist {
my ($target,$tagname,$closingtag) = @_;	my ($target,$tagname,$closingtag) = @_;
my $result;	my $result;
my $after='';	my $after='';
if ($closingtag) {	if ($closingtag) {
$after='_after_'.$closingtag;	$after='_after_'.$closingtag;
}	}
if ($target eq 'edit') {	if ($target eq 'edit') {
my $optionlist= &get_insert_list($tagname);	my $optionlist= &get_insert_list($tagname);
if ($optionlist) {	if ($optionlist) {
$result = "Insert:	$result = "Insert:
<select name=\"insert$after\_$Apache::lonxml::curdepth\">	<select name=\"insert$after\_$Apache::lonxml::curdepth\">
$optionlist	$optionlist
</select>"	</select>"
} else {	} else {
$result=" ";	$result=" ";
	}
}	}
}	return $result;
return $result;
}	}

sub handle_insert {	sub handle_insert {
if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }	if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
my $result;	my $result;
my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};	my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};
my $func=$Apache::lonxml::insertlist{"$tagnum.function"};	my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
if ($func eq 'default') {	if ($func eq 'default') {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
my $namespace;	my $namespace;
if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }	if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
$result.="\n<$newtag>\n</$newtag>";	$result.="\n<$newtag>\n</$newtag>";
} else {
if (defined(&$func)) {
{
no strict 'refs';
$result.=&$func();
}
} else {	} else {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};	if (defined(&$func)) {
&Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined.");	{
	no strict 'refs';
	$result.=&$func();
	}
	} else {
	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
	&Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined.");
	}
}	}
}	return $result;
return $result;
}	}

sub handle_insertafter {	sub handle_insertafter {
my $tagname=shift;	my $tagname=shift;
if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')	if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
{ return ''; }	{ return ''; }
my $result;	my $result;
my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};	my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
my $func=$Apache::lonxml::insertlist{"$tagnum.function"};	my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
if ($func eq 'default') {	if ($func eq 'default') {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
my $namespace;	my $namespace;
if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }	if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
$result.="\n<$newtag>\n</$newtag>";	$result.="\n<$newtag>\n</$newtag>";
} else {
if (defined(&$func)) {
{
no strict 'refs';
$result.=&$func();
}
} else {	} else {
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};	if (defined(&$func)) {
&Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");	{
	no strict 'refs';
	$result.=&$func();
	}
	} else {
	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
	&Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");
	}
}	}
}	return $result;
return $result;
}	}

sub insert_responseparam {	sub insert_responseparam {
return '	return '
<responseparam />';	<responseparam />';
}	}

sub insert_formularesponse {	sub insert_formularesponse {
return '	return '
<formularesponse answer="" samples="">	<formularesponse answer="" samples="">
<textline />	<textline />
<hintgroup>	<hintgroup>
Line 287 sub insert_formularesponse {	Line 288 sub insert_formularesponse {
}	}

sub insert_numericalresponse {	sub insert_numericalresponse {
return '	return '
<numericalresponse answer="">	<numericalresponse answer="">
<textline />	<textline />
<hintgroup>	<hintgroup>
Line 296 sub insert_numericalresponse {	Line 297 sub insert_numericalresponse {
}	}

sub insert_stringresponse {	sub insert_stringresponse {
return '	return '
<stringresponse answer="" type="">	<stringresponse answer="" type="">
<textline />	<textline />
<hintgroup>	<hintgroup>
Line 305 sub insert_stringresponse {	Line 306 sub insert_stringresponse {
}	}

sub insert_essayresponse {	sub insert_essayresponse {
return '	return '
<essayresponse>	<essayresponse>
<textfield></textfield>	<textfield></textfield>
</essayresponse>';	</essayresponse>';
}	}

sub insert_imageresponse {	sub insert_imageresponse {
return '	return '
<imageresponse max="1">	<imageresponse max="1">
<foilgroup>	<foilgroup>
</foilgroup>	</foilgroup>
Line 322 sub insert_imageresponse {	Line 323 sub insert_imageresponse {
}	}

sub insert_optionresponse {	sub insert_optionresponse {
return '	return '
<optionresponse max="10">	<optionresponse max="10">
<foilgroup options="">	<foilgroup options="">
</foilgroup>	</foilgroup>
Line 332 sub insert_optionresponse {	Line 333 sub insert_optionresponse {
}	}

sub insert_radiobuttonresponse {	sub insert_radiobuttonresponse {
return '	return '
<radiobuttonresponse max="10">	<radiobuttonresponse max="10">
<foilgroup>	<foilgroup>
</foilgroup>	</foilgroup>
Line 342 sub insert_radiobuttonresponse {	Line 343 sub insert_radiobuttonresponse {
}	}

sub insert_rankresponse {	sub insert_rankresponse {
return '	return '
<rankresponse max="10">	<rankresponse max="10">
<foilgroup options="">	<foilgroup options="">
</foilgroup>	</foilgroup>
Line 352 sub insert_rankresponse {	Line 353 sub insert_rankresponse {
}	}

sub insert_matchresponse {	sub insert_matchresponse {
return '	return '
<matchresponse max="10">	<matchresponse max="10">
<foilgroup options="">	<foilgroup options="">
<itemgroup>	<itemgroup>
Line 366 sub insert_matchresponse {	Line 367 sub insert_matchresponse {
sub insert_displayduedate { return '<displayduedate />'; }	sub insert_displayduedate { return '<displayduedate />'; }
sub insert_displaytitle { return '<displaytitle />'; }	sub insert_displaytitle { return '<displaytitle />'; }
sub insert_hintpart {	sub insert_hintpart {
return '	return '
<hintpart on="default">	<hintpart on="default">
<startouttext/>	<startouttext/>
<endouttext />	<endouttext />
Line 374 sub insert_hintpart {	Line 375 sub insert_hintpart {
}	}

sub insert_numericalhint {	sub insert_numericalhint {
return '	return '
<numericalhint>	<numericalhint>
</numericalhint>';	</numericalhint>';
}	}

sub insert_stringhint {	sub insert_stringhint {
return '	return '
<stringhint>	<stringhint>
</stringhint>';	</stringhint>';
}	}

sub insert_formulahint {	sub insert_formulahint {
return '	return '
<formulahint>	<formulahint>
</formulahint>';	</formulahint>';
}	}

sub insert_radiobuttonhint {	sub insert_radiobuttonhint {
return '	return '
<radiobuttonhint>	<radiobuttonhint>
</radiobuttonhint>';	</radiobuttonhint>';
}	}

sub insert_optionhint {	sub insert_optionhint {
return '	return '
<optionhint>	<optionhint>
</optionhint>';	</optionhint>';
}	}

sub insert_startouttext {	sub insert_startouttext {
return "<startouttext />\n<endouttext />";	return "<startouttext />\n<endouttext />";
}	}

sub insert_script {	sub insert_script {
return "\n<script type=\"loncapa/perl\">\n</script>";	return "\n<script type=\"loncapa/perl\">\n</script>";
}	}

sub textarea_sizes {	sub textarea_sizes {
my ($data)=@_;	my ($data)=@_;
my $count=0;	my $count=0;
my $maxlength=-1;	my $maxlength=-1;
foreach (split ("\n", $$data)) {	foreach (split ("\n", $$data)) {
$count+=int(length($_)/79);	$count+=int(length($_)/79);
$count++;	$count++;
if (length($_) > $maxlength) { $maxlength = length($_); }	if (length($_) > $maxlength) { $maxlength = length($_); }
}	}
my $rows = $count;	my $rows = $count;
my $cols = $maxlength;	my $cols = $maxlength;
return ($rows,$cols);	return ($rows,$cols);
}	}

sub editline {	sub editline {
Line 438 END	Line 439 END
}	}

sub editfield {	sub editfield {
my ($tag,$data,$description,$minwidth,$minheight)=@_;	my ($tag,$data,$description,$minwidth,$minheight)=@_;

my ($rows,$cols)=&textarea_sizes(\$data);	my ($rows,$cols)=&textarea_sizes(\$data);
if ($cols > 80) { $cols = 80; }	if ($cols > 80) { $cols = 80; }
if ($cols < $minwidth ) { $cols = $minwidth; }	if ($cols < $minwidth ) { $cols = $minwidth; }
if ($rows < $minheight) { $rows = $minheight; }	if ($rows < $minheight) { $rows = $minheight; }
if ($description) { $description="<br />".$description."<br />"; }	if ($description) { $description="<br />".$description."<br />"; }
return $description."\n".'   <textarea rows="'.$rows.	return $description."\n".'   <textarea rows="'.$rows.
'" cols="'.$cols.'" name="homework_edit_'.$Apache::lonxml::curdepth.'">'.	'" cols="'.$cols.'" name="homework_edit_'.
&HTML::Entities::encode($data).'</textarea>'."\n";	$Apache::lonxml::curdepth.'">'.
	&HTML::Entities::encode($data).'</textarea>'."\n";
}	}

sub modifiedfield {	sub modifiedfield {
my ($token) = @_;	my ($token) = @_;
my $result;	my $result;
# foreach my $envkey (sort keys %ENV) {	# foreach my $envkey (sort keys %ENV) {
# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");	# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
# }	# }
# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");	# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
# &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});	# &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
$result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};	$result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
return $result;	return $result;
}	}

# Returns a 1 if the token has been modified and you should rebuild the tag	# Returns a 1 if the token has been modified and you should rebuild the tag
Line 468 sub get_new_args {	Line 470 sub get_new_args {
my ($token,$parstack,$safeeval,@args)=@_;	my ($token,$parstack,$safeeval,@args)=@_;
my $rebuild=0;	my $rebuild=0;
foreach my $arg (@args) {	foreach my $arg (@args) {
#just want the string that it was set to	#just want the string that it was set to
my $value=$token->[2]->{$arg};	my $value=$token->[2]->{$arg};
my $element=&html_element_name($arg);	my $element=&html_element_name($arg);
my $newvalue=$ENV{"form.$element"};	my $newvalue=$ENV{"form.$element"};
&Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");	&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:");
if (defined($newvalue) && $value ne $newvalue) {	if (defined($newvalue) && $value ne $newvalue) {
if (ref($newvalue) eq 'ARRAY') {	if (ref($newvalue) eq 'ARRAY') {
$token->[2]->{$arg}=join(',',@$newvalue);	$token->[2]->{$arg}=join(',',@$newvalue);
} else {	} else {
$token->[2]->{$arg}=$newvalue;	$token->[2]->{$arg}=$newvalue;
	}
	$rebuild=1;
}	}
$rebuild=1;
}	}
}	return $rebuild;
return $rebuild;
}	}

# looks for /> on start tags	# looks for /> on start tags
sub rebuild_tag {	sub rebuild_tag {
my ($token) = @_;	my ($token) = @_;
my $result;	my $result;
if ($token->[0] eq 'S') {	if ($token->[0] eq 'S') {
$result = '<'.$token->[1];	$result = '<'.$token->[1];
while (my ($key,$val)= each(%{$token->[2]})) {	while (my ($key,$val)= each(%{$token->[2]})) {
$val=~s:^\s+\|\s+$::g;	$val=~s:^\s+\|\s+$::g;
$val=~s:"::g; #"	$val=~s:"::g; #"
&Apache::lonxml::debug("setting :$key: to :$val:");	&Apache::lonxml::debug("setting :$key: to :$val:");
$result.=' '.$key.'="'.$val.'"';	$result.=' '.$key.'="'.$val.'"';
}	}
if ($token->[4] =~ m:/>$:) {	if ($token->[4] =~ m:/>$:) {
$result.=' />';	$result.=' />';
} else {	} else {
$result.='>';	$result.='>';
	}
	} elsif ( $token->[0] eq 'E' ) {
	$result = '</'.$token->[1].'>';
}	}
} elsif ( $token->[0] eq 'E' ) {	return $result;
$result = '</'.$token->[1].'>';
}
return $result;
}	}

sub html_element_name {	sub html_element_name {
Line 552 sub checked_arg {	Line 554 sub checked_arg {
}	}

sub text_arg {	sub text_arg {
my ($description,$name,$token,$size) = @_;	my ($description,$name,$token,$size) = @_;
my $result;	my $result;
if (!defined $size) { $size=20; }	if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};	my $arg=$token->[2]{$name};
$result=$description.' <input name="'.&html_element_name($name).	$result=$description.' <input name="'.&html_element_name($name).
'" type="text" value="'.$arg.'" size="'.$size.'" />';	'" type="text" value="'.$arg.'" size="'.$size.'" />';
return '<nobr>'.$result.'</nobr>';	return '<nobr>'.$result.'</nobr>';
}	}

sub select_arg {	sub select_arg {

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

Removed from v.1.62
changed lines
	Added in v.1.63