Changeset 21512 for branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php

Timestamp:

2012/02/15 19:38:35 (14 years ago)

Author:

h_yoshimoto

Message:

#1603 #1632 優先度変更処理を修正、rankをpriorityに変更、細かなバグ修正、コメントの追加

File:

• branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php (modified) (7 diffs)

branches/version-2_12-dev/data/class/helper/SC_Helper_Plugin.php

@@ -64 +64 @@
                 $this->arrPluginIds[] = $arrPluginData['plugin_id'];
                 // ローカルフックポイントの登録.
-                $this->registLocalHookPoint($objPlugin, $arrPluginData['rank']);
+                $this->registLocalHookPoint($objPlugin, $arrPluginData['priority']);
                 // スーパーフックポイントの登録.
-                $this->registSuperHookPoint($objPlugin, HOOK_POINT_PREPROCESS, 'preProcess', $arrPluginData['rank']);
-                $this->registSuperHookPoint($objPlugin, HOOK_POINT_PROCESS, 'process', $arrPluginData['rank']);
+                $this->registSuperHookPoint($objPlugin, HOOK_POINT_PREPROCESS, 'preProcess', $arrPluginData['priority']);
+                $this->registSuperHookPoint($objPlugin, HOOK_POINT_PROCESS, 'process', $arrPluginData['priority']);
             }
         }
@@ -100 +100 @@
             && is_array($this->arrRegistedPluginActions[$hook_point])) {
 
-            ksort($this->arrRegistedPluginActions[$hook_point]);
+            krsort($this->arrRegistedPluginActions[$hook_point]);
             foreach ($this->arrRegistedPluginActions[$hook_point] as $priority => $arrFuncs) {
-
+                
                 foreach ($arrFuncs as $func) {
                     if (!is_null($func['function'])) {
@@ -122 +122 @@
         // XXX 2.11.0 互換のため
         $arrCols = $objQuery->listTableFields($table);
-        if (in_array('rank', $arrCols)) {
-            $objQuery->setOrder('rank DESC');
+        if (in_array('priority', $arrCols)) {
+            $objQuery->setOrder('priority DESC, plugin_id ASC');
         }
         $arrRet = $objQuery->select($col,$table,$where);
@@ -140 +140 @@
         // XXX 2.11.0 互換のため
         $arrCols = $objQuery->listTableFields($table);
-        if (in_array('rank', $arrCols)) {
+        if (in_array('priority', $arrCols)) {
             $objQuery->setOrder('plugin_id ASC');
         }
@@ -158 +158 @@
         $table = 'dtb_plugin';
         $where = 'plugin_id = ?';
-        // XXX 2.11.0 互換のため
-        $arrCols = $objQuery->listTableFields($table);
-        if (in_array('rank', $arrCols)) {
-            $objQuery->setOrder('rank ASC');
-        }
         $plugin = $objQuery->getRow($col, $table, $where, array($plugin_id));
         return $plugin;
@@ -178 +173 @@
         $table = 'dtb_plugin';
         $where = 'plugin_code = ?';
-        // XXX 2.11.0 互換のため
-        $arrCols = $objQuery->listTableFields($table);
-        if (in_array('rank', $arrCols)) {
-            $objQuery->setOrder('rank ASC');
-        }
         $plugin = $objQuery->getRow($col, $table, $where, array($plugin_code));
         return $plugin;
@@ -310 +300 @@
             SC_Utils_Ex::deleteFile(PLUGIN_TMPL_CACHE_REALDIR, false);
         }
-        $objTemplateTransformList = SC_Plugin_Template_Transform_List::getSingletonInstance();
+        $objTemplateTransformList = SC_Plugin_TemplateTransformList::getSingletonInstance();
         $objTemplateTransformList->init();
+        // プラグインのsetTemplateTransformerを実行します.
         foreach ($this->arrPluginInstances as $objPlugin) {
-            // TODO 関数チェック;
-            $objPlugin->setTemplateTransformer();
-        }
-        // トランスフォーム実行
+            if(method_exists($objPlugin, 'setTemplateTransformer') === true) {
+                // SC_Plugin_TemplateTransformList::arrConfsByTemplatesにトランスフォーム情報をセットします
+                $objPlugin->setTemplateTransformer();
+            }
+        }
+        // SC_Plugin_TemplateTransformList::arrConfsByTemplatesにセットされた情報を元にトランスフォームの実行
         $objTemplateTransformList->transformAll($test_mode);
     }