--- loncom/xml/lonxml.pm 2007/04/16 18:47:46 1.444 +++ loncom/xml/lonxml.pm 2007/05/31 04:15:59 1.447 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.444 2007/04/16 18:47:46 albertel Exp $ +# $Id: lonxml.pm,v 1.447 2007/05/31 04:15:59 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -599,9 +599,9 @@ sub callsub { } } if ($token->[0] eq 'S') { - $currentstring.=&Apache::edit::handle_insert(); + $currentstring.=&Apache::edit::handle_insert(); } elsif ($token->[0] eq 'E') { - $currentstring.=&Apache::edit::handle_insertafter($token->[1]); + $currentstring.=&Apache::edit::handle_insertafter($token->[1]); } } } @@ -997,6 +997,24 @@ sub get_all_text_unbalanced { return $result } +=pod + +For bubble grading mode and exam bubble printing mode, the tracking of +the current 'bubble line number' is stored in the %env element +'form.counter', and is modifed and handled by the following routines. + +The value of it is stored in $Apache:lonxml::counter when live and +stored back to env after done. + +=item &increment_counter($increment); + +Increments the internal counter environment variable a specified amount + +Optional Arguments: + $increment - amount to increment by (defaults to 1) + +=cut + sub increment_counter { my ($increment) = @_; if (defined($increment) && $increment gt 0) { @@ -1007,6 +1025,14 @@ sub increment_counter { $Apache::lonxml::counter_changed=1; } +=pod + +=item &init_counter($increment); + +Initialize the internal counter environment variable + +=cut + sub init_counter { if ($env{'request.state'} eq 'construct') { $Apache::lonxml::counter=1; @@ -1744,10 +1770,12 @@ sub register_insert_xml { # parse the allows and ignore tags set to no foreach my $tag (@alltags) { + next if (!exists($insertlist{"$tag.allow"})); my $allow = $insertlist{"$tag.allow"}; foreach my $element (split(',',$allow)) { $element =~ s/(^\s*|\s*$ )//gx; - if ($insertlist{"$element.show"} ne 'no') { + if (!exists($insertlist{"$element.show"}) + || $insertlist{"$element.show"} ne 'no') { push(@{ $insertlist{$tag.'.which'} },$element); } }