--- loncom/publisher/lonpublisher.pm	2011/10/22 22:05:23	1.270
+++ loncom/publisher/lonpublisher.pm	2011/11/14 00:20:31	1.277
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.270 2011/10/22 22:05:23 www Exp $
+# $Id: lonpublisher.pm,v 1.277 2011/11/14 00:20:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,10 +66,10 @@ invocation by F<loncapa_apache.conf>:
 
 =head1 OVERVIEW
 
-Authors can only write-access the C</~authorname/> space. They can
-copy resources into the resource area through the publication step,
-and move them back through a recover step. Authors do not have direct
-write-access to their resource space.
+Authors can only write-access the C</priv/domain/authorname/> space. 
+They can copy resources into the resource area through the 
+publication step, and move them back through a recover step. 
+Authors do not have direct write-access to their resource space.
 
 During the publication step, several events will be
 triggered. Metadata is gathered, where a wizard manages default
@@ -266,9 +266,9 @@ sub metaread {
     my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<div><b>'
-              .&mt('No file: [_1]'
-                  ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
+        return '<p class="LC_warning">'
+              .&mt('No file: [_1]',&Apache::loncfile::display($fn))
+              .'</p>';
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
@@ -277,9 +277,9 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<div><b>'
-          .&mt('Processed file: [_1]'
-              ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
+    return '<p class="LC_info">'
+          .&mt('Processed file: [_1]',&Apache::loncfile::display($fn))
+          .'</p>';
 }
 
 #########################################
@@ -1228,7 +1228,7 @@ sub publish {
                     .'</p>'
                     .'<p><input type="submit" value="'
                     .&mt('Finalize Publication')
-                    .'" /> <a href="'.&Apache::loncfile::display($source).'">'.&mt('Cancel').'</a></p>';
+                    .'" /> <a href="'.&Apache::loncfile::url($source).'">'.&mt('Cancel').'</a></p>';
     }
     $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
     $intr_scrout.=
@@ -1766,7 +1766,7 @@ sub phasetwo {
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
         
-        my $thissrc=&Apache::loncfile::display($source);
+        my $thissrc=&Apache::loncfile::url($source);
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
@@ -1852,8 +1852,7 @@ sub batchpublish {
     my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
      
     $r->print('<h2>'
-             .&mt('Publishing [_1]'
-                 ,'<span class="LC_filename">'.&Apache::loncfile::display($srcfile).'</span>')
+             .&mt('Publishing [_1]',&Apache::loncfile::display($srcfile))
              .'</h2>'
     );
 
@@ -1879,15 +1878,15 @@ sub publishdirectory {
     my ($r,$fn,$thisdisfn)=@_;
     $fn=~s/\/+/\//g;
     $thisdisfn=~s/\/+/\//g;
-    my $resdir=
-	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
-	$thisdisfn;
+    my $thisdisresdir=$thisdisfn;
+    $thisdisresdir=~s/^\/priv\//\/res\//;
+    my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
     $r->print(&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Directory'))
             .'<span class="LC_filename">'.$thisdisfn.'</span>'
             .&Apache::lonhtmlcommon::row_closure()
             .&Apache::lonhtmlcommon::row_title(&mt('Target'))
-            .'<span class="LC_filename">'.$resdir.'</span>'
+            .'<span class="LC_filename">'.$thisdisresdir.'</span>'
     );
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
@@ -1926,7 +1925,7 @@ sub publishdirectory {
 	    if ($filename=~/\.(\w+)$/) { $extension=$1; }
 	    if ($cmode&$dirptr) {
 		if (($filename!~/^\./) && ($env{'form.pubrec'})) {
-		    &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+		    &publishdirectory($r,$docroot.$fn.'/'.$filename,$thisdisfn.'/'.$filename);
 		}
 	    } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
 		     ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
@@ -2145,7 +2144,7 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Construction Space',
-        'href'  => &Apache::loncommon::authorspace(),
+        'href'  => &Apache::loncommon::authorspace($fn),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Resource Publication',
@@ -2155,10 +2154,11 @@ sub handler {
     my $js='<script type="text/javascript">'.
 	&Apache::loncommon::browser_and_searcher_javascript().
 	'</script>';
+    print STDERR "fn is ||$fn||\n";
     $r->print(&Apache::loncommon::start_page('Resource Publication',$js)
              .&Apache::lonhtmlcommon::breadcrumbs()
              .&Apache::loncommon::head_subbox(
-                  &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
+                  &Apache::loncommon::CSTR_pageheader($docroot.$fn))
     );
 
     my $thisdisfn=&HTML::Entities::encode($fn,'<>&"');
@@ -2168,7 +2168,7 @@ sub handler {
 
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
-	&publishdirectory($r,$fn,$thisdisfn);
+	&publishdirectory($r,$docroot.$fn,$thisdisfn);
 	$r->print('<hr /><a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>');
     } else {
 # ---------------------- Evaluate individual file, and then output information.
@@ -2238,7 +2238,7 @@ ENDDIFF
 	    }
 	    unless ($errorcount) {
 		my ($outstring,$error)=
-		    &publish($docroot.$fn,$thistarget,$thisembstyle);
+		    &publish($docroot.$fn,$docroot.$thistarget,$thisembstyle);
 		$r->print($outstring);
 	    } else {
 		$r->print('<h3 class="LC_error">'.
@@ -2246,7 +2246,7 @@ ENDDIFF
 			  '</h3>');
 	    }
 	} else {
-	    &phasetwo($r,$fn,$thistarget,$thisembstyle,$thisdistarget); 
+	    &phasetwo($r,$docroot.$fn,$docroot.$thistarget,$thisembstyle,$thisdistarget); 
 	}
     }
     $r->print(&Apache::loncommon::end_page());