--- loncom/homework/bridgetask.pm 2006/05/16 06:43:42 1.151 +++ loncom/homework/bridgetask.pm 2006/06/09 23:09:01 1.164 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.151 2006/05/16 06:43:42 albertel Exp $ +# $Id: bridgetask.pm,v 1.164 2006/06/09 23:09:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,9 +38,12 @@ use Apache::lonlocal; use Apache::lonxml; use Apache::slotrequest(); use Time::HiRes qw( gettimeofday tv_interval ); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + BEGIN { - &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); } sub initialize_bridgetask { @@ -95,7 +98,7 @@ sub create_new_version { my $version= $Apache::lonhomework::history{'resource.0.version'}; $version++; - + &Apache::lonxml::debug("Making version $version"); #clean out all current results foreach my $key (keys(%Apache::lonhomework::history)) { if ($key=~/^resource\.0\./) { @@ -108,6 +111,9 @@ sub create_new_version { if (defined($user) && defined($domain)) { $Apache::lonhomework::results{"resource.$version.0.checkedin"}= $user.':'.$domain; + } else { + $Apache::lonhomework::results{"resource.$version.0.checkedin"}= + $env{'user.name'}.':'.$env{'user.domain'}; } if (defined($slot_name)) { $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= @@ -260,7 +266,7 @@ STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } - $symb=&Apache::lonnet::escape($symb); + $symb=&escape($symb); $result.='