--- nfo/perl/libs/Data/Rap/Metadata.pm	2003/02/18 15:35:49	1.1
+++ nfo/perl/libs/Data/Rap/Metadata.pm	2003/02/20 20:04:35	1.2
@@ -1,7 +1,11 @@
 ## ----------------------------------------------------------------------
-##  $Id: Metadata.pm,v 1.1 2003/02/18 15:35:49 joko Exp $
+##  $Id: Metadata.pm,v 1.2 2003/02/20 20:04:35 joko Exp $
 ## ----------------------------------------------------------------------
 ##  $Log: Metadata.pm,v $
+##  Revision 1.2  2003/02/20 20:04:35  joko
+##  renamed methods
+##  - refactored xml-specific code to Data::Storage::Handler::XML
+##
 ##  Revision 1.1  2003/02/18 15:35:49  joko
 ##  + initial commit
 ##
@@ -15,103 +19,73 @@
 
 
 use Data::Dumper;
-use XML::Parser;
-use XML::Parser::EasyTree;
-use XML::XPath;
-#$XML::Parser::Easytree::Noempty=0;
-#use XML::Simple;
+use DesignPattern::Object;
 
 
-sub getTargetMetadata {
+sub accessMetadata {
   my $self = shift;
-  my $target = shift;
-  #my $result = $self->queryXml("*/target[\@name=\"$target\"]", keyattr => [qw( name )], forcearray => 1);
-  my $keyattr = {
-    topic => 'name',
-    taskdef => 'name',
-    target => 'name',
-  };
-  #my $result = $self->queryXml("*/target[\@name=\"$target\"]", keyattr => $keyattr, forcearray => 1);
-  $self->queryXml("*/target[\@name=\"$target\"]");
-  #return $self->_queryXml($self->{filename}, "target");
-  #print Dumper($result);
-  #return $result->{target};
-  #return $result->{target}->{$target};
-  #return $result;
-  $self->xml2easytree();
-  return $self->{payload};
+
+  # create instance of storage object once
+  if (!$self->{__rap}->{metadbengine}) {
+    $self->{__rap}->{metadbengine} = 
+      DesignPattern::Object->fromPackage('Data::Storage::Handler::XML', filename => $self->{__rap}->{filename} );
+  }
+  
+  return $self->{__rap}->{metadbengine};
+
 }
 
-sub readXmlOverview {
+sub getTargetList {
   my $self = shift;
 
   $self->log( "Reading Job Database from XML.", 'notice' );
 
-  #$self->{payload} = XMLin($self->{filename});
-  #my $result = $self->queryXml("*/target", forcearray => 1);
-  #my $result = $self->queryXml("*/target", keyattr =>[]);
-  $self->queryXml("*/target", keyattr => [qw( name )] );
-  $self->xml2simplehash();
-  #return $result;
-  
-}
+  # prepare access to metadata (assure instantiated storage handle)
+  my $mdbe = $self->accessMetadata();
+
+  $mdbe->sendQuery("*/target");
+  $mdbe->circumflex('result');  
 
-  sub queryXml {
-    my $self = shift;
-    my $xpq = shift;
-    my $options = shift;
-
-    $self->log( "_queryXml( xpq='$xpq' ) ", 'info' );
-
-    my $file = $self->{filename};
-    
-    if (! -e $file) {
-      $self->log("file not found: '$file'", 'error');
+  # checks  
+    if ($mdbe->isEmpty) {
+      $self->log("XML metadata was empty.", 'critical');
       return;
     }
+  
+  # trace
+    #print Dumper($self->{buffer});
+    #exit;
+
+  # behaviour
+    #$self->xml2simplehash();
+    my $tree = $mdbe->toEasyTree();
+  #return $result;
+  
+  # trace
+    #print Dumper($tree);
+    #exit;
+  
+  # build result
+    my @targets;
+    foreach my $entry (@{$tree->{content}}) {
+      my $description = $entry->{content}->[0]->{content}->[0]->{content};
+      push @targets, { name => $entry->{attrib}->{name}, description => $description };
+    }
 
-    #print "file: $file", "\n";
-    #print "xpq: $xpq", "\n";
-    
-    # filter nodes by xpath-query
-      my $xp = XML::XPath->new( filename => $file );
-      my $nodeset = $xp->find($xpq);
-    
-    # build result xml
-      my $buffer;
-      foreach my $node ($nodeset->get_nodelist) {
-        $buffer .= XML::XPath::XMLParser::as_string($node) . "\n\n";
-      }
-      #$buffer .= '';
-      #$buffer = "<result>$buffer</result>";
-    
-    # trace
-      #print $buffer, "\n";
-
-    $self->{buffer} = $buffer;
-    
-  }
+  return \@targets;
+  
+}
 
 
-sub xml2easytree {
+sub getTargetDetails {
   my $self = shift;
-    # convert xml data to native perl data structure
-      my $parser = XML::Parser->new( Style => 'EasyTree', Handlers => { Char => sub {} } );
-      my $data = $parser->parse($self->{buffer});
-
-    my $hash = $data->[0];
-    
-    # trace
-      #print Dumper($hash);
-      #exit;
-
-    $self->{payload} = $hash;
+  my $target = shift;
+  my $mdbe = $self->accessMetadata();
+  $mdbe->sendQuery("*/target[\@name=\"$target\"]");
+  my $tree = $mdbe->toEasyTree();
+  return $tree;
 }
 
-sub xml2simplehash {
-  my $self = shift;
-  $self->{payload} = XMLin($self->{buffer});
-}
 
 1;
 __END__