Changeset 11855

Timestamp:

08/30/07 12:10:21 (1 year ago)

Author:

adrenalin

Message:

Dropping out excessive debug logs and using midgard_collector instead
of midgard_query_builder

refs #102

Files:

• trunk/midcom/midcom.core/midcom/helper/_basicnav.php (modified) (32 diffs)
• trunk/midcom/midcom.core/midcom/helper/nav.php (modified) (28 diffs)

trunk/midcom/midcom.core/midcom/helper/_basicnav.php

@@ -56 +56 @@
- * Basically for each leaf the usual meta information is returned:
- *
+ * - MIDCOM_NAV_URL      => URL of the leaf element
+ * - MIDCOM_NAV_NAME     => Name of the leaf element
- * - MIDCOM_META_CREATOR => Creator of the element (MidgardPerson)
- * - MIDCOM_META_CREATED => Creation date (UNIX Timestamp)
@@ -63 +65 @@
- * - MIDCOM_NAV_TOOLBAR  => Toolbar data (see below)
- *
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
- * <pre>
-
-
-
+
+
+
+
+
- * </pre>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
- * (1) by copying the values.
- *
@@ -149 +116 @@
- * <b>DEPRECATED INFORMATION</b>
- *
-The k
+K
- * automatically. The key is set to true for all values now for backwards compatibility and will
- * be removed entirely in MidCOM 2.6.0
-
-
+
+
+
+
+
- * @package midcom
- */
@@ -253 +223 @@
-
-    /**
-     * This one is true, if the system is in content administration mode and therefore
-     * working with a different topic. See Constructor Documentation for details.
-     *
-     * @var bool
-     */
-    var $_adminmode;
-
-    /**
-     * This is a temporary storage where _loadNode can return the last known good
-     * node in case the current node not visible. It is evaluated by the
@@ -301 +263 @@
-    function midcom_helper__basicnav($context = 0)
-    {
-        debug_push("_basicnav::constructor");
-
-        $tmp = $_MIDCOM->get_context_data($context, MIDCOM_CONTEXT_ROOTTOPIC);
-        $this->_root = $tmp->id;
@@ -312 +272 @@
-        $this->_nodes = array();
-        $this->_loader =& $_MIDCOM->get_component_loader();
-        if ($_MIDCOM->get_context_data($context, MIDCOM_CONTEXT_REQUESTTYPE) == MIDCOM_REQUEST_CONTENTADM)
-        {
-            $this->_adminmode = true;
-        }
-        else
-        {
-            $this->_adminmode = false;
-        }
-
-        $current = $_MIDCOM->get_context_data($context, MIDCOM_CONTEXT_CONTENTTOPIC);
@@ -340 +292 @@
-
-            case MIDCOM_ERRFORBIDDEN:
-
-
+
-                $this->_current = $this->_lastgoodnode;
-                break;
-
-            default:
+                debug_push("_basicnav::constructor");
-                debug_add("_loadNode failed, see above error for details.", MIDCOM_LOG_ERROR);
-                debug_pop();
@@ -353 +305 @@
-        // Reset the Root node's URL Parameter to an empty string.
-        $this->_nodes[$this->_root][MIDCOM_NAV_URL] = '';
-
-        debug_pop();
-    }
-
@@ -371 +321 @@
-    function _get_node($id)
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        /*
-        $this->_nap_cache->open();
@@ -396 +344 @@
-        if (is_null($nodedata))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add('We got NULL for this node, so we do not have any NAP information, returning null directly.');
-            debug_pop();
@@ -410 +359 @@
-        $nodedata[MIDCOM_NAV_TOOLBAR] = null;
-
-        debug_pop();
-        return $nodedata;
-    }
@@ -426 +374 @@
-    function _get_node_from_database($node)
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        if (is_object($node))
-        {
@@ -436 +382 @@
-            // Load the topic first.
-            $topic = new midcom_db_topic($node);
- 
+
-                || !$topic->guid)
-            {
+                debug_push_class(__CLASS__, __FUNCTION__);
-                debug_add("Could not load the topic {$node} through DBA; assuming missing privileges.", MIDCOM_LOG_INFO);
-                debug_pop();
@@ -445 +392 @@
-        }
-
-        debug_add("Trying to load NAP data for topic {$topic->name} (#{$topic->id})");
-
-        // Retrieve a NAP instance
-        // if we are missing the component, use the nullcomponent.
-        if (!array_key_exists( $topic->component, $_MIDCOM->componentloader->manifests)) 
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("The topic {$topic->id} has no component assigned to it, using nullcomponent.",
-                MIDCOM_LOG_ERROR);
+            debug_pop();
-            $topic->component = 'midcom.core.nullcomponent';
-        }
-        $path = $topic->component;
+        
-        /*
-        if (!$path)
@@ -470 +418 @@
-        }
-        */
+        
-        $interface =& $this->_loader->get_interface_class($path);
-        if (!$interface)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Could not get interface class of '{$path}' to the topic {$topic->id}, cannot add it to the NAP list.",
-                MIDCOM_LOG_ERROR);
@@ -480 +430 @@
-        if (! $interface->set_object($topic))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Could not set the NAP instance of '{$path}' to the topic {$topic->id}, cannot add it to the NAP list.",
-                MIDCOM_LOG_ERROR);
+            debug_pop();
-            return null;
-        }
@@ -491 +443 @@
-        if (is_null($nodedata))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("The component '{$path}' did return null for the topic {$topic->id}, indicating no NAP information is available.");
-            debug_pop();
@@ -549 +502 @@
-        $nodedata[MIDCOM_NAV_VISIBLE] = true;
-
-        debug_pop();
-        return $nodedata;
-    }
@@ -602 +554 @@
-        }
-
- Don't forget NAV_ADMIN/NAV_SITE
+
-        // Rewrite all host dependant URLs based on the relative URL within our topic tree.
-        $this->_update_leaflist_urls($leaves);
@@ -614 +566 @@
-    /**
-     * This helper updates the URLs in the reference-passed leaf list.
-
-
-
+
+
-     *
-     * @param Array $leaves A reference to the list of leaves which has to be processed.
@@ -623 +574 @@
-    function _update_leaflist_urls(&$leaves)
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-        $fullprefix = "{$GLOBALS['midcom_config']['midcom_site_url']}";
-        $absoluteprefix = substr($GLOBALS['midcom_config']['midcom_site_url'], strlen($GLOBALS['midcom']->get_host_name()));
@@ -630 +579 @@
-        if (! is_array($leaves))
-        {
-
-
+
+
+
+
+
+
-        }
-
@@ -646 +599 @@
-                $leaves[$id][MIDCOM_NAV_PERMALINK] = $_MIDCOM->permalinks->create_permalink($leaves[$id][MIDCOM_NAV_GUID]);
-            }
-
-
-
-
-
-
+
+
-            {
-                $leaves[$id][MIDCOM_NAV_URL] = $leaves[$id][MIDCOM_NAV_SITE][MIDCOM_NAV_URL];
+            }
+            if (!isset($leaves[$id][MIDCOM_NAV_NAME]))
+            {
-                $leaves[$id][MIDCOM_NAV_NAME] = $leaves[$id][MIDCOM_NAV_SITE][MIDCOM_NAV_NAME];
-            }
-
+
-            // In addition, kill the toolbar as this is cached information and thus not relevant for the current user.
-            $leaves[$id][MIDCOM_NAV_TOOLBAR] = null;
-        }
-
-        debug_pop();
-    }
-
@@ -736 +686 @@
-            debug_add("Could not get interface class of '{$node[MIDCOM_NAV_COMPONENT]}' to the topic {$topic->id}, cannot add it to the NAP list.",
-                MIDCOM_LOG_ERROR);
+            debug_pop();
-            return null;
-        }
@@ -741 +692 @@
-        {
-            debug_print_r('Topic object dump:', $topic);
+            debug_pop();
-            $_MIDCOM->generate_error(MIDCOM_ERRCRIT,
-                "Cannot load NAP information, aborting: Could not set the nap instance of {$node[MIDCOM_NAV_COMPONENT]} to the topic {$topic->id}.");
@@ -798 +750 @@
-            }
-
-
-
-
+
+
-            if (   array_key_exists(MIDCOM_NAV_NAME, $leaf)
-                && array_key_exists(MIDCOM_NAV_URL, $leaf))
@@ -806 +757 @@
-                $leaf[MIDCOM_NAV_SITE][MIDCOM_NAV_URL] = $leaf[MIDCOM_NAV_URL];
-                $leaf[MIDCOM_NAV_SITE][MIDCOM_NAV_NAME] = $leaf[MIDCOM_NAV_NAME];
-                $leaf[MIDCOM_NAV_ADMIN][MIDCOM_NAV_URL] = $leaf[MIDCOM_NAV_URL];
-                $leaf[MIDCOM_NAV_ADMIN][MIDCOM_NAV_NAME] = $leaf[MIDCOM_NAV_NAME];
-            }
-
@@ -814 +763 @@
-                && trim($leaf[MIDCOM_NAV_SITE][MIDCOM_NAV_NAME]) == '')
-            {
-
-
-
-
-
-
+
-            }
-
@@ -875 +819 @@
-            debug_pop();
-            return false;
-        }
-
-        // If in admin mode, we are always visible now.
-        if ($this->_adminmode)
-        {
-            return true;
-        }
-
-        // If this is a leaf, we have to do some additional AIS/Non-AIS visibility checks
-        if ($napdata[MIDCOM_NAV_TYPE] == 'leaf')
-        {
-            // Check wether the leaf may be shown in the current mode
-            if (   (  $this->_adminmode && is_null($napdata[MIDCOM_NAV_ADMIN]))
-                || (! $this->_adminmode && is_null($napdata[MIDCOM_NAV_SITE])))
-            {
-                return false;
-            }
-        }
-
@@ -1187 +1114 @@
-        global $midcom_errstr;
-
-
+
+
-        if (! is_numeric($parent_node))
-        {
@@ -1206 +1134 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        
-
+
+
+
-        
-
+
+
-        
-
-
-
-
-
+
+
+
+
-        }
-        
-
-
-
-
-
+
+
+
+
+
+
+
-                continue;
-            }
-
-
-
-
-
-
-
-
-
-
+
+
-        
-        if (!$show_noentry)
-        {
-            // Hide "noentry" items
-            $mc->add_constraint('metadata.navnoentry', '=', 0);
-        }
-        
-        $mc->add_order('score');
-        $mc->add_order('extra');
-        //mgd_debug_start();
-        $mc->execute();
-        //mgd_debug_stop();
-        
-        $topics = $mc->list_keys_unchecked();
-        
-        $result = array();
-        
-        if (!$topics)
-        {
-            debug_add("Could not list topics under #{$parent_node}: " . mgd_errstr(), MIDCOM_LOG_INFO);
-            debug_pop();
-            return $result;
-        }
-
-
-        foreach ($topics as $topic_guid => $value)
-        {
-            $topic_id = $mc->get_subkey($topic_guid, 'id');
-            if ($this->_loadNode($topic_id) != MIDCOM_ERROK)
-            {
-                debug_add("Node {$topic_id} could not be loaded, ignoring it", MIDCOM_LOG_INFO);
-                continue;
-            }
-
-            $result[] = $topic_id;
-        }
-        */
-        debug_pop();
-        return $result;
@@ -1514 +1398 @@
-    }
-}
-
-
-?>

trunk/midcom/midcom.core/midcom/helper/nav.php

@@ -25 +25 @@
- * @see midcom_helper__basicnav
- */
-
+
+
-
-    /**
@@ -70 +71 @@
-     * @see midcom_helper__basicnav::get_current_node()
-     */
-
+
+
-        return $this->_basicnav->get_current_node();
-    }
@@ -78 +80 @@
-     * displayed by the handling topic. If no leaf is active, this function
-     * returns FALSE. (Remeber to make a type sensitve check, e.g.
-"0" and "false"
+'0' and 'false'
-     *
-     * @return int      The ID of the leaf in question or false on failure.
-     * @see midcom_helper__basicnav::get_current_leaf()
-     */
-
+
+
-        return $this->_basicnav->get_current_leaf();
-    }
@@ -96 +99 @@
-     * @see midcom_helper__basicnav::get_root_node()
-     */
-
+
+
-        return $this->_basicnav->get_root_node();
-    }
@@ -141 +145 @@
-     * @see midcom_helper__basicnav::get_node()
-     */
-
+
+
-        return $this->_basicnav->get_node($node_id);
-    }
@@ -154 +159 @@
-     * @see midcom_helper__basicnav::get_leaf()
-     */
-
+
+
-        return $this->_basicnav->get_leaf($leaf_id);
-    }
@@ -166 +172 @@
-     * @see midcom_helper__basicnav::get_leaf_uplink()
-     */
-
+
+
-        return $this->_basicnav->get_leaf_uplink($leaf_id);
-    }
@@ -178 +185 @@
-     * @see midcom_helper__basicnav::get_node_uplink()
-     */
-
+
+
-        return $this->_basicnav->get_node_uplink($node_id);
-    }
@@ -196 +204 @@
-        $qb->add_constraint('id', '=', $node_id);
-        $qb->add_constraint('up', 'INTREE', $root_id);
+        
-        if ($qb->count() > 0)
-        {
-            return true;
-        }
+        
-        return false;
-    }
@@ -228 +238 @@
-     *
-     * - MIDCOM_NAV_ID => 0,
-"node"
+'node'
-     *
-     * If there are no child elements at all the method will return an empty array,
@@ -239 +249 @@
-    function list_child_elements($parent_node_id)
-    {
-        debug_push("nav::list_child_elements");
-
-        // Fetch nodes and leaves
-        if (! is_numeric($parent_node_id))
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Parameter passed is no integer: [$parent_node_id]", MIDCOM_LOG_ERROR);
-            debug_print_type('Type was:', $parent_node_id);
@@ -256 +265 @@
-        }
-
-"midcom.helper.nav", "navorder"
+'midcom.helper.nav', 'navorder'
-
-        switch ($navorder)
@@ -284 +293 @@
-        $result = $nav_object->get_sorted_list();
-
-        debug_pop();
-        return $result;
-    }
@@ -307 +315 @@
-    function resolve_guid ($guid)
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-        debug_add("Checking GUID {$guid}...");
-
-        // First, check if the GUID is already known by basicnav:
-
-        $cached_result = $this->_basicnav->get_loaded_object_by_guid($guid);
-        if (! is_null($cached_result))
-        {
-
+
+
-            debug_pop();
-            return $cached_result;
@@ -326 +331 @@
-        if (! $object)
-        {
-
+
+
+
-        }
-
@@ -332 +339 @@
-            && $object->__table__ == 'topic')
-        {
-            debug_add("This is a topic.");
-
-            // Ok. This topic should be within the content tree,
-            // we check this and return the node if everything is ok.
-            if (! $this->is_node_in_tree($object->id, $this->get_root_node()))
-            {
+                debug_push_class(__CLASS__, __FUNCTION__);
-                debug_add("NAP::resolve_guid: The Guid {$guid} leads to an unknown topic not in our tree.", MIDCOM_LOG_WARN);
-"Retrieved topic was:"
+'Retrieved topic was:'
-                debug_pop();
-                return false;
@@ -350 +356 @@
-            && $object->__table__ == 'article')
-        {
-
-
+
-            // Ok, let's try to find the article using the topic in the tree.
-            if (! $this->is_node_in_tree($object->topic, $this->get_root_node()))
-            {
-                debug_add("NAP::resolve_guid: The Guid {$guid} leads to an unknown topic not in our tree.", MIDCOM_LOG_WARN);
-"Retrieved article was:"
+'Retrieved article was:'
-                debug_pop();
-                return false;
@@ -364 +369 @@
-            if (! $topic)
-            {
-
+
+
-                    MIDCOM_ERRCRIT,
-                    "Data inconsistency, the topic ID ({$object->topic}) of the article {$object->id} is invalid. "
-
+
+
-                // This will exit.
-            }
@@ -383 +390 @@
-
-            debug_add("The Article GUID {$guid} is somehow hidden from the NAP data in its topic, no results shown.", MIDCOM_LOG_INFO);
-"Retrieved article was:"
+'Retrieved article was:'
-            debug_pop();
-            return false;
@@ -391 +398 @@
-        // First, we traverse a list of nodes to be checked on by one, avoiding a recursive
-        // function call.
-
-        debug_add("This is something else, we'll do a full scan.");
-
-        $unprocessed_node_ids = Array ($this->get_root_node());
@@ -415 +420 @@
-        }
-
+        debug_push_class(__CLASS__, __FUNCTION__);
-        debug_add("We were unable to find the GUID {$guid} in the MidCOM tree even with a full scan.");
-        debug_pop();
@@ -424 +430 @@
-
-    /**
-"View this page"
+'View this page'
-     *
-     * It takes the currently displayed content
@@ -437 +443 @@
-        // Go upwards step by step and build together the page view URL
-        // up to the root topic.
-""
+''
-        if ($this->get_current_leaf() !== false)
-        {
-            $leaf = $this->get_leaf($this->get_current_leaf());
-
+
+
+
+
+
+
+
+
+
+
+
-            {
-                return null;
-            }
-
-
-
+
+
-
-        do
-        {
-
+ode_
-            $url = $node[MIDCOM_NAV_URL] . $url;
-id = $this->get_node_uplink($n
-
-
-"get_node_uplink failed; view_this_page_url aborting."
+ode_id = $this->get_node_uplink($node_
+ode_
+
+'get_node_uplink failed; view_this_page_url aborting.'
-                return false;
-            }
-        }
-
-
- "/"
+ode_
+
+= '/'
-        {
-            return $baseurl . $url;
-        }
-
-$baseurl . "/" . $url
+"{$baseurl}/{$url}"
-    }
-
@@ -473 +488 @@
-     * Construct a breadcrumb line.
-     *
-"Start > Topic1 > Topic2 > Article"
+'Start > Topic1 > Topic2 > Article'
-     * traverse upwards till the root node. $separator is inserted between the
-     * pairs, $class, if non-null, will be used as CSS-class for the A-Tags.
@@ -485 +500 @@
-     * @param string    $separator              The separator to use between the elements.
-     * @param string    $class                  If not-null, it will be assigned to all A tags.
-"Home"
+'Home'
-     * @param string    $current_class  The class that should be assigned to the currently active element.
-     * @return string   The computed breadrumb line.
-     */
-" > "
+' > '
-    {
-        $breadcrumb_data = $this->get_breadcrumb_data();
@@ -546 +561 @@
-     *
-     * Gives you the data needed to construct a line like
-"Start > Topic1 > Topic2 > Article"
+'Start > Topic1 > Topic2 > Article'
-     * traverse upwards till the root node. The components custom breadcrumb
-     * data is inserted at the end of the computed breadcrumb line after any
@@ -568 +583 @@
-     *
-     * The entry of every level is indexed by its MIDCOM_NAV_ID, where custom keys preserve
-"custom-"
+'custom-'
-     * allows you to easily check if a given node/leave is within the current breadcrumb-line
-     * by checking with array_key_exists. (mgd_is_in_topic_tree was originally used for this
@@ -707 +722 @@
-        return $result;
-    }
-
-}
-
-?>