[LON-CAPA-cvs] cvs: rat / lonuserstate.pm

[raeburn]

raeburn		Mon Apr  5 14:25:08 2004 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  Do not prepend /adm/wrapper if URI for uploaded item is for a page.  
  This allows "non-res" pages to be uploaded via DOCS, e.g., pages created from processing of an IMS package.
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.71 rat/lonuserstate.pm:1.72
--- rat/lonuserstate.pm:1.71	Sun Feb  1 19:46:51 2004
+++ rat/lonuserstate.pm	Mon Apr  5 14:25:08 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.71 2004/02/02 00:46:51 www Exp $
+# $Id: lonuserstate.pm,v 1.72 2004/04/05 18:25:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,7 +159,9 @@
                         } elsif ($turi=~/^\/*uploaded\//) { # uploaded
 			    if (($embstyle eq 'img') || ($embstyle eq 'emb')
                              || ($embstyle eq 'ssi')) {
-                                $turi='/adm/wrapper'.$turi;
+                                unless ($turi =~/\.page$/) {
+                                    $turi='/adm/wrapper'.$turi;
+                                }
                             } elsif ($turi!~/\.(sequence|page)$/) {
 				$turi='/adm/coursedocs/showdoc'.$turi;
                             }