Changeset 15913

Timestamp:

04/01/08 14:41:17 (7 months ago)

Author:

rambo

Message:

made a few options actually configurable at least on the SG level, made styles and style elements require approval by default in staging/live

Files:

• branches/MidCOM_2_8/midcom.helper.replicator/config/config.inc (modified) (1 diff)
• branches/MidCOM_2_8/midcom.helper.replicator/exporter/mirror.php (modified) (1 diff)
• branches/MidCOM_2_8/midcom.helper.replicator/exporter/staging2live.php (modified) (3 diffs)
• branches/MidCOM_2_8/midcom.helper.replicator/exporter/staging2live_typefilter.php (modified) (1 diff)

branches/MidCOM_2_8/midcom.helper.replicator/config/config.inc

@@ -1 +1 @@
-'queue_root_dir' => '/var/spool/midgard/replicator_queue/',
-'log_filename'   => "{$GLOBALS['midcom_config']['log_filename']}.replicator",
+'exporter_staging2live_check_approvals_for' => array
+(
+    'midgard_topic',
+    'midgard_article',
+    'midgard_style',
+    'midgard_element', // Style-elements
+),
+'exporter_staging2live_typefilter_pass_types' => array
+(
+    0,
+),
+'exporter_staging2live_typefilter_check_types_for' => array
+(
+    'midgard_article',
+),

branches/MidCOM_2_8/midcom.helper.replicator/exporter/mirror.php

@@ -137 +137 @@
-    function serialize_component_dependencies(&$node)
-    {
+        // FIXME: components interface class should have a method to return dependencies
-        switch ($node->component)
-        {

branches/MidCOM_2_8/midcom.helper.replicator/exporter/staging2live.php

@@ -26 +26 @@
-     * array of classes for which to check the approval for
-     *
-
+
+
-     */
-
-
-
-
-
+
-
-    function midcom_helper_replicator_exporter_staging2live($subscription)
-    {
-        parent::midcom_helper_replicator_exporter_mirror($subscription);
+        $this->check_approvals_for = $this->_config->get('exporter_staging2live_check_approvals_for');
+        if (!is_array($this->check_approvals_for))
+        {
+            // Safety
+            $this->check_approvals_for = array();
+        }
-    }
-
@@ -219 +222 @@
-
-        if (   is_a($object, 'midgard_article')
-$object->up
+!empty($object->up)
-        {
-            // Child articles don't currently have any approval UI, skip approval
@@ -311 +314 @@
-            $serializations = array_merge($serializations, $dependency_serializations);
-            unset($dependency_serializations);
-
-            /* FIXME: This contradicts general tree logic where children *must not* be exported if parent
-               is not approved 
-            // We should export child articles and topics as they may have been approved
-            // even while their parent topic wasn't
-            $qb = midcom_db_article::new_query_builder();
-            $qb->add_constraint('topic', '=', $object->id);
-            $articles = $qb->execute();
-            foreach ($articles as $article)
-            {
-                $child_serializations = $this->serialize_object($article);
-                $serializations = array_merge($serializations, $child_serializations);
-                unset($child_serializations);
-            }
-            
-            $qb = midcom_db_topic::new_query_builder();
-            $qb->add_constraint('up', '=', $object->id);
-            $topics = $qb->execute();
-            foreach ($topics as $topic)
-            {
-                $child_serializations = $this->serialize_object($topic);
-                $serializations = array_merge($serializations, $child_serializations);
-                unset($child_serializations);
-            }
-            */
-        }
-        

branches/MidCOM_2_8/midcom.helper.replicator/exporter/staging2live_typefilter.php

@@ -24 +24 @@
-     * array of $object->type values to allow replication for
-     *
-
+
+
-     */
-
-
-
-
+
-
-    /**
-     * array of classes for which to check the type for
-     *
-
+
+
-     */
-
-
-
-
+
-
-    function midcom_helper_replicator_exporter_staging2live_typefilter($subscription)
-    {
-        parent::midcom_helper_replicator_exporter_staging2live($subscription);
+        $this->pass_types = $this->_config->get('exporter_staging2live_typefilter_pass_types');
+        if (!is_array($this->pass_types))
+        {
+            // Safety
+            $this->pass_types = array();
+        }
+        $this->check_types_for = $this->_config->get('exporter_staging2live_typefilter_check_types_for');
+        if (!is_array($this->check_types_for))
+        {
+            // Safety
+            $this->check_types_for = array();
+        }
-    }
-