/[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.14 by jonen, Thu Dec 5 09:40:30 2002 UTC revision 1.16 by joko, Wed Dec 11 06:54:10 2002 UTC
# Line 3  Line 3 
3  #  $Id$  #  $Id$
4  #  #
5  #  $Log$  #  $Log$
6    #  Revision 1.16  2002/12/11 06:54:10  joko
7    #  + fix: encapsulated object-loading inside an 'eval'
8    #
9    #  Revision 1.15  2002/12/05 13:55:21  joko
10    #  + now utilizing 'object2hash' instead of 'var_deref'
11    #  + played around with having fresh-objects - no progress....
12    #
13  #  Revision 1.14  2002/12/05 09:40:30  jonen  #  Revision 1.14  2002/12/05 09:40:30  jonen
14  #  + added option->{destroy} at getObject for unloading all instance  #  + added option->{destroy} at getObject for unloading all instance
15  #  #
# Line 78  use Data::Dumper; Line 85  use Data::Dumper;
85  use libp qw( getNewPerlObjectByPkgName );  use libp qw( getNewPerlObjectByPkgName );
86  use Data::Storage::Result::Tangram;  use Data::Storage::Result::Tangram;
87  use Data::Compare::Struct qw( isEmpty );  use Data::Compare::Struct qw( isEmpty );
88  use Data::Transform::Deep qw( var_deref );  use Data::Transform::Deep qw( object2hash );
89  use Data::Transform::Encode qw( var2utf8 );  use Data::Transform::Encode qw( var2utf8 );
90    
91    
# Line 493  sub getObject { Line 500  sub getObject {
500    my $self = shift;    my $self = shift;
501    my $oid = shift;    my $oid = shift;
502    my $options = shift;    my $options = shift;
503    # TODO: create a deep_unload method  
504      # TODO: create a deep_unload method (currently _all_ objects are unloaded)
505    # unload($oid) will only unload object, not deep object hashes    # unload($oid) will only unload object, not deep object hashes
506    $self->{_COREHANDLE}->unload() if($options->{destroy});    $self->{_COREHANDLE}->unload() if($options->{destroy});
507    
508    # TODO: review this    # TODO: review this
509    #if (!$self->{COREHANDLE}) { return; }    #if (!$self->{COREHANDLE}) { return; }
510    return $self->{_COREHANDLE}->load($oid);  
511      # TODO: review this
512      my $object = eval('$self->{_COREHANDLE}->load($oid);');
513      print $@, "\n" if $@;
514    
515      return $object if $object;
516  }  }
517    
518  sub getObjectAsHash {  sub getObjectAsHash {
# Line 506  sub getObjectAsHash { Line 520  sub getObjectAsHash {
520    my $oid = shift;    my $oid = shift;
521    my $options = shift;    my $options = shift;
522    my $obj = $self->getObject($oid, $options);    my $obj = $self->getObject($oid, $options);
523    my $deref = var_deref($obj);    
524    var2utf8($deref) if ($options->{utf8});    # build options (a callback to unload autovivified objects) for 'expand'
525    #$obj->clear_refs;    # TODO: use $logger to write to debug here!
526    #$self->{COREHANDLE}->unload($obj) if($options->{destroy});    my $cb; # = sub {};
527    #$obj->DESTROY;  =pod
528    #undef($obj) if($options->{destroy});    if ($options->{destroy}) {
529    return $deref;      $options->{cb}->{destroy} = sub {
530          print "================ DESTROY", "\n";
531          my $object = shift;
532          #print Dumper($object);
533          $self->{_COREHANDLE}->unload($object);
534          #undef($object);
535        };
536      }
537    =cut
538    
539      my $hash = object2hash($obj, $options);
540      #$options->{cb}->{destroy}->($obj);
541      #$self->{_COREHANDLE}->unload($obj);
542      
543      # convert values in hash to utf8 to be ready for (e.g.) encapsulation in XML
544      # now done in object2hash
545      #var2utf8($hash) if ($options->{utf8});
546      
547      # old (wrong) attempts to get rid of used instances, if requested
548        #$obj->clear_refs;
549        #$self->{COREHANDLE}->unload($obj) if($options->{destroy});
550        #$obj->DESTROY;
551        #undef($obj) if($options->{destroy});
552      
553      return $hash;
554  }  }
555    
556  sub getSchema {  sub getSchema {

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.16

MailToCvsAdmin">MailToCvsAdmin
ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed