--- loncom/homework/bridgetask.pm	2006/05/25 20:08:18	1.157
+++ loncom/homework/bridgetask.pm	2006/05/30 12:45:36	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.157 2006/05/25 20:08:18 albertel Exp $
+# $Id: bridgetask.pm,v 1.158 2006/05/30 12:45:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,9 @@ 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'));
@@ -263,7 +266,7 @@ STUFF
     }
     
     if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
-    $symb=&Apache::lonnet::escape($symb);
+    $symb=&escape($symb);
     $result.='<form method="post" action="/adm/slotrequest">'.
 	'<input type="hidden" name="symb" value="'.$symb.'" />'.
 	'<input type="hidden" name="command" value="'.$action.'" />'.
@@ -574,7 +577,7 @@ DONESCREEN
 		&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
 	    $form_tag_start.=
 		'<input type="hidden" name="gradingkey" value="'.
-		&Apache::lonnet::escape($todo).'" />';
+		&escape($todo).'" />';
 	    $Apache::bridgetask::queue_key=$todo;
 	    &Apache::structuretags::initialize_storage();
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
@@ -705,7 +708,7 @@ sub get_key_todo {
 	my $who=&queue_key_locked($queue,$gradingkey);
 	if ($who eq $me) {
 	    #already have the lock
-	    $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
+	    $env{'form.gradingkey'}=&escape($gradingkey);
 	    return ($gradingkey);
 	}
 	
@@ -730,7 +733,7 @@ sub get_key_todo {
 	$env{'form.queue'}=$queue='gradingqueue';
     }
 
-    my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+    my $gradingkey=&unescape($env{'form.gradingkey'});
 
     if ($env{'form.queue'} eq 'none') {
 	if (defined($env{'form.gradingkey'})) {
@@ -1292,7 +1295,7 @@ sub show_queue {
 		$slot_text = '';
 	    }
 	    if ($with_selects) {
-		my $ekey=&Apache::lonnet::escape($key);
+		my $ekey=&escape($key);
 		my ($action,$description,$status)=('select',&mt('Select'));
 		if (exists($queue{"$key\0locked"})) {
 		    my $me=$env{'user.name'}.':'.$env{'user.domain'};
@@ -1491,7 +1494,7 @@ sub pick_from_queue_data {
 
 sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;
-    my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
+    my $todo=&unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.':'.$env{'user.domain'};
     if ($todo) {
 	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
@@ -1663,7 +1666,7 @@ sub select_user {
 	    }
 	}
 	my $todo = 
-	    &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
+	    &escape(&encode_queue_key($symb,$udom,$uname));
 	if ($cannot_grade) {
 	    $result.='<tr><td>&nbsp;</td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
 		'</td><td>';