--- nfo/perl/libs/Data/Mungle/Transform/Deep.pm	2003/04/04 17:31:23	1.20
+++ nfo/perl/libs/Data/Mungle/Transform/Deep.pm	2003/05/10 17:09:18	1.22
@@ -1,7 +1,13 @@
 ## ---------------------------------------------------------------------------
-##  $Id: Deep.pm,v 1.20 2003/04/04 17:31:23 joko Exp $
+##  $Id: Deep.pm,v 1.22 2003/05/10 17:09:18 jonen Exp $
 ## ---------------------------------------------------------------------------
 ##  $Log: Deep.pm,v $
+##  Revision 1.22  2003/05/10 17:09:18  jonen
+##  + added keep of empty arrays/hashes if 'expand' for php
+##
+##  Revision 1.21  2003/04/09 07:21:56  joko
+##  childObj2string now inside Encode.pm, renamed to 'twingle_reference'
+##
 ##  Revision 1.20  2003/04/04 17:31:23  joko
 ##  minor update to 'childObj2string'
 ##
@@ -90,7 +96,7 @@
 use Iterate;
 
 use Pitonyak::DeepCopy;
-use Data::Mungle::Transform::Encode qw( latin_to_utf8 latin_to_utf8_scalar utf8_to_latin utf8_to_latin_scalar );
+use Data::Mungle::Transform::Encode qw( latin_to_utf8 latin_to_utf8_scalar utf8_to_latin utf8_to_latin_scalar twingle_reference );
 use Data::Mungle::Code::Ref qw( ref_slot );
 
 sub numhash2list {
@@ -172,7 +178,11 @@
   #print "ref: ", ref $obj, "\n";
 
   if (ref $obj eq 'ARRAY') {
-
+   
+   # if we expand for php, keep empty ARRAY
+   if($#$obj == -1 && $options->{childObj2string}) {
+     $result = $obj;
+   } else {
     IterArray @$obj, sub {
       my $item;
       # if current item is a reference ...
@@ -181,7 +191,7 @@
         # if $options->{childObj2string} is TRUE or STRING don't expand referenced object,
         # instead replace it by per option choosed string (default: o_<classname>_<ref type>_<guid> ) 
         if ($item && $options->{childObj2string}) {
-          $item = childObj2string($item, $options->{childObj2string});
+          $item = twingle_reference($item);
         } else {
           # ... expand structure recursively
           $item = expand($_[0], $options);
@@ -201,6 +211,7 @@
       push(@{$result}, $item);                 # use item in any case
 
     }
+   }
 
   } elsif (ref $obj eq 'CODE') {
     #print Dumper($obj);
@@ -208,7 +219,12 @@
 
   # TODO: "} elsif (ref $obj eq 'HASH') { [...] } else { croak 'could not deref blah'; }"  ???
   } elsif (ref $obj) {
-
+   
+   # if we expand for php, keep empty HASH
+   my @tmp = keys %$obj;
+   if($#tmp == -1 && $options->{childObj2string}) {
+     $result = $obj;
+   } else {
     IterHash %$obj, sub {
       my $item;
       
@@ -217,8 +233,8 @@
         $item = $_[1];
         # if $options->{childObj2string} is TRUE or STRING don't expand referenced object,
         # instead replace it by per option choosed string (default: o_<classname>_<ref type>_<guid> ) 
-        if ($item && $options->{childObj2string} && !(ref $_[1] eq "ARRAY") && !(ref $_[1] eq "HASH")) {
-          $item = childObj2string($item, $options->{childObj2string});
+        if ($item && $options->{childObj2string} && !(ref $_[1] eq "ARRAY") && !(ref $_[1] eq "HASH") && !(ref $_[1] eq "Set::Object")) {
+          $item = twingle_reference($item);
         } else {
           # ... expand structure recursively
           $item = expand($_[1], $options);
@@ -237,6 +253,7 @@
       #$result->{$_[0]} = $item if $item;   # use item only if not undef  (TODO: make configurable via $options)
       $result->{$_[0]} = $item;               # use item in any case
     }
+   }
 
   } else {
     #die ("not a reference!");
@@ -494,24 +511,5 @@
 }
 
 
-# encodes object-references to serialized string representations
-# made up of:
-#   - 'o_<classname>_<ref type>_<guid>'???
-#   - 'o_{guid}_{classname}'!!!
-sub childObj2string {
-  my $obj = shift;
-  my $option = shift; 
-  my $string = 'n/a';
-  
-  if ($option == 1) {
-    if ((my $classname = ref $obj) && (my $guid = $obj->{guid})) {
-      $string = join('_', 'o', $guid, $classname);
-    }  
-  }
-  
-  return $string;
-}
-
-
 1;
 __END__