--- loncom/publisher/testbankimport.pm	2006/04/10 22:30:31	1.10
+++ 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.10 2006/04/10 22:30:31 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 {
@@ -392,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'>")
@@ -469,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>
@@ -1029,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>
@@ -1039,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>
@@ -1665,7 +1666,9 @@ sub create_ess {
    <textfield></textfield>
    </essayresponse>
    <postanswerdate>
+    <startouttext />
    $answertxt
+    <endouttext />
    </postanswerdate>
   </problem>|;
     } elsif ($qtype eq "TF") {
@@ -1736,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'}.