loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

-version 1.320, 2003/01/28 00:09:57
+version 1.321, 2003/01/31 22:12:13
  Line 3137  sub metadata {
                foreach (@{$token->[3]}) {
  		  $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
                }
-               unless (
+ 	      my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
-                  $metacache{$uri.':'.$unikey}=&HTML::Entities::decode($parser->get_text('/'.$entry))
+ 	      my $default=$metacache{$uri.':'.$unikey.'.default'};
- 		      ) { $metacache{$uri.':'.$unikey}=
+ 	      if ( $internaltext =~ /^\s*$/ && $default !~ /^\s*$/) {
- 			      $metacache{$uri.':'.$unikey.'.default'};
+ 		  # 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