[LON-CAPA-cvs] cvs: loncom /interface londocs.pm /lonnet/perl lonnet.pm

[raeburn]

raeburn		Sun Jul 24 22:35:32 2005 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Can opt to parse HTML files uploaded to Supplemental DOCS for embedded multimedia objects, and also prompt for upload of the relevant files. 
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.195 loncom/interface/londocs.pm:1.196
--- loncom/interface/londocs.pm:1.195	Sun Jul 24 20:50:00 2005
+++ loncom/interface/londocs.pm	Sun Jul 24 22:35:29 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.195 2005/07/25 00:50:00 raeburn Exp $
+# $Id: londocs.pm,v 1.196 2005/07/25 02:35:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2663,7 +2663,15 @@
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
-<br />$lt{'comment'}:<br />
+<br />
+<br />
+<nobr>
+<label>$lt{'parse'}?
+<input type="checkbox" name="parserflag" />
+</label>
+</nobr>
+<br /><br />
+$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <br />
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.645 loncom/lonnet/perl/lonnet.pm:1.646
--- loncom/lonnet/perl/lonnet.pm:1.645	Wed Jul 13 16:30:20 2005
+++ loncom/lonnet/perl/lonnet.pm	Sun Jul 24 22:35:29 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.645 2005/07/13 20:30:20 raeburn Exp $
+# $Id: lonnet.pm,v 1.646 2005/07/25 02:35:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1302,7 +1302,7 @@
     if ($coursedoc) {
 	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
 	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-        if ($env{'form.folder'} =~ m/^default/) {
+        if ($env{'form.folder'} =~ m/^(default|supplemental)/) {
             return &finishuserfileupload($docuname,$docudom,
 					 $formname,$fname,$parser,$allfiles,
 					 $codebase);