--- nfo/perl/libs/Data/Rap/Property.pm	2003/02/18 15:36:20	1.1
+++ nfo/perl/libs/Data/Rap/Property.pm	2003/02/20 20:15:45	1.2
@@ -1,7 +1,11 @@
 ## ----------------------------------------------------------------------
-##  $Id: Property.pm,v 1.1 2003/02/18 15:36:20 joko Exp $
+##  $Id: Property.pm,v 1.2 2003/02/20 20:15:45 joko Exp $
 ## ----------------------------------------------------------------------
 ##  $Log: Property.pm,v $
+##  Revision 1.2  2003/02/20 20:15:45  joko
+##  modified logging style
+##  + property merging instead of dumb overriding
+##
 ##  Revision 1.1  2003/02/18 15:36:20  joko
 ##  + initial commit
 ##
@@ -45,19 +49,23 @@
   # FIXME
   $file = "../$file";
   
-  $self->log("Loading $file.", 'notice');
+  $self->log("Loading resource file '$file'.", 'info');
   
   my $storage = Data::Storage::Handler::File->new( filename => $file );
   if (!$storage->exists()) {
-    $self->log("File '$file' does not exist.", 'error');
+    $self->log("Resource not found: File '$file' does not exist.", 'error');
     return;
   }
   my $content = $storage->toString();
 
   $self->load("/Data/Code/Scalar");
   my $properties = $self->eval($content, $varnames);
+
+  #print Dumper($self);
   
-  $self->set_property($name, $properties);
+  $self->merge_properties($name, $properties);
+  
+  #print Dumper($self);
   
 }
 
@@ -67,6 +75,8 @@
   my $name = shift;
   my $varnames = shift;
 
+  $self->log("Loading Perl Module '$module'.", 'info');
+
   $self->load("/Data/Code/Module");
   my $properties = $self->eval_vars($module, $varnames);
 
@@ -74,7 +84,7 @@
     #print Dumper($properties);
     #exit;
 
-  $self->set_property($name, $properties);
+  $self->merge_properties($name, $properties);
 
 }