/[cvs]/nfo/perl/libs/Data/Storage/Handler/Tangram.pm

Diff of /nfo/perl/libs/Data/Storage/Handler/Tangram.pm

Parent Directory | Revision Log | View Patch Patch

-revision 1.21 by jonen,
Mon Dec 16 22:20:49 2002 UTC
+revision 1.28 by joko,
Thu Feb 20 20:20:26 2003 UTC
 Line 3
  #  $Id$
  #
  #  $Log$
+ #  Revision 1.28  2003/02/20 20:20:26  joko
+ #  tried to get auto-disconnect working again - failed with that
+ #
+ #  Revision 1.27  2003/01/31 06:30:59  joko
+ #  + enabled 'sendQuery'
+ #
+ #  Revision 1.26  2003/01/30 22:29:47  joko
+ #  + fixed module usage (removed dependency on 'libp.pm')
+ #
+ #  Revision 1.25  2003/01/19 02:30:05  joko
+ #  + fix: modified call to '_initSchema'
+ #
+ #  Revision 1.24  2002/12/22 14:13:01  joko
+ #  + sub dropDb
+ #
+ #  Revision 1.23  2002/12/19 16:31:53  joko
+ #  +- renamed sub to 'rebuildDb'
+ #
+ #  Revision 1.22  2002/12/18 22:28:16  jonen
+ #  + added extended logging at 'getObjectByGuid()'
+ #
  #  Revision 1.21  2002/12/16 22:20:49  jonen
  #  + fixed bug at 'getObjectByGuid()'
  #
-Line 23
+Line 44
  #  + fix: encapsulated object-loading inside an 'eval'
  #
  #  Revision 1.15  2002/12/05 13:55:21  joko
- #  + now utilizing 'object2hash' instead of 'var_deref'
+ #  + now utilizing 'expand' instead of 'var_deref'
  #  + played around with having fresh-objects - no progress....
  #
  #  Revision 1.14  2002/12/05 09:40:30  jonen
-Line 96 
 use warnings;
+Line 117 
 use warnings;
  use base ("Data::Storage::Handler");
  use base ("Data::Storage::Handler::Abstract");
- use Tangram;
  use Data::Dumper;
- use libp qw( getNewPerlObjectByPkgName );
+ use Tangram;
+ use DesignPattern::Object;
  use Data::Storage::Result::Tangram;
  use Data::Compare::Struct qw( isEmpty );
- use Data::Transform::Deep qw( object2hash );
+ use Data::Transform::Deep qw( expand );
- use Data::Transform::Encode qw( var2utf8 );
+ #use Data::Transform::Encode qw( var2utf8 );
  # get logger instance
  my $logger = Log::Dispatch::Config->instance;
-Line 124 
 sub _initSchema {
+Line 146 
 sub _initSchema {
    my $self = shift;
    $logger->debug( __PACKAGE__ . "->_initSchema()" );
    #if (!$schema_tangram) {
-     my $obj = getNewPerlObjectByPkgName($self->{locator}->{schema}, { EXPORT_OBJECTS => $self->{locator}->{classnames}, want_transactions => $self->{locator}->{want_transactions} } );
+     #my $obj = getNewPerlObjectByPkgName($self->{locator}->{schema}, { EXPORT_OBJECTS => $self->{locator}->{classnames}, want_transactions => $self->{locator}->{want_transactions} } );
+     my $obj = DesignPattern::Object->fromPackage($self->{locator}->{schema}, { 'EXPORT_OBJECTS' => $self->{locator}->{classnames}, 'want_transactions' => $self->{locator}->{want_transactions} } );
      $schema_tangram = $obj->getSchema();
    #}
    if (!$schema_tangram) {
-Line 157 
 sub connect {
+Line 180 
 sub connect {
      my $self = shift;
      my $dsn = shift;
+ #print Dumper($self);
+ #exit;
+     # TODO: re-enable
      $dsn ||= $self->{locator}->{dbi}->{dsn};
      $logger->debug( __PACKAGE__ . "->connect( dsn $dsn )" );
      #my $storage = Tangram::Relational->connect( $schema, $dsn );
-Line 170 
 sub connect {
+Line 197 
 sub connect {
  #      return;
  #    }
-     return unless $self->_initSchema();
+     #return unless $self->_initSchema();
+     $self->_initSchema();
      # create the main tangram storage object
      #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn );
-Line 297 
 sub configureCOREHANDLE {
+Line 325 
 sub configureCOREHANDLE {
    $logger->debug( __PACKAGE__ . "->configureCOREHANDLE" );
    #my $subLayer = $self->_getSubLayerHandle();
+   #print Dumper($self);
+   #exit;
    # apply configured modifications
      if (exists $self->{dbi}->{trace_level} && exists $self->{dbi}->{trace_file}) {
-Line 362 
 sub retreatSchema {
+Line 392 
 sub retreatSchema {
    return $ok;
  }
- sub rebuildDbAndSchema {
+ sub rebuildDb {
    my $self = shift;
-   $logger->info( __PACKAGE__ . "->rebuildDbAndSchema()" );
+   $logger->info( __PACKAGE__ . "->rebuildDb()" );
    my @results;
    # sum up results (bool (0/1)) in array
-Line 404 
 sub getListFiltered {
+Line 434 
 sub getListFiltered {
    my @results;
    $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $nodename . "' )" );
-   #print Dumper($filters);
+ #print Dumper($filters);
    my @tfilters;
-Line 443 
 sub getListFiltered {
+Line 473 
 sub getListFiltered {
    # HACK: build eval-string (sorry) to get filtered list - please give advice here
    my $evalstring = 'return $self->{_COREHANDLE}->select($remote, ' . $tfilter . ');';
+   #print "eval: $evalstring", "\n";
    # get filtered list/set
    @results = eval($evalstring);
    die $@ if $@;
-Line 502 
 sub sendQuery {
+Line 534 
 sub sendQuery {
      #return $self->createSet( $self->{COREHANDLE}->load('300090018') );
    }
-   die("This should not be reached for now - redirect to \$self->getListFiltered() here!");
+   my $list = $self->getListFiltered($query->{node}, $query->{criterias});
+   #return $self->createSet($object);
+   #return $self->createSet($list);
+   return $self->createSet(@$list);
+   #die("This should not be reached for now - redirect to \$self->getListFiltered() here!");
-   # TODO: do a common tangram query here
+   # try a generic tangram query here
+   # TODO: try to place an oql on top of that (search.cpan.org!)
    my @crits;
    foreach (@{$query->{criterias}}) {
      my $op = '';
-Line 563 
 sub getObjectByGuid {
+Line 603 
 sub getObjectByGuid {
    # Guid and Classname is needed
    if(!$guid || !$options->{classname}) {
+    $logger->error( __PACKAGE__ . "->getObjectByGuid: No 'guid' OR no Classname in options hash was given but needed!" );
      return;
    }
-Line 575 
 sub getObjectByGuid {
+Line 616 
 sub getObjectByGuid {
    my @result = $self->{_COREHANDLE}->select($obj_tmp, $obj_tmp->{guid} eq $guid);
    # we searched for global unique identifer of some object,
-   # so it think we can trust there would be only one result
+   # so I think we can trust there would be only one result
    if($result[0]) {
      return $result[0];
    } else {
-     return "No Object with Classname $options->{classname} and GUID $options->{guid} found!";
+     $logger->error( __PACKAGE__ . "->getObjectByGuid: No Object with Classname $options->{classname} and GUID $guid found!" );
+     return;
    }
  }
-Line 611 
 sub getObjectAsHash {
+Line 653 
 sub getObjectAsHash {
    }
  =cut
-   my $hash = object2hash($obj, $options);
+   my $hash = expand($obj, $options);
    #$options->{cb}->{destroy}->($obj);
    #$self->{_COREHANDLE}->unload($obj);
    # convert values in hash to utf8 to be ready for (e.g.) encapsulation in XML
-   # now done in object2hash
+   # now done in expand
    #var2utf8($hash) if ($options->{utf8});
    # old (wrong) attempts to get rid of used instances, if requested
-Line 637 
 sub getCOREHANDLE {
+Line 679 
 sub getCOREHANDLE {
    return $self->{_COREHANDLE};
  }
+ sub dropDb {
+   my $self = shift;
+   my $storage = $self->_getSubLayerHandle();
+   return $storage->dropDb();
+ }
+ sub testAvailability {
+   my $self = shift;
+   my $storage = $self->_getSubLayerHandle();
+   return $storage->testAvailability();
+ }
+ sub disconnect2 {
+   my $self = shift;
+   my $storage = $self->_getSubLayerHandle();
+   print "DISC!", "\n";
+   my $storage_ll = $storage->{_COREHANDLE};
+   $storage_ll->disconnect();
+   print Dumper($storage);
+   exit;
+   #$self->{_COREHANDLE}
+   #$storage->disconnect();
+   $self->{dataStorageLayer}->disconnect();
+ }
 ;
+ __END__

 Legend:



Removed from v.1.21
 


changed lines


 
Added in v.1.28
 Legend:



Removed from v.1.21
 


changed lines


 
Added in v.1.28
-Removed from v.1.21
+Added in v.1.28

MailToCvsAdmin">MailToCvsAdmin	ViewVC Help
Powered by ViewVC 1.1.26