Changeset 22751

Timestamp:

06/30/09 18:05:47 (1 year ago)

Author:

bergie

Message:

Bulletproofing related to Ragnaland, refs #1251

Files:

• branches/ragnaroek/midcom/midcom.core/midcom/baseclasses/core/dbobject.php (modified) (6 diffs)

branches/ragnaroek/midcom/midcom.core/midcom/baseclasses/core/dbobject.php

@@ -106 +106 @@
-        debug_push_class($object, __FUNCTION__);
-
-
+
+
-        {
-            $rcs =& $_MIDCOM->get_service('rcs');
@@ -423 +424 @@
-        {
-            $tmp = new $object->__mgdschema_class_name__();
-
+
+
-            {
-                debug_push_class($object, __FUNCTION__);
-
+/#1251
-                    MIDCOM_LOG_CRIT);
-                debug_add("We tried to load object {$object->id} and got: " . midgard_connection::get_error_string());
-                $object->delete();
-                $_MIDCOM->generate_error(MIDCOM_ERRCRIT,
-'Workaround for #72/#118: Failed to load GUID for ID {$object->id} ('
+"Workaround for #72/#118/#1251: Failed to load GUID for ID {$object->id} ("
-                    . midgard_connection::get_error_string()
-                    . '). Object could not be created.');
@@ -447 +449 @@
-        $object->_on_created();
-        $_MIDCOM->componentloader->trigger_watches(MIDCOM_OPERATION_DBA_CREATE, $object);
-
+
+
-        {
-            $rcs =& $_MIDCOM->get_service('rcs');
@@ -478 +481 @@
-    function delete_pre_checks(&$object)
-    {
+        if (!$object->id)
+        {
+            debug_push_class($object, __FUNCTION__);
+            debug_add("Failed to delete object, object " . get_class($object) . " is non-persistent (empty ID).", MIDCOM_LOG_ERROR);               
+            debug_pop();
+            return false;
+        }
+
-        // Current language is not zero, selective delete to prevent deleting too much of objects.
-        // Object will not be deleted if it doesn't have a language property at all or if its
@@ -682 +693 @@
-        $object->_on_deleted();
-        $_MIDCOM->componentloader->trigger_watches(MIDCOM_OPERATION_DBA_DELETE, $object);
-
+
+
-        {
-            $rcs =& $_MIDCOM->get_service('rcs');
@@ -1282 +1294 @@
-    function get_by_id(&$object, $id)
-    {
+        if (!$id)
+        {
+            debug_push_class($object, __FUNCTION__);
+            debug_add("Failed to load " . get_class($object) . " object, incorrect ID provided.", MIDCOM_LOG_ERROR);
+            self::_clear_object($object);
+            debug_pop();
+            return false;
+        }
+
-        if (   !isset($object->__object)
-            || !$object->__object)