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

[raeburn]

raeburn		Fri Aug  1 14:02:11 2025 EDT

  Modified files:              
    /loncom/publisher	lonpubdisplay.pm 
  Log:
  - Include changes in lonpublisher.pm between rev. 1.307 and rev. 1.308.
  
  
Index: loncom/publisher/lonpubdisplay.pm
diff -u loncom/publisher/lonpubdisplay.pm:1.1 loncom/publisher/lonpubdisplay.pm:1.2
--- loncom/publisher/lonpubdisplay.pm:1.1	Thu Jul 31 15:15:36 2025
+++ loncom/publisher/lonpubdisplay.pm	Fri Aug  1 14:02:11 2025
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpubdisplay.pm,v 1.1 2025/07/31 15:15:36 raeburn Exp $
+# $Id: lonpubdisplay.pm,v 1.2 2025/08/01 14:02:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -206,7 +206,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');
@@ -252,7 +252,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;
 }
@@ -305,7 +305,7 @@
 
 # special publication: default.meta file
     if ($fn=~/\/default.meta$/) {
-        return &defaultmetapublish($r,$fn,$cuname,$cudom);
+        return &defaultmetapublish($r,$docroot.$fn,$cuname,$cudom);
     }
 
 # set values for cuname and cudom globals in Apache::lonpublisher