--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/06/06 11:40:40	1.39
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/06/25 22:57:54	1.40
@@ -1,8 +1,11 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.39 2003/06/06 11:40:40 jonen Exp $
+#  $Id: Tangram.pm,v 1.40 2003/06/25 22:57:54 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  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'
 #
@@ -499,67 +502,119 @@
   # 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,
-  #  );
-  
+    # 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") {
+    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}'";
+      #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);
 
-  # 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";
+  # 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
   
-  # get filtered list/set
-  @results = eval($evalstring);
-  die $@ if $@;
+  # 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 . $sorting . ');';
+    #print "eval: $evalstring", "\n";
+    # get filtered list/set
+    #@results = eval($evalstring);
+    #die $@ if $@;
+
+=pod
   # filter results
-  if($filters->[0]->{op} eq "ref") {
+  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};
@@ -571,6 +626,7 @@
       }
       @results = @filtered;
   }
+=cut
 
   #print "results: " . Dumper(\@results);
   
@@ -602,6 +658,13 @@
   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;
@@ -693,7 +756,10 @@
 
     if ($crud eq 'RETRIEVE') {
 
-      my $list = $self->getListFiltered($query->{node}, $query->{criterias});
+      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);