[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm

[raeburn]

raeburn		Wed Jul 30 04:52:45 2025 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  - Reinstate ability to publish default.meta following changes for bug #1320
    in 1.268 and 1.270. Use loncfile::url() instead of loncfile::display()
    to format a URL.
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.307 loncom/publisher/lonpublisher.pm:1.308
--- loncom/publisher/lonpublisher.pm:1.307	Sat Jan  4 21:23:33 2025
+++ loncom/publisher/lonpublisher.pm	Wed Jul 30 04:52:45 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.307 2025/01/04 21:23:33 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.308 2025/07/30 04:52:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2487,7 +2487,7 @@
        return HTTP_NOT_FOUND;
     }
     my $target=$fn;
-    $target=~s/^\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/priv\//\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/res\//;
+    $target=~s{^\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E/priv/}{$Apache::lonnet::perlvar{'lonDocRoot'}/res/};
 
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -2530,7 +2530,7 @@
 	$r->print($reply.'</p><br />');$r->rflush;
     }
 # ------------------------------------------------------------------- Link back
-    $r->print("<a href='".&Apache::loncfile::display($fn)."'>".&mt('Back to Metadata').'</a>');
+    $r->print('<a href="'.&Apache::loncfile::url($fn).'">'.&mt('Back to Metadata').'</a>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -2609,7 +2609,7 @@
 
 # special publication: default.meta file
     if ($fn=~/\/default.meta$/) {
-	return &defaultmetapublish($r,$fn,$cuname,$cudom); 
+	return &defaultmetapublish($r,$docroot.$fn,$cuname,$cudom); 
     }
     $fn=~s/\.meta$//;