--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm 2003/04/05 21:24:09 1.31 +++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm 2003/07/01 23:24:17 1.42 @@ -1,8 +1,47 @@ ############################################ # -# $Id: Tangram.pm,v 1.31 2003/04/05 21:24:09 joko Exp $ +# $Id: Tangram.pm,v 1.42 2003/07/01 23:24:17 joko Exp $ # # $Log: Tangram.pm,v $ +# Revision 1.42 2003/07/01 23:24:17 joko +# now using package before using function +# +# Revision 1.41 2003/06/29 02:03:45 joko +# fix:? initialize schema on startup +# +# Revision 1.40 2003/06/25 22:57:54 joko +# major rework of "sub sendQuery / sub getListFiltered": now should be capable of "sorting" +# +# Revision 1.39 2003/06/06 11:40:40 jonen +# fixed bug at 'getFilteredList' +# +# Revision 1.38 2003/05/13 16:38:38 joko +# problems with "tied" on 5.6.1/win32 +# +# Revision 1.37 2003/05/10 17:37:39 jonen +# corrected last commit +# +# Revision 1.36 2003/05/10 17:31:18 jonen +# + added new functions related to 'create' item +# - createNode() +# # creates non-persistent 'deep dummy filled' object +# - insertChildNode() +# # inserts child node at given parent (child node haven't to exists, +# createNode will be injected transparently) +# +# Revision 1.35 2003/04/19 16:09:48 jonen +# + added operator dispatching (currently for getting ref-type) at 'getListFiltered' +# +# Revision 1.34 2003/04/11 01:18:53 joko +# sendQuery: +# + introduced crud action 'DELETE' +# +# Revision 1.33 2003/04/09 06:07:43 joko +# revamped 'sub sendQuery' +# +# Revision 1.32 2003/04/08 22:52:22 joko +# modified 'querySchema': better behaviour regarding filtering result +# # Revision 1.31 2003/04/05 21:24:09 joko # modified 'sub getChildNodes': now contains code from 'querySchema' # @@ -130,11 +169,12 @@ use Data::Dumper; use Tangram; +use Class::Tangram; use DesignPattern::Object; use Data::Storage::Result::Tangram; use Data::Mungle::Compare::Struct qw( isEmpty ); -use Data::Mungle::Transform::Deep qw( expand ); +use Data::Mungle::Transform::Deep qw( expand deep_copy merge_to ); # get logger instance my $logger = Log::Dispatch::Config->instance; @@ -157,10 +197,10 @@ #if (!$schema_tangram) { #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(); + $schema_tangram = $obj->getSchema() if $obj; #} if (!$schema_tangram) { - $logger->error( __PACKAGE__ . "->_initSchema: No Schema available for $self->{schema}" ); + $logger->error( __PACKAGE__ . "->_initSchema: No Schema available for $self->{locator}->{schema}." ); return 0; } #$self->_patchSchema(); @@ -206,8 +246,8 @@ # return; # } - #return unless $self->_initSchema(); - $self->_initSchema(); + return unless $self->_initSchema(); + #$self->_initSchema(); # create the main tangram storage object #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn ); @@ -235,7 +275,10 @@ my $self = shift; my $mode = shift; + my $filter = shift; + $mode ||= 'core'; + $filter ||= 'all'; $logger->debug( __PACKAGE__ . "->getChildNodes($mode)" ); @@ -277,12 +320,12 @@ push @concret_names, $_ if (!Class::Tangram::class_is_abstract($_)); $o_cnt++; } - - my $result = { - all => \@object_names, - concrete => \@concret_names, - }; - return $result; + + if ($filter eq 'all') { + return \@object_names; + } elsif ($filter eq 'concrete') { + return \@concret_names; + } } @@ -466,55 +509,133 @@ # redirect to unfiltered mode #return $self->getListUnfiltered(@_); - my $nodename = shift; - my $filters = shift; + my $in = {}; + $in->{nodename} = shift; + $in->{filters} = shift; + $in->{sorting} = shift; + my @results; - $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $nodename . "' )" ); + $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $in->{nodename} . "' )" ); -#print Dumper($filters); + #print Dumper($filters); + + # 1. "Remote Object Handle" - get set of objects from odbms by object name + my $remote = $self->{_COREHANDLE}->remote($in->{nodename}); + + # 2. Transfer $in to $orm_query + my $orm_query = {}; + # 2.a. Filters my @tfilters; + my $orm_filter = undef; - foreach my $filter (@$filters) { + foreach my $filter (@{$in->{filters}}) { # get filter - TODO: for each filter #my $filter = $filters->[0]; - - # build filter + + # 1. The parts of a filter source entry my $lexpr = $filter->{key}; #my $op = $filter->{op}; my $op = '='; my $rexpr = $filter->{val}; my $tight = 100; + + # 2. Build filter target entry - # my $tfilter = Tangram::Filter->new( - # expr => "t1.$lexpr $op '$rexpr'", - # tight => $tight, - # objects => $objects, - # ); - - # HACK: build eval-string (sorry) to get filtered list - please give advice here - push @tfilters, '$remote->{' . $filter->{key} . '}' . " $filter->{op} '$filter->{val}'"; + # Test 1 - didn't work out! + # my $tfilter = Tangram::Filter->new( + # expr => "t1.$lexpr $op '$rexpr'", + # tight => $tight, + # objects => $objects, + # ); + + my $orm_filter_tmp = undef; + # was: + # TODO: is_op? + # dispatch un-common operators if exists + if ($filter->{op} eq "ref") { + # do nothing, results will be filtered later cause 'tangram-filter' doesn't support 'ref' query + #print "Filter->op eq 'ref'.\n"; + #push @tfilters, 'ref($remote->{' . $filter->{key} . '})' . " eq '$filter->{val}'"; + } else { + # HACK: build eval-string (sorry) to get filtered list - please give advice here + #push @tfilters, '$remote->{' . $filter->{key} . '}' . " $filter->{op} '$filter->{val}'"; + # better: calculate expression right here! + #push @tfilters, '$remote->{' . $filter->{key} . '}' . " $filter->{op} '$filter->{val}'"; + + #print "key: ", $filter->{key}, "\n"; + + my $left = $remote->{$filter->{key}}; + #my $r = Tangram::Expr->new( 'string' => "'" . $filter->{val} . "'" ); + my $right = $filter->{val}; + my $op = $filter->{op}; + $orm_filter_tmp = $left->$op($right); + } + + if (not $orm_filter) { + $orm_filter = $orm_filter_tmp; + } else { + $orm_filter = $orm_filter->and($orm_filter_tmp); + } } - my $tfilter = join(' & ', @tfilters); + $orm_query->{filter} = $orm_filter; - # get set of objects from odbms by object name - my $remote = $self->{_COREHANDLE}->remote($nodename); - # was: - #@results = $self->{COREHANDLE}->select($object_set, $tfilter); + + # 2.b. sorting [new as of 2003-06-17] + if ($in->{sorting}) { + my $sorting_rules = []; + my $sorting_order = 'ASC'; + foreach my $sorting_column (keys %{$in->{sorting}}) { + $sorting_order = $in->{sorting}->{$sorting_column} if $in->{sorting}->{$sorting_column}; + push @$sorting_rules, Tangram::Expr->new( 'string' => $sorting_column ); + } + $orm_query->{order} = $sorting_rules; + if ($sorting_order eq 'DESC') { + $orm_query->{desc} = 1; + } + } + + + # 3. build and issue query - return result as Tangram::Cursor + + # coerce hash into array (This is valid in Perl) + my @orm_query_args = %$orm_query; + # send query (arguments) to orm + @results = $self->{_COREHANDLE}->select($remote, @orm_query_args); + + #my $cursor = $self->{_COREHANDLE}->cursor($remote, @orm_query_args); + #return $cursor; + #print Dumper(@results); # is: # 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 $@; + #my $evalstring = 'return $self->{_COREHANDLE}->select($remote, ' . $tfilter . $sorting . ');'; + #print "eval: $evalstring", "\n"; + # get filtered list/set + #@results = eval($evalstring); + #die $@ if $@; + +=pod + # filter results + if ($filters->[0]->{op} && ($filters->[0]->{op} eq "ref")) { + #print "Filter->op eq 'ref'.\n"; + my $att_name = $filters->[0]->{key}; + my $att_val = $filters->[0]->{val}; + my @filtered; + foreach(@results) { + if(ref($_->{$att_name}) eq $att_val) { + push @filtered, $_; + } + } + @results = @filtered; + } +=cut + + #print "results: " . Dumper(\@results); return \@results; } @@ -544,60 +665,180 @@ return $result; } +sub createResult { + my $self = shift; + my $rh = shift; + my $result = Data::Storage::Result::Tangram->new( RESULTHANDLE => $rh ); + return $result; +} + sub sendQuery { my $self = shift; my $query = shift; - #my $sql = "SELECT cs FROM $self->{metainfo}->{$descent}->{node} WHERE $self->{metainfo}->{$descent}->{IdentProvider}->{arg}='$self->{entry}->{source}->{ident}';"; - #my $result = $self->{metainfo}->{$descent}->{storage}->sendCommand($sql); #print Dumper($query); - # HACK: special case: querying by id does not translate into a common tangram query - # just load the object by given id(ent) - if ($query->{criterias}->[0]->{key} eq 'id' && $query->{criterias}->[0]->{op} eq 'eq') { - #print "LOAD!!!", "\n"; - #exit; - #return Set::Object->new( $self->{COREHANDLE}->load($query->{criterias}->[0]->{val}) ); - my $ident = $query->{criterias}->[0]->{val}; -#print "load obj", "\n"; - #return $self->createSet() if $ident == 5; - $self->{_COREHANDLE}->unload($ident); - my $object = $self->{_COREHANDLE}->load($ident); -#print "get id", "\n"; - my $oid = $self->{_COREHANDLE}->id($object); -#print Dumper($object); -#print "oid: $oid", "\n"; - return $self->createSet($object); - #return $self->createSet( $self->{COREHANDLE}->load('300090018') ); - } - - 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!"); + # type = ITEM|LIST|TRANSPARENT + my $type = ''; + # mode = OID|SPECIAL + my $mode = ''; + my $ident = ''; + my $crud = ''; + + + # dispatch type and mode + + # defaults - 1 + if ($query->{options}) { + $crud = $query->{options}->{crud}; + $crud ||= $query->{options}->{action}; + } + # defaults - 2 + $type ||= 'TRANSPARENT'; + $crud ||= 'RETRIEVE'; + + if ($query->{options}->{OID}) { + $type = 'ITEM'; + $mode = 'OID'; + $ident = $query->{options}->{OID}; + + } elsif (my $guid = $query->{options}->{GUID}) { + $type = 'TRANSPARENT'; + $query->{criterias} = [ { key => 'guid', op => 'eq', val => $guid } ]; + + # if operator is different (dispatcher for 'getListFiltered') + } elsif (my $op = $query->{options}->{op}) { + $type = 'TRANSPARENT'; + $query->{criterias} = [ { key => $query->{options}->{meta_label}, op => $op, val => $query->{options}->{meta_value} } ]; + } + + # HACK: special case: querying by id does not translate into a common tangram query + # just load the object by given identifier (OID) named 'id' - this is required by Data::Transfer::Sync! + if ($query->{criterias} && ($query->{criterias}->[0]->{key} eq 'id' && $query->{criterias}->[0]->{op} eq 'eq')) { + $type = 'ITEM'; + $mode = 'SPECIAL.SYNC'; + $ident = $query->{criterias}->[0]->{val}; + } + + + # execute query + my $result; + + if ($type eq 'ITEM' && $ident) { + + if ($mode eq 'OID') { + # TODO: review this case! + $result = $self->getObject($ident, $query->{options}); + + } elsif ($mode eq 'SPECIAL.SYNC') { + + # V1 - failed + #return Set::Object->new( $self->{COREHANDLE}->load($query->{criterias}->[0]->{val}) ); + + # hmm.... + #return $self->createSet() if $ident == 5; + + # Unload single object before doing any further operations to + # expect a "fresh" object from orm when performing the next calls. + $self->{_COREHANDLE}->unload($ident); + + # Load object from orm. + my $object = $self->{_COREHANDLE}->load($ident); + + # determine object identifier (OID) + my $oid = $self->{_COREHANDLE}->id($object); + + # encapsulate into result/response container and return this one + $result = $self->createSet($object); + + # debugging + #$result = $self->createSet( $self->{COREHANDLE}->load('300090018') ); + } + + + } elsif ($type eq 'TRANSPARENT') { + + if ($crud eq 'RETRIEVE') { + + my $list = $self->getListFiltered($query->{node}, $query->{criterias}, $query->{sorting}); + #return $list; + return $self->createResult($list); + + #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!"); + + # 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 = ''; + $op = '=' if lc $_->{op} eq 'eq'; + push @crits, "$_->{key}$op'$_->{val}'"; + } + my $subnodes = {}; + map { $subnodes->{$_}++ } @{$query->{subnodes}}; + # HACK: this is hardcoded ;( expand possibilities! + #my $crit = join(' AND ', @crits); + #my $sql = hash2Sql($query->{node}, $subnodes, 'SELECT', $crit); + #return $self->sendCommand($sql); + #my $h = $self->{COREHANDLE}->remote($query->{node}); + #my $res = $self->{COREHANDLE}->select($h, $h->{); + $result = $self->createCursor($query->{node}); + + } elsif ($crud eq 'UPDATE') { + + # Patch current query to be a loader (e.g. change action, remove payload) ... + my $childquery = deep_copy($query); + $childquery->{options}->{crud} = 'RETRIEVE'; + delete $childquery->{payload}; + + # ... to use it to fetch a fresh object using ourselves (sendQuery). + my $cursor = $self->sendQuery($childquery); + my $status = $cursor->getStatus(); + my $object = $cursor->getNextEntry(); + + # Merge values and apply value modifiers. + my $options = { utf8 => 1, php => 1 }; + merge_to($object, $query->{payload}, $options); + + # Execute update operation at orm. + $self->update($object); + + } elsif ($crud eq 'DELETE') { + + # Patch current query to be a loader (e.g. change action) ... + my $childquery = deep_copy($query); + $childquery->{options}->{crud} = 'RETRIEVE'; + + # ... to use it to fetch a fresh object using ourselves (sendQuery). + my $cursor = $self->sendQuery($childquery); + my $status = $cursor->getStatus(); + my $object = $cursor->getNextEntry(); + + $self->erase($object); + + } elsif ($crud eq 'CREATE') { + + my $nodename = $query->{node}; + my $newnode = $self->createNode($nodename); + my $id = $self->{_COREHANDLE}->insert($newnode); + + print "Saved new node $nodename with GUID $newnode->{guid}, OID '$id': " . Dumper($newnode) . "\n"; + + return $newnode; + + } + + } + + return $result; - # 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 = ''; - $op = '=' if lc $_->{op} eq 'eq'; - push @crits, "$_->{key}$op'$_->{val}'"; - } - my $subnodes = {}; - map { $subnodes->{$_}++ } @{$query->{subnodes}}; - # HACK: this is hardcoded ;( expand possibilities! - #my $crit = join(' AND ', @crits); - #my $sql = hash2Sql($query->{node}, $subnodes, 'SELECT', $crit); - #return $self->sendCommand($sql); - #my $h = $self->{COREHANDLE}->remote($query->{node}); - #my $res = $self->{COREHANDLE}->select($h, $h->{); - return $self->createCursor($query->{node}); } sub eraseAll { @@ -633,7 +874,7 @@ return $object if $object; } -sub getObjectByGuid { +sub getObjectByGuid_old { my $self = shift; my $guid = shift; my $options = shift; @@ -663,7 +904,7 @@ } -sub getObjectAsHash { +sub getObjectAsHash_old { my $self = shift; my $oid = shift; my $options = shift; @@ -746,5 +987,132 @@ $self->{dataStorageLayer}->disconnect(); } + +sub createNode { + my $self = shift; + my $classname = shift; + + my $obj = $classname->new(); + + my $attr_options = Class::Tangram::attribute_options($classname); + #print "Attribute Options: " . Dumper($attr_options); + + my $attr_types = Class::Tangram::attribute_types($classname); + #print "Attribute Types: " . Dumper($attr_types); + + foreach(keys %{$attr_types}) { + if($attr_types->{$_} eq 'string') { + $obj->{$_} = ''; + } elsif($attr_types->{$_} eq 'int') { + $obj->{$_} = 0; + } elsif($attr_types->{$_} eq 'real') { + $obj->{$_} = 0; + } elsif($attr_types->{$_} eq 'rawdatetime') { + $obj->{$_} = '0000-00-00 00:00:00'; + } elsif($attr_types->{$_} eq 'ref') { + if($attr_options->{$_}->{class}) { + $obj->{$_} = $self->createNode($attr_options->{$_}->{class}); + } else { + #$obj->{$_} = undef(); + } + } elsif($attr_types->{$_} eq 'iarray') { + $obj->{$_} = [ ]; + } elsif($attr_types->{$_} eq 'hash') { + $obj->{$_} = { }; + } elsif($attr_types->{$_} eq 'flat_hash') { + $obj->{$_} = { }; + } + } + + #print "New Object: " . Dumper($obj); + + return $obj; +} + + + sub insertChildNode { + my $self = shift; + my $child_entry = shift; + my $query_args = shift; + + my $core = $self->{_COREHANDLE}; + my $nodename = $query_args->{nodename}; + + # get parent object + my $query = { + node => $query_args->{parent}->{nodename}, + options => { GUID => $query_args->{parent}->{guid}, }, + }; + my $cursor = $self->sendQuery($query); + my $parent = $cursor->getNextEntry(); + + # debug + #print "Parent_org: " . Dumper($parent); + + # Create child node object if isn't already done + # ($child_entry have to be the class name then...) + if(!ref($child_entry)) { + $child_entry = $self->createNode($child_entry); + # it could be insert 'manually' or will be insert 'transparent' if parent will be updated + #$core->insert($child_entry); + #print "Create child object [$nodename]: " . Dumper($child_entry); + } + + # get reference of tied node (seems, only on Linux node's are tied!!) + my $tied_node = tied $parent->{$nodename}; + + # insert/change child entry at parent + #print "reference: " . ref($parent->{$nodename}) . "\n"; + if(ref($parent->{$nodename}) eq 'ARRAY') { + # (seems, only on Linux node's are tied!!) + if($tied_node) { + # all tangram types are tied as 'SCALAR' with special 'FETCH', 'STORE' methods per type, + # so a 'PUSH' is not implemented (which could be then done transparently) + my $array = $tied_node->FETCH; + push @$array, $child_entry; + $tied_node->STORE($array); + # node will be normaly untied at 'STORE' + if(tied $parent->{$nodename}) { print "already tied !!\n"; } + else { undef $tied_node; } + } else { + push @{$parent->{$nodename}}, $child_entry; + } + } + elsif(ref($parent->{$nodename}) eq 'HASH') { + if(my $key = $query_args->{hash_key}) { + # (seems, only on Linux node's are tied!!) + if($tied_node) { + # same problem as with 'ARRAY': + # all tangram types are tied as 'SCALAR' with special 'FETCH', 'STORE' methods per type. + my $hash = $tied_node->FETCH; + $hash->{$key} = $child_entry; + $tied_node->STORE($hash); + # node will be normaly untied at 'STORE' + if(tied $parent->{$nodename}) { print "already tied !!\n"; } + else { undef $tied_node; } + } else { + $parent->{$nodename}->{$key} = $child_entry; + } + } else { + print "ERROR: No HASH KEY given, so not able to insert hash entry!"; + } + } + else { + $parent->{$nodename} = $child_entry; + } + + # debug + #print "Parent_new: " . Dumper($parent); + + # save parent + $core->update($parent); + + # debug + #print "Saved Parent: ". Dumper($parent); + + return $child_entry; + } + + 1; __END__