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

www lon-capa-cvs@mail.lon-capa.org
Fri, 10 Jun 2005 17:51:32 -0000


www		Fri Jun 10 13:51:32 2005 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  "VOOM"?!? Mate, this bird wouldn't "voom" if you put four million volts through it! 'E's bleedin' demised!
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.186 loncom/interface/londocs.pm:1.187
--- loncom/interface/londocs.pm:1.186	Fri Jun 10 12:56:08 2005
+++ loncom/interface/londocs.pm	Fri Jun 10 13:51:29 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.186 2005/06/10 16:56:08 www Exp $
+# $Id: londocs.pm,v 1.187 2005/06/10 17:51:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1076,12 +1076,12 @@
                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
                 if ($cmd eq 'del') {
 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
-		    if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
-			unless ($url=~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/) {
-			    &Apache::lonnet::removeuploadedurl($url);
-			}
+		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/)) {
+			&Apache::lonnet::removeuploadedurl($url);
+		    } else {
+			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    }
-		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];