[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm scripttag.pm

[raeburn]

raeburn		Mon Aug 25 00:20:19 2014 EDT

  Modified files:              
    /loncom/xml	londefdef.pm scripttag.pm 
  Log:
  - Support upload of Camtasia 8 files to the Supplemental Content area.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.453 loncom/xml/londefdef.pm:1.454
--- loncom/xml/londefdef.pm:1.453	Sun Aug 24 23:38:30 2014
+++ loncom/xml/londefdef.pm	Mon Aug 25 00:20:19 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.453 2014/08/24 23:38:30 raeburn Exp $
+# $Id: londefdef.pm,v 1.454 2014/08/25 00:20:19 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1735,7 +1735,7 @@
                         } elsif ($env{'request.course.id'}) {
                             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
                             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                            if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) {
+                            if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) {
                                 my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
                                 if ($cleanhref) {
                                     &Apache::lonxml::extlink($cleanhref);
@@ -4612,7 +4612,7 @@
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     }
     my $cleanhref;
-    if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/docs/\E)(.+/)[^/]+$}) {
+    if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) {
         my $prefix = $1;
         my $relpath = $2;
         my ($hrefpath,$fname);
@@ -4765,7 +4765,8 @@
 
         Output:
         returns an absolute URL constructed from the href provided, and the calling context.
-        (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/).
+        (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or
+        /uploaded/$cdom/$cnum/supplemental/).
 
 =back
 
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.171 loncom/xml/scripttag.pm:1.172
--- loncom/xml/scripttag.pm:1.171	Sun Aug  3 14:20:43 2014
+++ loncom/xml/scripttag.pm	Mon Aug 25 00:20:19 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.171 2014/08/03 14:20:43 raeburn Exp $
+# $Id: scripttag.pm,v 1.172 2014/08/25 00:20:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,7 @@
                   }
               }
           } elsif (($type eq 'text/javascript') && ($bodytext ne '')) {
-              if ($url =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E}) {
+              if ($url =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) {
                   if ($bodytext =~ m{\.addMediaSrc\((["'])((?!\1).)+\1\);}) {
                       my $quote = $1;
                       if ($bodytext =~ m{\Q.addMediaSrc($quote\E([^$quote]+)\Q$quote)\E}) {