--- loncom/publisher/loncfile.pm	2011/11/02 19:12:40	1.113
+++ loncom/publisher/loncfile.pm	2012/10/29 17:38:55	1.116
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.113 2011/11/02 19:12:40 raeburn Exp $
+# $Id: loncfile.pm,v 1.116 2012/10/29 17:38:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,6 @@ use File::Basename;
 use File::Copy;
 use HTML::Entities();
 use Apache::Constants qw(:common :http :methods);
-use Apache::loncacc;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
@@ -206,12 +205,13 @@ sub obsolete_unpub {
 # see if directory is empty
 # ignores any .meta, .save, .bak, and .log files created for a previously
 # published file, which has since been marked obsolete and deleted.
+# ignores a .DS_Store file put there when viewing directory via webDAV on MacOS. 
 sub empty_directory {
     my ($dirname,$phase) = @_;
     if (opendir DIR, $dirname) {
         my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..
         if (@files) { 
-            my @orphans = grep(/\.(meta|save|log|bak)$/,@files);
+            my @orphans = grep(/\.(meta|save|log|bak|DS_Store)$/,@files);
             if (scalar(@files) - scalar(@orphans) > 0) { 
                 return 0;
             } else {
@@ -408,7 +408,7 @@ sub relativeDest {
     while ($newfilename=~m{/\.\./}) {
 	$newfilename=~ s{/[^/]+/\.\./}{/}g; #remove dir/..
     }
-    my ($authorname,$authordom)=&Apache::loncacc::constructaccess($newfilename);
+    my ($authorname,$authordom)=&Apache::lonnet::constructaccess($newfilename);
     unless (($authorname) && ($authordom)) {
        my $otherdir = &display($newfilename);
        $error = &mt('Access denied to [_1]',$otherdir);
@@ -1441,7 +1441,7 @@ sub handler {
 
 # ----------------------------------------------------------- Start page output
 
-    my ($uname,$udom) = &Apache::loncacc::constructaccess($fn);
+    my ($uname,$udom) = &Apache::lonnet::constructaccess($fn);
     &Debug($r, 
 	   "loncfile::handler constructaccess uname = $uname domain = $udom");
     if (($uname eq '') || ($udom eq '')) {
@@ -1480,7 +1480,7 @@ function writeDone() {
     &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'  => 'File Operation',