--- loncom/lonnet/perl/lonnet.pm	2003/01/10 14:50:08	1.315
+++ loncom/lonnet/perl/lonnet.pm	2003/02/03 18:03:53	1.323
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.315 2003/01/10 14:50:08 www Exp $
+# $Id: lonnet.pm,v 1.323 2003/02/03 18:03:53 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,23 +47,18 @@
 # 09/01 Guy Albertelli
 # 09/01,10/01,11/01 Gerd Kortemeyer
 # YEAR=2001
-# 02/27/01 Scott Harrison
 # 3/2 Gerd Kortemeyer
-# 3/15,3/19 Scott Harrison
 # 3/19,3/20 Gerd Kortemeyer
-# 3/22,3/27,4/2,4/16,4/17 Scott Harrison
 # 5/26,5/28 Gerd Kortemeyer
 # 5/30 H. K. Ng
 # 6/1 Gerd Kortemeyer
 # July Guy Albertelli
 # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26,
 # 10/2 Gerd Kortemeyer
-# 10/5,10/10,11/13,11/15 Scott Harrison
 # 11/17,11/20,11/22,11/29 Gerd Kortemeyer
 # 12/5 Matthew Hall
 # 12/5 Guy Albertelli
 # 12/6,12/7,12/12 Gerd Kortemeyer
-# 12/18 Scott Harrison
 # 12/21,12/22,12/27,12/28 Gerd Kortemeyer
 # YEAR=2002
 # 1/4,2/4,2/7 Gerd Kortemeyer
@@ -864,7 +859,7 @@ sub userfileupload {
 # Replace spaces by underscores
     $fname=~s/\s+/\_/g;
 # Replace all other weird characters by nothing
-    $fname=~s/[^\w\.]//g;
+    $fname=~s/[^\w\.\-]//g;
 # See if there is anything left
     unless ($fname) { return 'error: no uploaded file'; }
     chop($ENV{'form.'.$formname});
@@ -1744,6 +1739,57 @@ sub dump {
    return %returnhash;
 }
 
+# --------------------------------------------------------------- currentdump
+sub currentdump {
+   my ($namespace,$udomain,$uname)=@_;
+   if (!$udomain) { $udomain = $ENV{'user.domain'}; }
+   if (!$uname)   { $uname   = $ENV{'user.name'};   }
+   my $uhome = &homeserver($uname,$udomain);
+   my $rep=reply("currentdump:$udomain:$uname:$namespace",$uhome);
+   return if ($rep =~ /^(error:|no_such_host)/);
+   #
+   my %returnhash=();
+   #
+   if ($rep eq "unknown_cmd") { 
+       # an old lond will not know currentdump
+       # Do a dump and make it look like a currentdump
+       my @tmp = &dump($namespace,$udomain,$uname,'.');
+       return if ($tmp[0] =~ /^(error:|no_such_host)/);
+       my %hash = @tmp;
+       @tmp=();
+       # Code ripped from lond, essentially.  The only difference
+       # here is the unescaping done by lonnet::dump().  Conceivably
+       # we might run in to problems with parameter names =~ /^v\./
+       while (my ($key,$value) = each(%hash)) {
+           my ($v,$symb,$param) = split(/:/,$key);
+           next if ($v eq 'version' || $symb eq 'keys');
+           next if (exists($returnhash{$symb}) &&
+                    exists($returnhash{$symb}->{$param}) &&
+                    $returnhash{$symb}->{'v.'.$param} > $v);
+           $returnhash{$symb}->{$param}=$value;
+           $returnhash{$symb}->{'v.'.$param}=$v;
+       }
+       #
+       # Remove all of the keys in the hashes which keep track of
+       # the version of the parameter.
+       while (my ($symb,$param_hash) = each(%returnhash)) {
+           # use a foreach because we are going to delete from the hash.
+           foreach my $key (keys(%$param_hash)) {
+               delete($param_hash->{$key}) if ($key =~ /^v\./);
+           }
+       }
+   } else {
+       my @pairs=split(/\&/,$rep);
+       foreach (@pairs) {
+           my ($key,$value)=split(/=/,$_);
+           my ($symb,$param) = split(/:/,$key);
+           $returnhash{&unescape($symb)}->{&unescape($param)} = 
+                                                          &unescape($value);
+       }
+   }
+   return %returnhash;
+}
+
 # --------------------------------------------------------------- put interface
 
 sub put {
@@ -2766,14 +2812,14 @@ sub EXT {
     } else {
 	$courseid=$ENV{'request.course.id'};
     }
-
     my ($realm,$space,$qualifier,@therest)=split(/\./,$varname);
     my $rest;
-    if ($therest[0]) {
+    if (defined($therest[0])) {
        $rest=join('.',@therest);
     } else {
        $rest='';
     }
+
     my $qualifierrest=$qualifier;
     if ($rest) { $qualifierrest.='.'.$rest; }
     my $spacequalifierrest=$space;
@@ -3034,9 +3080,12 @@ sub metadata {
                       my $unikey='parameter'.$keyroot.'_'.$name;
                       $metathesekeys{$unikey}=1;
                       $metacache{$uri.':'.$unikey.'.part'}=$part;
-                      unless 
-                       (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
-                         $metacache{$uri.':'.$unikey.'.'.$subp}=$value;
+                      unless (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
+			  $metacache{$uri.':'.$unikey.'.'.$subp}=$value;
+		      }
+		      if (defined($metacache{$uri.':'.$unikey.'.default'})) {
+			  $metacache{$uri.':'.$unikey}=
+			     $metacache{$uri.':'.$unikey.'.default'}
 		      }
                   }
               }
@@ -3086,11 +3135,17 @@ sub metadata {
               foreach (@{$token->[3]}) {
 		  $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
               }
-              unless (
-                 $metacache{$uri.':'.$unikey}=&HTML::Entities::decode($parser->get_text('/'.$entry))
-		      ) { $metacache{$uri.':'.$unikey}=
-			      $metacache{$uri.':'.$unikey.'.default'};
-		      }
+	      my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
+	      my $default=$metacache{$uri.':'.$unikey.'.default'};
+	      if ( $internaltext =~ /^\s*$/ && $default !~ /^\s*$/) {
+		  # only ws inside the tag, and not in default, so use default
+                  # as value
+		  $metacache{$uri.':'.$unikey}=$default;
+	      } else {
+		  # either something interesting inside the tag or default
+                  # uninteresting
+		  $metacache{$uri.':'.$unikey}=$internaltext;
+	      }
 # end of not-a-package not-a-library import
 	   }
 # end of not-a-package start tag