--- nfo/perl/libs/Data/Transfer/Sync/Core.pm	2003/01/19 02:05:42	1.2
+++ nfo/perl/libs/Data/Transfer/Sync/Core.pm	2003/01/20 17:01:14	1.3
@@ -1,4 +1,4 @@
-##    $Id: Core.pm,v 1.2 2003/01/19 02:05:42 joko Exp $
+##    $Id: Core.pm,v 1.3 2003/01/20 17:01:14 joko Exp $
 ##
 ##    Copyright (c) 2002  Andreas Motl <andreas.motl@ilo.de>
 ##
@@ -6,6 +6,10 @@
 ##
 ##    ----------------------------------------------------------------------------------------
 ##    $Log: Core.pm,v $
+##    Revision 1.3  2003/01/20 17:01:14  joko
+##    + cosmetics and debugging
+##    + probably refactored code to new plugin-modules 'Metadata.pm' and/or 'StorageInterface.pm' (guess it was the last one...)
+##
 ##    Revision 1.2  2003/01/19 02:05:42  joko
 ##    - removed pod-documentation: now in Data/Transfer/Sync.pod
 ##
@@ -122,140 +126,6 @@
 }
 
 
-sub _preCheckOptions {
-
-  my $self = shift;
-  my $opts = shift;
-
-#print Dumper($opts);
-#exit;
-
-  # the type of the to-be-synced item
-  if (!$opts->{source}->{nodeType}) {
-    $logger->error( __PACKAGE__ . "->_preCheckOptions failed: Please specify \"source-type\".");
-    return;
-  }
-  # the name of the (container-) node the items are listed in
-  if (!$opts->{source}->{nodeName}) {
-    $logger->error( __PACKAGE__ . "->_preCheckOptions failed: Please specify \"source-node\".");
-    return;
-  }
-
-  # a "map"-declaration which module to use for mapping- and/or lookup-purposes
-  if (!$opts->{map}) {
-    $logger->warning( __PACKAGE__ . "->_preCheckOptions: No mapping supplied - please check key 'map|mappings' in global configuration or specify additional argument '--mapping-module'.");
-    return;
-  }
-  if (!$opts->{map}->{moduleName}) {
-    $logger->warning( __PACKAGE__ . "->_preCheckOptions: Currently only perl-modules can provide mappings: Please specify one with '--mapping-module'.");
-    return;
-  }
-
-  return 1;
-
-}
-
-
-
-
-
-
-
-
-
-sub _buildFieldmappingV1 {
-  my $self = shift;
-
-  # build mapping
-  # incoming: and Array of node map entries (Array or Hash) - e.g.
-  #   [ 'source:item_name' => 'target:class_val' ]
-  #   { source => 'event->startDateTime', target => 'begindate' }
-  foreach (@{$self->{args}->{mapping}}) {
-    if (ref $_ eq 'ARRAY') {
-      my @entry1 = split(':', $_->[0]);
-      my @entry2 = split(':', $_->[1]);
-      my $descent = [];
-      my $node = [];
-      $descent->[0] = $entry1[0];
-      $descent->[1] = $entry2[0];
-      $node->[0] = $entry1[1];
-      $node->[1] = $entry2[1];
-      push @{$self->{meta}->{$descent->[0]}->{childnodes}}, $node->[0];
-      push @{$self->{meta}->{$descent->[1]}->{childnodes}}, $node->[1];
-    } elsif (ref $_ eq 'HASH') {
-      foreach my $entry_key (keys %$_) {
-        my $entry_val = $_->{$entry_key};
-        push @{$self->{meta}->{$entry_key}->{childnodes}}, $entry_val;
-      }
-    }
-
-  }
-
-}
-
-sub _buildMetadataV1 {
-  my $self = shift;
-
-  # decompose identifiers for each partner
-  # TODO: refactor!!! take this list from already established/given metadata
-  foreach ('source', 'target') {
-    
-    # get/set metadata for further processing
-
-    # Partner and Node (e.g.: "L:Country" or "R:countries.csv")
-    if (my $item = $self->{args}->{$_}) {
-      my @item = split(':', $item);
-      $self->{meta}->{$_}->{dbkey} = $item[0];
-      $self->{meta}->{$_}->{node} = $item[1];
-    }
-    
-    # Filter
-    if (my $item_filter = $self->{args}->{$_ . '_filter'}) {
-      $self->{meta}->{$_}->{filter} = $item_filter;
-    }
-
-    # IdentProvider
-    if (my $item_ident = $self->{args}->{$_ . '_ident'}) {
-      my @item_ident = split(':', $item_ident);
-      $self->{meta}->{$_}->{IdentProvider} = { method => $item_ident[0], arg => $item_ident[1] };
-    }
-
-#print Dumper($self->{meta});
-
-    # TODO: ChecksumProvider
-
-    # exclude properties/subnodes
-    if (my $item_exclude = $self->{args}->{$_ . '_exclude'}) {
-      $self->{meta}->{$_}->{subnodes_exclude} = $item_exclude;
-    }
-    
-    # TypeProvider
-    if (my $item_type = $self->{args}->{$_ . '_type'}) {
-      my @item_type = split(':', $item_type);
-      $self->{meta}->{$_}->{TypeProvider} = { method => $item_type[0], arg => $item_type[1] };
-    }
-    
-    # Callbacks - writers (will be triggered _before_ writing to target)
-    if (my $item_writers = $self->{args}->{$_ . '_callbacks_write'}) {
-      my $descent = $_;     # this is important since the following code inside the map wants to use its own context variables
-      map { $self->{meta}->{$descent}->{Callback}->{write}->{$_}++; } @$item_writers;
-    }
-    
-    # Callbacks - readers (will be triggered _after_ reading from source)
-    if (my $item_readers = $self->{args}->{$_ . '_callbacks_read'}) {
-      my $descent = $_;
-      map { $self->{meta}->{$descent}->{Callback}->{read}->{$_}++; } @$item_readers;
-    }
-    
-    # resolve storage objects
-    #$self->{$_} = $self->{container}->{storage}->{$self->{meta}->{$_}->{dbkey}};
-    # relink references to metainfo
-    $self->{meta}->{$_}->{storage} = $self->{container}->{storage}->{$self->{meta}->{$_}->{dbkey}};
-    #print "iiiiisprov: ", Dumper($self->{meta}->{$_}->{storage}), "\n";
-  }
-
-}
-
 # TODO: abstract the hardwired use of "source" and "target" in here somehow - hmmmm.......  /(="§/%???
 sub _syncNodes {
 
@@ -276,8 +146,6 @@
   }
   
   # get reference to node list from convenient method provided by CORE-HANDLE
-  #$results ||= $self->{source}->getListUnfiltered($self->{meta}->{source}->{node});
-  #$results ||= $self->{meta}->{source}->{storage}->getListUnfiltered($self->{meta}->{source}->{node});
   $results ||= $self->_getNodeList('source');
 
   # checkpoint: do we actually have a list to iterate through?
@@ -321,7 +189,8 @@
         my $value; # = $source_node->{$node};
 
         # ------------  half-redundant: make $self->callCallback($object, $value, $opts)
-        my $perl_callback = $self->{meta}->{$descent}->{node} . '::' . $node . '_read';
+        #my $perl_callback = $self->{meta}->{$descent}->{node} . '::' . $node . '_read';
+        my $perl_callback = $self->{meta}->{$descent}->{nodeType} . '::' . $node . '_read';
         my $evalstring = 'return ' . $perl_callback . '( { object => $object, property => $node, value => $value, storage => $self->{meta}->{$descent}->{storage} } );';
         #print $evalstring, "\n"; exit;
         my $cb_result = eval($evalstring);
@@ -354,18 +223,12 @@
     #if (!$identOK && lc $self->{args}->{direction} ne 'import') {
     if (!$identOK) {
       #print Dumper($self->{meta}->{source});
-      $logger->critical( __PACKAGE__ . "->syncNodes: No ident found in source node \"$self->{meta}->{source}->{node}\", try to \"prepare\" this node first?" );
+      $logger->critical( __PACKAGE__ . "->syncNodes: No ident found in source node ( nodeName='$self->{meta}->{source}->{nodeName}', nodeType='$self->{meta}->{source}->{nodeType}') try to \"prepare\" this node first?" );
       return;
     }
 
-#print "statload", "\n";
-#print "ident: ", $self->{node}->{source}->{ident}, "\n";
-#print Dumper($self->{node});
-    
     my $statOK = $self->_statloadNode('target', $self->{node}->{source}->{ident});
 
-#print Dumper($self->{node});
-    
     # mark node as new either if there's no ident or if stat/load failed
     if (!$statOK) {
       $self->{node}->{status}->{new} = 1;
@@ -718,39 +581,6 @@
 
 }
 
-sub _resolveNodeIdent {
-  my $self = shift;
-  my $descent = shift;
-  
-  #print Dumper($self->{node}->{$descent});
-  
-  # get to the payload
-    #my $item = $specifier->{item};
-    my $payload = $self->{node}->{$descent}->{payload};
-
-  # resolve method to get to the id of the given item
-  # we use global metadata and the given descent for this task
-    #my $ident = $self->{$descent}->id($item);
-    #my $ident = $self->{meta}->{$descent}->{storage}->id($item);
-
-    my $ident;
-    my $provider_method = $self->{meta}->{$descent}->{IdentProvider}->{method};
-    my $provider_arg = $self->{meta}->{$descent}->{IdentProvider}->{arg};
-
-    # resolve to ident
-    if ($provider_method eq 'property') {
-      $ident = $payload->{$provider_arg};
-
-    } elsif ($provider_method eq 'storage_method') {
-      #$ident = $self->{meta}->{$descent}->{storage}->id($item);
-      $ident = $self->{meta}->{$descent}->{storage}->$provider_arg($payload);
-    }
-    
-    $self->{node}->{$descent}->{ident} = $ident;
-    
-  return 1 if $ident;
-
-}
 
 
 sub _modifyNode {
@@ -974,103 +804,6 @@
 
 }
 
-# TODO:
-# this should be split up into...
-#   - a "_statNode" (should just touch the node to check for existance)
-#   - a "_loadNode" (should load node completely)
-#   - maybe additionally a "loadNodeProperty" (may specify properties to load)
-#   - introduce $self->{nodecache} for this purpose
-# TODO:
-#   should we:
-#     - not pass ident in here but resolve it via "$descent"?
-#     - refactor this and stuff it with additional debug/error message
-#       - this = the way the implicit load mechanism works
-sub _statloadNode {
-
-  my $self = shift;
-  my $descent = shift;
-  my $ident = shift;
-  my $force = shift;
-
-  # fetch entry to retrieve checksum from
-  # was:
-  if (!$self->{node}->{$descent} || $force) {
-  # is:
-  #if (!$self->{node}->{$descent}->{item} || $force) {
-    
-    if (!$ident) {
-      #print "\n", "Attempt to fetch entry implicitely by ident failed: no ident given! This may result in an insert if no write-protection is in the way.", "\n";
-      return;
-    }
-    
-    # patch for DBD::CSV
-    if ($ident && $ident eq 'Null') {
-      return;
-    }
-
-#print "yai!", "\n";
-
-    my $query = { 
-      node => $self->{meta}->{$descent}->{node}, 
-      subnodes => [qw( cs )], 
-      criterias => [ 
-        { key => $self->{meta}->{$descent}->{IdentProvider}->{arg}, 
-           op => 'eq', 
-           val => $ident },
-      ]
-    };
-
-#print Dumper($query);
-
-    my $result = $self->{meta}->{$descent}->{storage}->sendQuery($query);
-
-    my $entry = $result->getNextEntry();
-
-#print Dumper($entry);
-#print "pers: " . $self->{meta}->{$descent}->{storage}->is_persistent($entry), "\n";
-#my $state = $self->{meta}->{$descent}->{storage}->_fetch_object_state($entry, { name => 'TransactionHop' } );
-#print Dumper($state);
-
-    my $status = $result->getStatus();
-
-#print Dumper($status);
-    
-    # TODO: enhance error handling (store inside tc)
-    #if (!$row) {
-    #  print "\n", "row error", "\n";
-    #  next;
-    #}
-
-    # these checks run before actually loading payload- and meta-data to node-container
-    
-      # 1st level - hard error
-      if ($status && $status->{err}) {
-        $logger->debug( __PACKAGE__ . "->_statloadNode (ident=\"$ident\") failed - hard error (that's ok): $status->{err}" );
-        return;
-      }
-  
-      # 2nd level - logical (empty/notfound) error
-      if (($status && $status->{empty}) || !$entry) {
-        $logger->debug( __PACKAGE__ . "->_statloadNode (ident=\"$ident\") failed - logical error (that's ok)" );
-        #print "no entry (logical)", "\n";
-        return;
-      }
-
-#print Dumper($entry);
-
-    # was:
-    # $self->{node}->{$descent}->{ident} = $ident;  
-    # is:
-    # TODO: re-resolve ident from entry via metadata "IdentProvider" here - like elsewhere
-    $self->{node}->{$descent}->{ident} = $ident;
-    $self->{node}->{$descent}->{payload} = $entry;
-
-  }
-  
-  return 1;
-  
-}
-
 sub _doTransferToTarget {
   my $self = shift;
   my $action = shift;
@@ -1097,15 +830,6 @@
 }
 
 
-# this is a shortcut method
-# ... let's try to avoid _any_ redundant code in here (ok... - at the cost of method lookups...)
-sub _getNodeList {
-  my $self = shift;
-  my $descent = shift;
-  my $filter = shift;
-  return $self->{meta}->{$descent}->{storage}->getListFiltered($self->{meta}->{$descent}->{node}, $filter);
-}
-
 
 sub _prepareNode_MetaProperties {
   my $self = shift;