Changeset 11915

Timestamp:

08/30/07 20:24:14 (1 year ago)

Author:

rambo

Message:

refs #102

querybuilder: minor fix in to-be-deprecated execute_notwindowed adjusted
comments

collector: made _unchecked methdos work like QB counterparts (ie
limit/offset is applied before execution and ACLs checked later, see
method documentation) adjusted comments, etc

Files:

• trunk/midcom/midcom.core/midcom/core/collector.php (modified) (17 diffs)
• trunk/midcom/midcom.core/midcom/core/querybuilder.php (modified) (6 diffs)

trunk/midcom/midcom.core/midcom/core/collector.php

@@ -101 +101 @@
-     * the query.
-     *
+     * NOTE: Checks not implemented yet
+     *
-     * Be aware, that this setting will currently not use the QB to filter the objects accordingly,
-     * since there is no way yet to filter against parameters. This will mean some performance
-     * impact.
-     *
-
-
-
+
+
+
+
+
+
+
-
-    /**
@@ -158 +164 @@
-        // MidCOM's collector always uses the GUID as the key for ACL purposes
-        $this->_mc->set_key_property('guid');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -181 +182 @@
-        call_user_func_array(array($this->_real_class, '_on_prepare_new_collector'), array(&$this));
-    }
-
-
-    /**
@@ -192 +192 @@
-     * 1. bool _on_prepare_exec_collector(&$this) is called before the actual query execution. Return false to
-     *    abort the operation.
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-     */
-    function execute()
@@ -212 +203 @@
-            debug_add('The _on_prepare_exec_collector callback returned false, so we abort now.');
-            debug_pop();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
+    /**
+     * Resets some internal variables for re-execute
+     */
+    function _reset()
+    {
+        $this->_executed = false;
+        $this->count = -1;
+        $this->denied = 0;
+    }
+
+    /**
+     * Runs a query where <i>limit and offset is taken into account prior to
+     * execution in the core.</i>
+     *
+     * This is useful in cases where you can safely assume read privileges on all
+     * objects, and where you would otherwise have to deal with huge resultsets.
+     *
+     * Be aware that this might lead to empty resultsets "in the middle" of the
+     * actual full resultset when read privileges are missing.
+     *
+     * @see list_keys()
+     */
-    function list_keys_unchecked()
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function list_keys()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
-        $newresult = array();
-
-
-
-
-
-
-
-
+
-        $limit = $this->_limit;
-        $offset = $this->_offset;
-
-
+
-        foreach ($result as $object_guid => $empty_copy)
-        {
+            // We have hit our limit
-            if (   $this->_limit > 0
-                && $limit == 0)
-            {
-
-
+
-            }
-
@@ -274 +337 @@
-                debug_add("Failed to load result, read privilege on {$object_guid} not granted for the current user.", MIDCOM_LOG_INFO);
-                $this->denied++;
-                $skipped_objects++;
-                continue;
-            }
@@ -292 +354 @@
-            }
-
-array()
+$empty_copy
-
-            if ($this->_limit > 0)
@@ -302 +364 @@
-        call_user_func_array(array($this->_real_class, '_on_process_collector_result'), array(&$newresult));
-
-        /* This must some QB copy-paste leftover
-        // correct record count by the number of limit-skipped objects.
-        $this->count = count($newresult) + $skipped_objects;
-        */
-        $this->count = count($newresult);
-
-        debug_pop();
-        return $newresult;
-    }
@@ -350 +407 @@
-    function add_constraint($field, $operator, $value)
-    {
+        $this->_reset();
-        // Add check against null values, Core QB is too stupid to get this right.
-        if ($value === null)
@@ -381 +439 @@
-    function add_order($field, $ordering = null)
-    {
+        /**
+         * NOTE: So see also querybuilder.php when making changes here
+         */
-        if (empty($field))
-        {
@@ -396 +457 @@
-        if ($ordering === null)
-        {
-
+
+
+
+
+
+
+
+
-        }
-        else
@@ -446 +514 @@
-     * @param int $count The maximum number of records in the resultset.
-     */
-
-
-
+
+
+
+
-    }
-
@@ -463 +532 @@
-    function set_offset($offset)
-    {
+        $this->_reset();
-        $this->_offset = $offset;
-    }
@@ -475 +545 @@
-    function set_lang($language)
-    {
+        $this->_reset();
-        $this->_mc->set_lang($language);
-    }
@@ -495 +566 @@
-     * Returns the number of elements matching the current query.
-     *
-
-
-
-
-
-
-
-
-
-
-
+
-     *
-     * @return int The number of records found by the last query.
@@ -513 +574 @@
-        if ($this->count == -1)
-        {
-
-
+
+
+
+
+
-        }
-        return $this->count;
@@ -528 +592 @@
-     * mind might nevertheless be able to take advantage of it.
-     *
-last query without taking access control
+constraints without taking access control or visibility
-     */
-    function count_unchecked()
-    {
+        $this->_reset();
+        if ($this->_limit)
+        {
+            $this->_mc->set_limit($this->_limit);
+        }
+        if ($this->_offset)
+        {
+            $this->_mc->set_offset($this->_offset);
+        }
-        return $this->_mc->count();
-    }
-}
-
-
-?>

trunk/midcom/midcom.core/midcom/core/querybuilder.php

@@ -591 +591 @@
-        $limit = $this->_limit;
-        $offset = $this->_offset;
-        $skipped_objects = 0;
-        $this->denied = 0;
-
@@ -599 +598 @@
-                && $limit == 0)
-            {
-
-
+
-            }
-
@@ -627 +625 @@
-
-    /**
-
-
+
-     * execution in the core.</i>
-     *
@@ -733 +730 @@
-    function add_order($field, $ordering = null)
-    {
+        /**
+         * NOTE: So see also collector.php when making changes here
+         */
-        if (! $field)
-        {
@@ -854 +854 @@
-     * Returns the number of elements matching the current query.
-     *
- to get
+
-     *
-     * @return int The number of records found by the last query.
@@ -891 +891 @@
-    }
-}
+
-?>