--- loncom/publisher/testbankimport.pm	2011/01/31 17:49:13	1.29
+++ loncom/publisher/testbankimport.pm	2011/10/31 01:25:32	1.32
@@ -1,5 +1,5 @@
 # Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.29 2011/01/31 17:49:13 raeburn Exp $
+# $Id: testbankimport.pm,v 1.32 2011/10/31 01:25:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1330,7 +1330,11 @@ sub create_mcq {
     my $numfoils = scalar(@{$qstnref}) - 1; 
     my $datestamp = localtime;
     my $numansrs = scalar(@{$answerref});
-    my $output = '<problem>
+    my $output = '<problem>';
+    if ($qtype eq 'MC') {
+        $output .= "\n".'<parameter name="maxtries" type="int_pos" default="2" description="Maximum Number of Tries" />';
+    }
+    $output .= '
  <startouttext />';
     if ($res eq 'application/rtf' || $res eq 'text/html') {
         if ($header ne '') {
@@ -1823,9 +1827,8 @@ sub handler {
             $env{'form.filename'};
     }
     ($uname,$udom)=
-        &Apache::loncacc::constructaccess($env{'form.filename'},
-                                          $r->dir_config('lonDefDomain'));
-    unless (($uname) && ($udom)) {
+        &Apache::loncacc::constructaccess($env{'form.filename'});
+    unless (($uname ne '') && ($udom ne '')) {
         $r->log_reason($uname.':'.$udom.' trying to convert testbank file '.
                        $env{'form.filename'}.' - not authorized',$r->filename);
         return HTTP_NOT_ACCEPTABLE;
@@ -1849,9 +1852,8 @@ sub handler {
     $r->send_http_header;
 
     my ($filename,$pathname) = &File::Basename::fileparse($fn);
-    my $webpath = '/priv/'.$uname.$pathname;
-    my $urlpath = '/~'.$uname.$pathname;
-    my $dirpath = '/home/'.$uname.'/public_html'.$pathname;
+    my $webpath = '/priv/'.$udom.'/'.$uname.$pathname;
+    my $dirpath = $r->dir_config('lonDocRoot').$webpath;
     my ($res,$subdir,$badfile,$textref,$header,$css,$js,%loadentries,@pages,%names);
 
     if ($env{'form.phase'} eq 'three') {
@@ -1873,7 +1875,7 @@ sub handler {
             }
         }
         ($res,$badfile,$textref,$header,$css,$js) = 
-            &parse_datafile($r,$uname,$filename,$pathname,$dirpath,$urlpath,
+            &parse_datafile($r,$uname,$filename,$pathname,$dirpath,$webpath,
                             $page_name,$subdir,$env{'form.timestamp'});
         if ($page_name eq 'Welcome') {
              &jscript_zero($webpath,\$javascript);
@@ -1935,7 +1937,7 @@ sub handler {
             &display_zero ($r,$uname,$fn,$current_page,$webpath) if $page_name eq 'Welcome';
             &display_one ($r,$uname,$fn,$current_page,$textref,$header) if $page_name eq 'Blocks';
             &display_two ($r,$uname,$fn,$current_page,$textref,$header,$qcount) if $page_name eq 'Format';
-            &display_three ($r,$uname,$fn,$current_page,$textref,$res,$header,$urlpath,$qcount) if $page_name eq 'Target';
+            &display_three ($r,$uname,$fn,$current_page,$textref,$res,$header,$webpath,$qcount) if $page_name eq 'Target';
             &final_display ($r,$uname,$fn,$current_page,$textref,$res,$header,$css,$js,$webpath,$dirpath,$subdir) if $page_name eq 'Confirmation';
         }
     } elsif ($env{'form.phase'} eq 'two') {