--- loncom/publisher/testbankimport.pm	2006/04/06 19:31:03	1.8
+++ loncom/publisher/testbankimport.pm	2008/04/17 15:58:45	1.13
@@ -1,5 +1,5 @@
 # Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.8 2006/04/06 19:31:03 albertel Exp $
+# $Id: testbankimport.pm,v 1.13 2008/04/17 15:58:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use HTML::Entities();
 use Apache::lonlocal;
 use Apache::lonupload;
 use File::Basename();
+use LONCAPA();
 
 # ---------------------------------------------------------------- Display Control
 sub display_control {
@@ -348,10 +349,16 @@ sub jscript_three {
         $source = $env{'form.go'};
     }
 
+    my %body_layout = ('rightmargin'  => "0",
+		       'leftmargin'   => "0",
+		       'marginwidth'  => "0",
+		       'topmargin'    => "0",
+		       'marginheight' => "0");
+
     my $start_page = 
-	&Apache::loncommon::start_page('Create IMS import directory',undef,
+	&Apache::loncommon::start_page('Create Testbank directory',undef,
 				       {'only_body'   => 1,
-					'add_entries' => "topmargin='0' leftmargin='0' marginheight='0'marginwidth='0' rightmargin='0'",
+					'add_entries' => \%body_layout,
 					'js_ready'    => 1,});
     my $end_page = 
 	&Apache::loncommon::end_page({'js_ready' => 1,});
@@ -386,7 +393,7 @@ function createWin() {
     newWindow.document.write("<td><h3>Location: <tt>$fullpath</tt></h3><h3>New Directory</h3></td></tr>\\n")
     newWindow.document.write("<tr><td width='2'>&nbsp;</td><td width='3'>&nbsp;</td>\\n")
     newWindow.document.write("<td><form name='fileaction' action='/adm/cfile' method='post'>\\n")
-    newWindow.document.write("<font face='arial,helvetica,sans-serif'>Enter the name of the new directory where you will store the converted testbank questions<br /><br />")
+    newWindow.document.write("<font face='arial,helvetica,sans-serif'>Enter the name of the new directory where you will save the converted testbank questions<br /><br />")
     newWindow.document.write("<input type='hidden' name='filename' value='$fullpath'>")   
     newWindow.document.write("<input type='hidden' name='action' value='newdir'>")
     newWindow.document.write("<input type='hidden' name='callingmode' value='testbank'>")
@@ -463,7 +470,7 @@ Five steps are involved in the import pr
     $r->print(qq|</li>
          <li>Provide information about the question format - i.e.,  question numbering style, and the number of blocks of questions of each question type.</li>
          <li>Provide information about the questions in each block, including question type, start and end question numbers for each block, and foil labelling style and answer format where required.</li>
-         <li>Create a new directory where you will store the converted testbank questions.</li> 
+         <li>Create a new directory where you will save the converted testbank questions.</li> 
          <li>Complete the import of questions to the selected pool.</li>
         </ol>
         </font>
@@ -1023,7 +1030,7 @@ END_OF_ONE
        <td width='30' align='top'><img src='/res/adm/pages/bl_step4.gif'>
        </td>
        <td width='100%' align='left'>&nbsp;&nbsp;
-        <font size='+1' face='arial,helvetica,sans-serif'><b>Create a directory to store your testbank questions.</b></font>
+        <font size='+1' face='arial,helvetica,sans-serif'><b>Create a directory to save your testbank questions.</b></font>
        </td>
       </tr>
       <tr>
@@ -1033,7 +1040,7 @@ END_OF_ONE
        <td>&nbsp;</td>
        <td>
         <font face='Arial,Helvetica,sans-serif'>
-Please choose a destination LON-CAPA directory in which to store your uploaded questions.&nbsp;&nbsp;
+Please choose a destination LON-CAPA directory in which to save your uploaded questions.&nbsp;&nbsp;
        <input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()"><input type="hidden" name="newdir" value=""></font></td>
       </tr>
       <tr>
@@ -1659,7 +1666,9 @@ sub create_ess {
    <textfield></textfield>
    </essayresponse>
    <postanswerdate>
+    <startouttext />
    $answertxt
+    <endouttext />
    </postanswerdate>
   </problem>|;
     } elsif ($qtype eq "TF") {
@@ -1705,7 +1714,6 @@ sub handler {
     my $javascript = '';
     my $page_name = '';
     my $current_page = '';
-    my $loadentries = '';
     my $qcount = '';
 #
 # phase two: re-attach user
@@ -1731,7 +1739,7 @@ sub handler {
         $fn=$env{'form.filename'};
         $fn=~s/^http\:\/\/[^\/]+\///;
         $fn=~s/^\///;
-        $fn=~s/(\~|priv\/)(\w+)//;
+        $fn=~s{(~|priv/)($LONCAPA::username_re)}{};
         $fn=~s/\/+/\//g;
     } else {
         $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
@@ -1747,7 +1755,6 @@ sub handler {
     my $dirpath = '/home/'.$uname.'/public_html';
 
     my @text = ();
-    my $loadentries = '';
     if ($env{'form.phase'} eq 'three') {    
         if (-e "$dirpath$fn") {
             open(TESTBANK,"<$dirpath$fn");
@@ -1762,20 +1769,21 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
+    my %loadentries;
     if ($env{'form.phase'} eq 'three') {
         $current_page = &display_control();
         my @PAGES = ('Welcome','Blocks','Format','Target','Confirmation');
         $page_name = $PAGES[$current_page];
 
         if ($page_name eq 'Blocks') {
-            $loadentries = 'onLoad= "setElements()"';
+	    $loadentries{'onload'} = "setElements()";
             &jscript_one(\$javascript);
         } elsif ($page_name eq 'Format') { 
             $qcount = question_count($env{'form.qnumformat'},\@text);
  	    &jscript_two(\$javascript,$qcount);
          } elsif ($page_name eq 'Target') {
              if ($env{'form.go'} eq "PreviousPage") {
-                 $loadentries =  'onLoad = "setElements()"';
+                 $loadentries{'onload'} = "setElements()";
  	     }
 	     &jscript_three($fullpath,\$javascript);
         } elsif ($page_name eq 'Confirmation') {
@@ -1788,7 +1796,7 @@ sub handler {
 
     $r->print(&Apache::loncommon::start_page('Upload testbank questions to Construction Space',
 					     $javascript,
-					     {'add_entries' => $loadentries}));
+					     {'add_entries' => \%loadentries}));
 
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
         $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.