Changeset 17761

Timestamp:

09/29/08 15:43:40 (2 months ago)

Author:

rambo

Message:

forward port r17759

Files:

• trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php (modified) (8 diffs)

trunk/midcom/midcom.core/midcom/baseclasses/core/dbobject.php

@@ -669 +669 @@
-    function undelete($guids, $type)
-    {
+        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_print_r("called type '{$type}' for \$guids:", $guids);
+        debug_pop();
-        static $undeleted_size = 0;
-        
@@ -680 +683 @@
-            );
-        }
-
+
+
-        foreach ($guids as $guid)
-        {
@@ -687 +691 @@
-            {
-                // Purged, skip
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Object identified with GUID {$guid} is purged, cannot undelete", MIDCOM_LOG_INFO);
+                debug_pop();
-                continue;
-            }
@@ -706 +713 @@
-                }
-            }
+            if (!$undeleted)
+            {
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Failed to undelete object with GUID {$guid} errstr: " . mgd_errstr(), MIDCOM_LOG_ERROR);
+                debug_pop();
+            }
+            $stats[$guid] = $undeleted;
-            
-            // FIXME: We should only undelete parameters & attachments deleted inside some small window of the main objects delete
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Calling midcom_baseclasses_core_dbobject::undelete_parameters({$guid});");
+            debug_pop();
-            midcom_baseclasses_core_dbobject::undelete_parameters($guid);
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Calling midcom_baseclasses_core_dbobject::undelete_attachments({$guid});");
+            debug_pop();
-            midcom_baseclasses_core_dbobject::undelete_attachments($guid);
-
@@ -714 +734 @@
-            $children_types = $ref->get_child_objects($object, true);
-            
-!$children_types
-
-return tr
+empty($children_types)
+
+contin
-            }
-
@@ -732 +752 @@
-            }
-        }
+        foreach ($stats as $guid => $bool)
+        {
+            if (!$bool)
+            {
+                return false;
+            }
+        }
+        return true;
-    }
-
@@ -774 +802 @@
-            }
-        }
+        return true;
-    }
-
@@ -822 +851 @@
-            }
-        }
+        return true;
-    }
-