--- loncom/homework/structuretags.pm 2001/05/04 21:21:45 1.36
+++ loncom/homework/structuretags.pm 2001/06/02 03:59:59 1.40
@@ -8,10 +8,11 @@ use Apache::lonnet;
sub BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
}
sub start_web {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
if ($target eq 'web') {
return $bodytext;
@@ -23,7 +24,7 @@ sub end_web {
}
sub start_tex {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
if ($target eq 'tex') {
return $bodytext
@@ -35,7 +36,7 @@ sub end_tex {
}
sub start_problem {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
#intialize globals
$Apache::inputtags::part='0';
@@ -47,7 +48,7 @@ sub start_problem {
my $status;
my $datemsg;
- my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);
+ my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
if ($target eq 'web' || $target eq 'grade') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');
@@ -63,9 +64,7 @@ sub start_problem {
}
}
if ($target eq 'web') {
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
@@ -94,19 +93,23 @@ sub start_problem {
';
- my $temp=&Apache::edit::insertlist($token,$target);
- &Apache::lonxml::debug("edit gave me $temp");
+ my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
return $result;
}
+ if ($target eq 'modified') {
+ $result=$token->[4];
+ $result.=&Apache::edit::handle_insert();
+ return $result;
+ }
return '';
}
sub end_problem {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $status=$Apache::inputtags::status['-1'];
- if ($target eq 'grade' || $target eq'web' ) {
+ if ($target eq 'grade' || $target eq 'web' ) {
if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
$status eq 'CAN_ANSWER') {
# if part is zero, no s existed, so we need to the grading
@@ -126,7 +129,6 @@ sub end_problem {
}
if ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
-
$result=&Apache::response::mandatory_part_meta;
}
}
@@ -138,26 +140,29 @@ sub end_problem {
}
sub start_block {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $code = @$parstack[$#$parstack];
- $code =~ s/\"//g;
- $code .=';return $condition;';
-# print "
$code
";
- my $result = &Apache::run::run($code,$safeeval);
- &Apache::lonxml::debug("block :$code: returned :$result:");
- if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
- &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+ if ($target eq 'web' || $target eq 'grade') {
+ my $code = @$parstack[$#$parstack];
+ $code =~ s/\"//g;
+ $code .=';return $condition;';
+ # print "
$code
";
+ my $result = &Apache::run::run($code,$safeeval);
+ &Apache::lonxml::debug("block :$code: returned :$result:");
+ if ( ! $result ) {
+ my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
+ &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+ }
}
return "";
}
sub end_block {
+ return '';
}
sub start_while {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $code = @$parstack[$#$parstack];
$code =~ s/\"//g;
@@ -174,7 +179,7 @@ sub start_while {
}
sub end_while {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $code = pop @Apache::structuretags::whileconds;
my $bodytext = pop @Apache::structuretags::whilebody;
my $result = &Apache::run::run($code,$safeeval);
@@ -191,7 +196,7 @@ sub end_while {
# ...
#
sub start_randomlist {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
my $b_parser= HTML::TokeParser->new(\$body);
my $b_tok;
@@ -241,15 +246,13 @@ sub end_randomlist {
}
sub start_part {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
$Apache::inputtags::part=$id;
@Apache::inputtags::responselist = ();
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
- } else {
+ } elsif ($target eq 'web' || $target eq 'grade') {
my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
@@ -266,19 +269,22 @@ sub start_part {
}
sub end_part {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
my $status=$Apache::inputtags::status['-1'];
pop @Apache::inputtags::status;
if ( $target eq 'meta' ) { return ''; }
- if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
- return &Apache::inputtags::grade;
+ if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+ return &Apache::inputtags::grade;
}
- return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+ if ($target eq 'web') {
+ return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+ }
+ return '';
}
sub start_preduedate {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
@@ -293,7 +299,7 @@ sub end_preduedate {
}
sub start_postanswerdate {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
&Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
@@ -307,7 +313,7 @@ sub end_postanswerdate {
}
sub start_notsolved {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
&Apache::lonxml::debug("not solved has :$gradestatus:");
@@ -324,7 +330,7 @@ sub end_notsolved {
}
sub start_solved {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
if ($gradestatus !~ /^correct/) {
@@ -339,21 +345,21 @@ sub end_solved {
}
sub start_startouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my @result=(''.'');
if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
return (@result);
}
sub end_startouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $text='';
if ($target eq 'edit') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
$result=
- &Apache::edit::tag_start("outtext").
- &Apache::edit::editfield($token->[1],$text,"Text Block");
+ &Apache::edit::tag_start($target,$token).
+ &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
}
if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -362,14 +368,14 @@ sub end_startouttext {
return $result;
}
sub start_endouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
- if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); }
+ if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
if ($target eq "modified") { $result=''; }
return $result;
}
sub end_endouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my @result=('','');
if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
return (@result);