--- loncom/lonnet/perl/lonnet.pm	2004/04/15 23:06:02	1.487
+++ loncom/lonnet/perl/lonnet.pm	2004/04/29 07:18:10	1.490
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.487 2004/04/15 23:06:02 albertel Exp $
+# $Id: lonnet.pm,v 1.490 2004/04/29 07:18:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1338,6 +1338,12 @@ sub finishuserfileupload {
     }    
 }
 
+sub removeuserfile {
+    my ($docuname,$docudom,$fname)=@_;
+    my $home=&homeserver($docuname,$docudom);
+    return &reply("removeuserfile:$docudom/$docuname/$fname",$home);
+}
+
 # ------------------------------------------------------------------------- Log
 
 sub log {
@@ -3938,7 +3944,7 @@ sub metadata {
     # if it is a non metadata possible uri return quickly
     if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) ||
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
-	($uri =~ m|home/[^/]+/public_html/|) || ($uri =~ m|^uploaded/|)) {
+	($uri =~ m|home/[^/]+/public_html/|)) {
 	return undef;
     }
     my $filename=$uri;
@@ -3967,7 +3973,10 @@ sub metadata {
 	}
         my %metathesekeys=();
         unless ($filename=~/\.meta$/) { $filename.='.meta'; }
-	my $metastring=&getfile(&filelocation('',&clutter($filename)));
+	my $metastring;
+	if ($uri !~ m|^uploaded/|) {
+	    $metastring=&getfile(&filelocation('',&clutter($filename)));
+	}
         my $parser=HTML::LCParser->new(\$metastring);
         my $token;
         undef %metathesekeys;
@@ -4083,14 +4092,14 @@ sub metadata {
 	    #&logthis("extsion1 $extension $key !!");
 	    #no specific packages #how's our extension
 	    if ($key!~/^extension_\Q$extension\E&/) { next; }
-	    &metadata_create_pacakge_def($uri,$key,'extension_'.$extension,
+	    &metadata_create_package_def($uri,$key,'extension_'.$extension,
 					 \%metathesekeys);
 	}
 	if (!exists($metacache{$uri}->{':packages'})) {
 	    foreach my $key (sort(keys(%packagetab))) {
 		#no specific packages well let's get default then
 		if ($key!~/^default&/) { next; }
-		&metadata_create_pacakge_def($uri,$key,'default',
+		&metadata_create_package_def($uri,$key,'default',
 					     \%metathesekeys);
 	    }
 	}
@@ -4122,7 +4131,7 @@ sub metadata {
     return $metacache{$uri}->{':'.$what};
 }
 
-sub metadata_create_pacakge_def {
+sub metadata_create_package_def {
     my ($uri,$key,$package,$metathesekeys)=@_;
     my ($pack,$name,$subp)=split(/\&/,$key);
     if ($subp eq 'default') { next; }