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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.6 by joko, Fri Nov 29 05:02:30 2002 UTC revision 1.13 by joko, Thu Dec 5 07:59:04 2002 UTC
# Line 3  Line 3 
3  #  $Id$  #  $Id$
4  #  #
5  #  $Log$  #  $Log$
6    #  Revision 1.13  2002/12/05 07:59:04  joko
7    #  + now using Tie::SecureHash as a base for the COREHANDLE
8    #  + former public COREHANDLE becomes private _COREHANDLE now
9    #  + sub getCOREHANDLE
10    #
11    #  Revision 1.12  2002/12/04 11:34:49  joko
12    #  - $schema_tangram doesn't have to be in class?
13    #
14    #  Revision 1.11  2002/12/04 08:54:08  jonen
15    #  + untested bugfix: undef($object) after transform to hash at getObjectAsHash
16    #
17    #  Revision 1.10  2002/12/03 15:53:23  joko
18    #  + small bugfix regarding object hierarchy
19    #
20    #  Revision 1.9  2002/12/03 05:29:40  joko
21    #  + sub getObject
22    #  + sub getObjectAsHash
23    #
24    #  Revision 1.8  2002/12/01 22:25:51  joko
25    #  + now utilizing metadata from storage locator when connecting to DBI in "raw"-mode
26    #
27    #  Revision 1.7  2002/12/01 04:46:19  joko
28    #  + sub eraseAll
29    #
30  #  Revision 1.6  2002/11/29 05:02:30  joko  #  Revision 1.6  2002/11/29 05:02:30  joko
31  #  - sub getNewPerlObjectByPkgName (moved to libp.pm)  #  - sub getNewPerlObjectByPkgName (moved to libp.pm)
32  #  + sub getMetaInfo  #  + sub getMetaInfo
# Line 43  package Data::Storage::Handler::Tangram; Line 67  package Data::Storage::Handler::Tangram;
67  use strict;  use strict;
68  use warnings;  use warnings;
69    
70    use base ("Data::Storage::Handler");
71  use base ("Data::Storage::Handler::Abstract");  use base ("Data::Storage::Handler::Abstract");
72    
73  use Tangram;  use Tangram;
# Line 50  use Data::Dumper; Line 75  use Data::Dumper;
75  use libp qw( getNewPerlObjectByPkgName );  use libp qw( getNewPerlObjectByPkgName );
76  use Data::Storage::Result::Tangram;  use Data::Storage::Result::Tangram;
77  use Data::Compare::Struct qw( isEmpty );  use Data::Compare::Struct qw( isEmpty );
78    use Data::Transform::Deep qw( var_deref );
79    use Data::Transform::Encode qw( var2utf8 );
80    
81    
82  # get logger instance  # get logger instance
83  my $logger = Log::Dispatch::Config->instance;  my $logger = Log::Dispatch::Config->instance;
84    
85    
86    # this holds the complete instantiated schema from tangram
87    my $schema_tangram;
88    
89  sub getMetaInfo {  sub getMetaInfo {
90    my $self = shift;    my $self = shift;
91    $logger->debug( __PACKAGE__ . "->getMetaInfo()"  );    $logger->debug( __PACKAGE__ . "->getMetaInfo()"  );
# Line 66  sub getMetaInfo { Line 97  sub getMetaInfo {
97  sub _initSchema {  sub _initSchema {
98    my $self = shift;    my $self = shift;
99    $logger->debug( __PACKAGE__ . "->_initSchema()" );    $logger->debug( __PACKAGE__ . "->_initSchema()" );
100    #if (!$self->{schema_tangram}) {    #if (!$schema_tangram) {
101      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} } );
102      $self->{schema_tangram} = $obj->getSchema();      $schema_tangram = $obj->getSchema();
103    #}    #}
104    if (!$self->{schema_tangram}) {    if (!$schema_tangram) {
105      $logger->error( __PACKAGE__ . "->_initSchema: No Schema available for $self->{schema}" );      $logger->error( __PACKAGE__ . "->_initSchema: No Schema available for $self->{schema}" );
106      return 0;      return 0;
107    }    }
# Line 99  sub connect { Line 130  sub connect {
130    
131      # create the main tangram storage object      # create the main tangram storage object
132      #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn );      #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn );
133      $self->{COREHANDLE} = Tangram::Relational->connect( $self->{schema_tangram}, $dsn );      $self->{_COREHANDLE} = Tangram::Relational->connect( $schema_tangram, $dsn );
134    
135    #print "connect", "\n";
136    #my $core = $self->{_COREHANDLE};
137    #print Dumper($core);
138        
139      # some attempts for configuring the wrapped underlying dbi.....      # some attempts for configuring the wrapped underlying dbi.....
140      #$self->{STORAGEHANDLE_UNDERLYING} = $self->getUnderlyingStorage();      #$self->{STORAGEHANDLE_UNDERLYING} = $self->getUnderlyingStorage();
# Line 135  sub getChildNodes { Line 170  sub getChildNodes {
170  #print Dumper($self);  #print Dumper($self);
171    #if (my $result = $self->sendCommand( 'SHOW TABLES;' ) ) {    #if (my $result = $self->sendCommand( 'SHOW TABLES;' ) ) {
172        
173    $storage->disconnect();    # TODO: REVIEW
174      #$storage->disconnect();
175        
176    $self->{meta}->{childnodes} = \@nodes;    $self->{meta}->{childnodes} = \@nodes;
177        
# Line 204  sub _configureUnderlyingStorage { Line 240  sub _configureUnderlyingStorage {
240    foreach my $key (keys %{$self->{dbi}}) {    foreach my $key (keys %{$self->{dbi}}) {
241      my $val = $self->{dbi}->{$key};      my $val = $self->{dbi}->{$key};
242      print "entry: $key; $val", "\n";      print "entry: $key; $val", "\n";
243      $self->{COREHANDLE}->{db}->{$key} = $val;      $self->{_COREHANDLE}->{db}->{$key} = $val;
244    }    }
245    #print Dumper($self->{COREHANDLE}->{db});    #print Dumper($self->{COREHANDLE}->{db});
246  }  }
# Line 220  sub configureCOREHANDLE { Line 256  sub configureCOREHANDLE {
256    
257    # apply configured modifications    # apply configured modifications
258      if (exists $self->{dbi}->{trace_level} && exists $self->{dbi}->{trace_file}) {      if (exists $self->{dbi}->{trace_level} && exists $self->{dbi}->{trace_file}) {
259        $self->{COREHANDLE}->{db}->trace($self->{dbi}->{trace_level}, $self->{dbi}->{trace_file});        $self->{_COREHANDLE}->{db}->trace($self->{dbi}->{trace_level}, $self->{dbi}->{trace_file});
260      }      }
261      if (exists $self->{dbi}->{RaiseError}) {      if (exists $self->{dbi}->{RaiseError}) {
262        $self->{COREHANDLE}->{db}->{RaiseError} = $self->{dbi}->{RaiseError};        $self->{_COREHANDLE}->{db}->{RaiseError} = $self->{dbi}->{RaiseError};
263      }      }
264      if (exists $self->{dbi}->{PrintError}) {      if (exists $self->{dbi}->{PrintError}) {
265        $self->{COREHANDLE}->{db}->{PrintError} = $self->{dbi}->{PrintError};        $self->{_COREHANDLE}->{db}->{PrintError} = $self->{dbi}->{PrintError};
266      }      }
267      if (exists $self->{dbi}->{HandleError}) {      if (exists $self->{dbi}->{HandleError}) {
268        $self->{COREHANDLE}->{db}->{HandleError} = $self->{dbi}->{HandleError};        $self->{_COREHANDLE}->{db}->{HandleError} = $self->{dbi}->{HandleError};
269      }      }
270    
271  }  }
# Line 239  sub deploySchema { Line 275  sub deploySchema {
275    my $args = shift;    my $args = shift;
276        
277    my $dsn = $self->{locator}->{dbi}->{dsn};    my $dsn = $self->{locator}->{dbi}->{dsn};
   #my $dsn = $self->{dbi}->{dsn};  
278    
279    $logger->debug( __PACKAGE__ . "->deploySchema( dsn $dsn )" );    $logger->debug( __PACKAGE__ . "->deploySchema( dsn $dsn )" );
280    
281    my $ok;    my $ok;
282    # TODO: is this DBI->connect okay here like it is? regarding errors.....???    if ( my $dbh = DBI->connect($dsn, '', '', $self->{locator}->{dbi} ) ) {
   if ( my $dbh = DBI->connect($dsn, '', '', {  
                                                       PrintError => 0,  
                                                     } ) ) {  
   
283      return unless $self->_initSchema();      return unless $self->_initSchema();
284            $ok = Tangram::Relational->deploy($schema_tangram, $dbh );
     $ok = Tangram::Relational->deploy($self->{schema_tangram}, $dbh );  
285      $dbh->disconnect();      $dbh->disconnect();
286    }    }
287    return $ok;    return $ok;
# Line 261  sub retreatSchema { Line 291  sub retreatSchema {
291    
292    my $self = shift;    my $self = shift;
293    my $dsn = $self->{locator}->{dbi}->{dsn};    my $dsn = $self->{locator}->{dbi}->{dsn};
   #my $dsn = $self->{dbi}->{dsn};  
294    
295    $logger->debug( __PACKAGE__ . "->retreatSchema( dsn $dsn )" );    $logger->debug( __PACKAGE__ . "->retreatSchema( dsn $dsn )" );
296    
297    my $ok;    my $ok;
298    if ( my $dbh = DBI->connect($dsn, '', '', {    if ( my $dbh = DBI->connect($dsn, '', '', $self->{locator}->{dbi} ) ) {
                                                       #PrintError => 0,  
                                                       #RaiseError => 0,  
                                                     } ) ) {  
299    
300      return unless $self->_initSchema();      return unless $self->_initSchema();
301            
302      #use Data::Dumper; print Dumper($self);      #use Data::Dumper; print Dumper($self);
303      $self->{dataStorageLayer}->removeLogDispatchHandler("Tangram11");      $self->{dataStorageLayer}->removeLogDispatchHandler("Tangram11");
304            
305      $ok = Tangram::Relational->retreat($self->{schema_tangram}, $dbh );      $ok = Tangram::Relational->retreat($schema_tangram, $dbh );
306      $ok = 2;    # answer is "maybe" for now since Tangram::Relational->retreat doesn't seem to return a valid status  
307                      # idea: test this by checking for count of tables in database -      # answer "$ok=2" means "maybe" for now - we have to patch this to a constant here because...
308                      #          problem with this: there may be some left not having been included to the schema      # - ... Tangram::Relational->retreat doesn't seem to return a valid status
309        # - possible improvement:
310        #   - test this by checking for count of tables in database
311        #   - problem with this: there may be some left not having been included to the schema
312        #   - maybe better: use "->getChildNodes"?
313        $ok = 2;
314    
315      $dbh->disconnect();      $dbh->disconnect();
316    
317    }    }
318    return $ok;    return $ok;
319  }  }
# Line 311  sub getListUnfiltered { Line 344  sub getListUnfiltered {
344    my @results;    my @results;
345    $logger->debug( __PACKAGE__ . "->getListUnfiltered( nodename => '" . $nodename . "' )" );    $logger->debug( __PACKAGE__ . "->getListUnfiltered( nodename => '" . $nodename . "' )" );
346    # get set of objects from odbms by object name    # get set of objects from odbms by object name
347    my $object_set = $self->{COREHANDLE}->remote($nodename);    my $object_set = $self->{_COREHANDLE}->remote($nodename);
348    @results = $self->{COREHANDLE}->select($object_set);    @results = $self->{_COREHANDLE}->select($object_set);
349    return \@results;    return \@results;
350  }  }
351    
# Line 357  sub getListFiltered { Line 390  sub getListFiltered {
390    my $tfilter = join(' & ', @tfilters);    my $tfilter = join(' & ', @tfilters);
391    
392    # get set of objects from odbms by object name    # get set of objects from odbms by object name
393    my $remote = $self->{COREHANDLE}->remote($nodename);    my $remote = $self->{_COREHANDLE}->remote($nodename);
394        
395    # was:    # was:
396    #@results = $self->{COREHANDLE}->select($object_set, $tfilter);    #@results = $self->{COREHANDLE}->select($object_set, $tfilter);
397    
398    # is:    # is:
399    # HACK: build eval-string (sorry) to get filtered list - please give advice here    # HACK: build eval-string (sorry) to get filtered list - please give advice here
400    my $evalstring = 'return $self->{COREHANDLE}->select($remote, ' . $tfilter . ');';    my $evalstring = 'return $self->{_COREHANDLE}->select($remote, ' . $tfilter . ');';
401        
402    # get filtered list/set    # get filtered list/set
403    @results = eval($evalstring);    @results = eval($evalstring);
# Line 376  sub getListFiltered { Line 409  sub getListFiltered {
409  sub createCursor {  sub createCursor {
410    my $self = shift;    my $self = shift;
411    my $node = shift;    my $node = shift;
412    my $cmdHandle = $self->{COREHANDLE}->cursor($node);    my $cmdHandle = $self->{_COREHANDLE}->cursor($node);
413    my $result = Data::Storage::Result::Tangram->new( RESULTHANDLE => $cmdHandle );    my $result = Data::Storage::Result::Tangram->new( RESULTHANDLE => $cmdHandle );
414    return $result;    return $result;
415  }  }
# Line 411  sub sendQuery { Line 444  sub sendQuery {
444      my $ident = $query->{criterias}->[0]->{val};      my $ident = $query->{criterias}->[0]->{val};
445  #print "load obj", "\n";  #print "load obj", "\n";
446      #return $self->createSet() if $ident == 5;      #return $self->createSet() if $ident == 5;
447      my $object = $self->{COREHANDLE}->load($ident);      my $object = $self->{_COREHANDLE}->load($ident);
448  #print "get id", "\n";  #print "get id", "\n";
449      my $oid = $self->{COREHANDLE}->id($object);      my $oid = $self->{_COREHANDLE}->id($object);
450      return $self->createSet($object);      return $self->createSet($object);
451      #return $self->createSet( $self->{COREHANDLE}->load('300090018') );      #return $self->createSet( $self->{COREHANDLE}->load('300090018') );
452    }    }
# Line 439  sub sendQuery { Line 472  sub sendQuery {
472    return $self->createCursor($query->{node});    return $self->createCursor($query->{node});
473  }  }
474    
475    sub eraseAll {
476      my $self = shift;
477      my $classname = shift;
478      my $remote = $self->{_COREHANDLE}->remote($classname);
479      my @objs = $self->{_COREHANDLE}->select($remote);
480      $self->{_COREHANDLE}->erase(@objs);
481    }
482    
483    sub createDb {
484      my $self = shift;
485      my $storage = $self->_getSubLayerHandle();
486      return $storage->createDb();
487    }
488    
489    sub getObject {
490      my $self = shift;
491      my $oid = shift;
492      # TODO: review this
493      #if (!$self->{COREHANDLE}) { return; }
494      return $self->{_COREHANDLE}->load($oid);
495    }
496    
497    sub getObjectAsHash {
498      my $self = shift;
499      my $oid = shift;
500      my $options = shift;
501      my $obj = $self->getObject($oid);
502      my $deref = var_deref($obj);
503      var2utf8($deref) if ($options->{utf8});
504      undef($obj) if($options->{destroy});
505      return $deref;
506    }
507    
508    sub getSchema {
509      return $schema_tangram;
510    }
511    
512    sub getCOREHANDLE {
513      my $self = shift;
514      return $self->{_COREHANDLE};
515    }
516    
517  1;  1;
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.13
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed