--- nfo/perl/libs/Data/Mungle/Transform/Deep.pm	2003/02/20 21:13:54	1.11
+++ nfo/perl/libs/Data/Mungle/Transform/Deep.pm	2003/02/27 14:39:48	1.15
@@ -1,7 +1,20 @@
 ## ---------------------------------------------------------------------------
-##  $Id: Deep.pm,v 1.11 2003/02/20 21:13:54 joko Exp $
+##  $Id: Deep.pm,v 1.15 2003/02/27 14:39:48 jonen Exp $
 ## ---------------------------------------------------------------------------
 ##  $Log: Deep.pm,v $
+##  Revision 1.15  2003/02/27 14:39:48  jonen
+##  + fixed bug at _hash2object()
+##
+##  Revision 1.14  2003/02/22 17:13:55  jonen
+##  + added function 'childObject2string()' to encode 'child'-references to option related string
+##  + use new option at 'expand()' for replacing 'childObject2string'
+##
+##  Revision 1.13  2003/02/21 01:48:50  joko
+##  renamed core function
+##
+##  Revision 1.12  2003/02/20 22:45:19  joko
+##  fix regarding new deep_copy
+##
 ##  Revision 1.11  2003/02/20 21:13:54  joko
 ##  - removed implementation of deep_copy2 - get this from the Pitonyak namespace (now cloned to repository)
 ##
@@ -61,6 +74,7 @@
 use Data::Dumper;
 use Iterate;
 
+use Pitonyak::DeepCopy;
 use Data::Transform::Encode qw( latin_to_utf8 latin_to_utf8_scalar utf8_to_latin utf8_to_latin_scalar );
 use Data::Code::Ref qw( ref_slot );
 
@@ -132,6 +146,8 @@
 }
 
 
+# convert values in hash to utf8 (and back) to be ready for (e.g.) encapsulation in XML
+# but still using the known latin locale stuff
 sub expand {
 
   my $obj = shift;
@@ -146,8 +162,15 @@
       my $item;
       # if current item is a reference ...
       if (ref $_[0]) {
-        # ... expand structure recursively
-        $item = expand($_[0], $options);
+        $item = $_[0];
+        # 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});
+        } else {
+          # ... expand structure recursively
+          $item = expand($_[0], $options);
+        }
         # destroy item via seperate callback method (a POST) if requested
         #$options->{cb}->{destroy}->($_[0]) if $options->{destroy};
 
@@ -176,8 +199,15 @@
       
       # if current item is a reference ...
       if (ref $_[1]) {
-        # ... expand structure recursively
-        $item = expand($_[1], $options);
+        $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});
+        } else {
+          # ... expand structure recursively
+          $item = expand($_[1], $options);
+        }
         # destroy item via seperate callback method (a POST) if requested
         #$options->{cb}->{destroy}->($_[1]) if $options->{destroy};
       
@@ -201,7 +231,7 @@
 
   # convert all values to utf8 (inside complex struct)
     # now done in core-item-callbacks via Greg London's "Iterate" from CPAN
-    # var2utf8($result) if ($options->{utf8});
+    # latin_to_utf8($result) if ($options->{utf8});
 
   # destroy persistent object from memory to be sure to get a fresh one next time
   #undef $obj if $options->{destroy};
@@ -278,7 +308,7 @@
   numhash2list($data) if ($options->{php});
 
   # utf8-conversion/-encoding (essential for I18N)
-  var_utf2iso($data) if ($options->{utf8});
+  utf8_to_latin($data) if ($options->{utf8});
 
   # get fresh object from database
   # todo:
@@ -445,8 +475,21 @@
 # Copyright 2002, Andrew Pitonyak (perlboy@pitonyak.org)
 # please visit: http://www.pitonyak.org/code/perl/Pitonyak/DeepCopy.pm.html
 sub deep_copy {
-  Pitonyak::deep_copy(@_);
+  Pitonyak::DeepCopy::deep_copy(@_);
 }
 
+
+sub childObj2string {
+  my $obj = shift;
+  my $option = shift; 
+  my $classname = ref $obj;
+  
+  if($option == 1) {
+    my $string = "o_" . $classname . "_" .$obj->{guid};
+    return $string;
+  }  
+}
+
+
 1;
 __END__