[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth lonuploadedacc.pm /homework lonhomework.pm

www lon-capa-cvs@mail.lon-capa.org
Mon, 12 May 2003 21:22:57 -0000


www		Mon May 12 17:22:57 2003 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/auth	lonuploadedacc.pm 
    /loncom/homework	lonhomework.pm 
  Log:
  Toward DOCS-problems ... still a long ways to go, but hopefully this does not
  damage anything.
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.47 loncom/loncapa_apache.conf:1.48
--- loncom/loncapa_apache.conf:1.47	Tue Apr 29 18:00:31 2003
+++ loncom/loncapa_apache.conf	Mon May 12 17:22:57 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.47 2003/04/29 22:00:31 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.48 2003/05/12 21:22:57 www Exp $
 ##
 
 #
@@ -191,12 +191,12 @@
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(xml|html|htm|xhtml|xhtm)$">
+<LocationMatch "^/(res|public|uploaded|\~).*\.(xml|html|htm|xhtml|xhtm)$">
 SetHandler perl-script
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/(res|public|uploaded|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
Index: loncom/auth/lonuploadedacc.pm
diff -u loncom/auth/lonuploadedacc.pm:1.7 loncom/auth/lonuploadedacc.pm:1.8
--- loncom/auth/lonuploadedacc.pm:1.7	Wed Dec  4 10:23:39 2002
+++ loncom/auth/lonuploadedacc.pm	Mon May 12 17:22:57 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User Files
 #
-# $Id: lonuploadedacc.pm,v 1.7 2002/12/04 15:23:39 www Exp $
+# $Id: lonuploadedacc.pm,v 1.8 2003/05/12 21:22:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,6 +57,7 @@
                  $udom.'/'.$uname.'/'.$ufile.':'.$ENV{'form.token'},
 				     $remoteserver);
     if ($reply eq 'ok') {
+       $ENV{'request.state'}='uploaded';
        return OK;
    } else {
        &Apache::lonnet::logthis(
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.123 loncom/homework/lonhomework.pm:1.124
--- loncom/homework/lonhomework.pm:1.123	Fri May  9 18:24:05 2003
+++ loncom/homework/lonhomework.pm	Mon May 12 17:22:57 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.123 2003/05/09 22:24:05 albertel Exp $
+# $Id: lonhomework.pm,v 1.124 2003/05/12 21:22:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,8 @@
 }
 
 sub get_target {
-  if ( $ENV{'request.state'} eq "published") {
+  if (($ENV{'request.state'} eq "published") ||
+      ($ENV{'request.state'} eq "uploaded")) {
     if ( defined($ENV{'form.grade_target'}  ) 
 	 && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});