Changeset 11872

Timestamp:

08/30/07 15:37:53 (1 year ago)

Author:

bergie

Message:

Various urlparser fixes, s/topic/node, refs #1

Files:

• trunk/midcom/midcom.core/midcom.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/application.php (modified) (20 diffs)
• trunk/midcom/midcom.core/midcom/core/service/implementation/urlparsertopic.php (modified) (4 diffs)
• trunk/midcom/midcom.core/midcom/helper/_styleloader.php (modified) (2 diffs)

trunk/midcom/midcom.core/midcom.php

@@ -129 +129 @@
-
-// Helpers and First-Generation services
-require('midcom/helper/urlparser.php');
-require('midcom/helper/_componentloader.php');
-require('midcom/helper/_styleloader.php');

trunk/midcom/midcom.core/midcom/application.php

@@ -405 +405 @@
-     *
-     * Initialize the Application class. Sets all private variables to a predefined
-topic should be set to the midcom root-topic
+node should be set to the midcom root-node
-     * $prefix can be a prefix, which is appended to get_midgard()->self (i.e. the
-     * Midgard Page URL). This may be needed when MidCOM is run by wrapper.
@@ -431 +431 @@
-
-        // Initialize Root Topic
-topic
-topic
-topic
+node
+node
+node
-        {
-            if (mgd_errno() == MGD_ERR_ACCESS_DENIED)
@@ -443 +443 @@
-            {
-                $this->generate_error(MIDCOM_ERRCRIT,
-topic
+node
-                    "This is fatal, aborting. See the MidCOM log file for details.<br />" .
-                    'Last Midgard Error was: ' . mgd_errstr());
@@ -451 +451 @@
-        
-        // Initialize Context Storage
-topic
+node
-
-        // Populate browser information
@@ -607 +607 @@
-     * the URL $url and executes it as if it was used as primary component.
-     * Additional configuration parameters can be appended through the parameter
-
-
-
-
+
-     *
-     * This is only possible if the system is in the Page-Style output phase. It
@@ -620 +617 @@
-     * the following exceptions:
-     *
-     * - The Topic with the ID $topicid is used as a root topic instead of the
-     *   normal root topic. This is required to be able to administrate another
-     *   Topic Tree as the AIS does.
-     * - This function can (and usually will be) called during the content output phase
-     *   of the system.
-     * - A call to generate_error will result in an regular error page output if
-     *   we still are in the code-init phase.
-     * - The parameter urlparser_prefix is there to let the parser know that we are
-     *   operating under a different environment. $midgard->self is not a good start
-     *   anymore. This is needed to provide an accurate anchor prefix in the
-     *   component context. If this parameter is omitted, it is set to the
-     *   anchor_prefix of the calling component.
-     *
-     * Example code, executed on a sites Homepage, it will load the newsticker from
-topic
+node
-     * to the loaded one:
-     *
@@ -706 +695 @@
-
-        // Parser Init: Generate arguments and instantinate it.
-        $topic = $this->get_context_data(MIDCOM_CONTEXT_ROOTTOPIC);
-        $this->_parser = $this->serviceloader->load('midcom_core_service_urlparser');
-        $argv = $this->_parser->tokenize($url);
@@ -793 +781 @@
-     * will report an error, depending on the situation.
-     *
-topic tree and for each topic
+node tree and for each node
-     * the component that is responsible for it. This component gets the chance to
-     * acceppt the request (this is encaspulated in the _checkobject call), which is
@@ -803 +791 @@
-     * If the parsing process doesn't find any component that declares to be able to
-     * handle the request, an HTTP 404 - Not Found error is triggered.
-     *
-     * If no topic is found, it tries to serve a topic attachment as a last resort,
-     * it uses the last valid topic as container object.
-     *
-     * This method has legacy ViewerGroups parameter support since version 1.3. If
-     * a ViewerGroup parameter domain is detected at a given topic, and the user does
-     * not have the appropriate permissions, it will fire an HTTP 401 Unauthorized
-     * error. If no ViewerGroups parameter domain is there, no error will be fired.
-     *
-     * Two types of attachments will be processed and delivered automatically:
-     * Topic-Attachments and explicit attachments requested through the
-     * midcom-serveattachment... URL methods.
-     *
-     * @access private
@@ -930 +906 @@
-            $object = $this->_parser->get_current_object();
-
-a($object,'midcom_db_topic'
+object($object
-            {
-topic
-topic
+node
+node
-            }
-
@@ -940 +916 @@
-            if (!$path) 
-            {
-Topic
-Topic
+node
+node
-            }
-
@@ -949 +925 @@
-            // If so, execute it, if not, continue.
-
-
+
+
-                $this->_status = MIDCOM_STATUS_HANDLE;
-
-                // Strip all midcom-*-* URL Parameters out of the prefix.
-
-                $prefix = $this->_parser->get_url();
-
-
+
-                // Initialize context
-                $this->_context[$this->_currentcontext][MIDCOM_CONTEXT_ANCHORPREFIX] = $prefix;
@@ -975 +949 @@
-        if (! $success)
-        {
-topic
+node
-            if (mgd_errno() == MGD_ERR_ACCESS_DENIED)
-            {
@@ -1038 +1012 @@
-     * according to the error code and -string of the component in question.
-     *
-
-
-
-
+
+
+
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
-
-
-
+
-
-        if ($this->get_context_data(MIDCOM_CONTEXT_REQUESTTYPE) != MIDCOM_REQUEST_CONTENT)
@@ -1122 +1094 @@
-     * accordingly, both on the configure and on the can_handle run.
-     *
-topic
+node
-     * @return bool                    Indication, wether a component can handle a request.
-     * @access private
@@ -1177 +1149 @@
-     * parameter domain has to be used.
-     *
-Topic $object    The topic
+Object $object    The node
-     * @return midcom_helper_configuration    Reference to the newly constructed configuration object.
-     * @access private
@@ -1392 +1364 @@
-     * currently uses different context IDs. The problem is, that this is not 100%
-     * efficient: If you instantinate two different NAP Classes in different contexts
-topic
+node
-     *
-     * If the system has not completed the can_handle phase, this method fails and
@@ -1420 +1392 @@
-
-        return $this->_context[$contextid][MIDCOM_CONTEXT_NAP];
-    }
-
-    /**
-     * @deprecated This function is discouraged in favor of the component context since 2.0.0
-     *
-     * Return a copy of the topic that is handling the request.
-     *
-     * If the system is in the output phase (midcom_application::codeinit is false),
-     * this function returns a copy of the topic, that is being output, for example
-     * for the usage of the NAP System.
-     *
-     * If the system is not in the output phase, this method simply returns false.
-     *
-     * <b>Note:</b> This is equivalent to requesting the context key
-     * MIDCOM_CONTEXT_CONTENTTOPIC
-     *
-     * @return MidgardTopic    The topic being output.
-     * @see midcom_application::get_context_data()
-     */
-    function get_content_topic()  {
-        return $this->get_context_data(MIDCOM_CONTEXT_CONTENTTOPIC);
-    }
-
@@ -1877 +1828 @@
-     *
-     * @param int id Explicitly specify the ID for context creation (used during construction), this parameter is usually omitted.
-midcom_db_topic Root topic
+MidgardObject Root node
-     * @return int The ID of the newly created component.
-     * @access private
-     */
-topic
+node
-    {
-        if (is_null($id))
@@ -1890 +1841 @@
-        $this->_context[$id][MIDCOM_CONTEXT_ANCHORPREFIX] = '';
-        $this->_context[$id][MIDCOM_CONTEXT_REQUESTTYPE] = MIDCOM_REQUEST_CONTENT;
-topic
+node
-        $this->_context[$id][MIDCOM_CONTEXT_CONTENTTOPIC] = null;
-        $this->_context[$id][MIDCOM_CONTEXT_COMPONENT] = null;

trunk/midcom/midcom.core/midcom/core/service/implementation/urlparsertopic.php

@@ -19 +19 @@
-    private $root_topic = null;
-    private $current_object = null;
+
+    private $url = '';
-
-    public function __construct()
@@ -84 +86 @@
-        
-        $this->current_object = $this->root_topic;
+        $this->url = '';
-    }
-
@@ -129 +132 @@
-        $this->argc -= 1;
-        array_shift ($this->argv);
+
+        $this->url .= $this->current_object->name . '/';
-        
-        return $this->current_object;
@@ -183 +188 @@
-    public function get_url()
-    {
-implode('/', $this->argv_original) . '/'
+'/' . $this->url
-    }
-}

trunk/midcom/midcom.core/midcom/helper/_styleloader.php

@@ -744 +744 @@
-        debug_add("entering context $context", MIDCOM_LOG_DEBUG);
-
-nt_topic(
+xt_data(MIDCOM_CONTEXT_CONTENTTOPIC
-
-        $_st = $this->_getComponentStyle($this->_topic);
@@ -781 +781 @@
-        // get our topic again
-        // FIXME: does this have to be above _getComponentStyle($this->_topic) ??
-nt_topic(
+xt_data(MIDCOM_CONTEXT_CONTENTTOPIC
-
-        $this->_snippetdir = $this->_getComponentSnippetdir($this->_topic);