Changeset 22603

Timestamp:

2013/03/05 09:21:53 (10 years ago)

Author:

pineray

Message:

#2166 同じ処理を繰り返さないようにスタティック変数を使用.

Location:

branches/version-2_12-dev/data/class

Files:

• helper/SC_Helper_Category.php (modified) (4 diffs)
• util/SC_Utils.php (modified) (1 diff)

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

@@ -71 +71 @@
     public function getList($cid_to_key = FALSE)
     {
-        static $arrCategory = array();
+        static $arrCategory = array(), $cidIsKey = array();
 
         if (!isset($arrCategory[$this->count_check])) {
@@ -90 +90 @@
 
         if ($cid_to_key) {
-            // 配列のキーをカテゴリーIDに
-            return SC_Utils_Ex::makeArrayIDToKey('category_id', $arrCategory[$this->count_check]);
+            if (!isset($cidIsKey[$this->count_check])) {
+                // 配列のキーをカテゴリーIDに
+                $cidIsKey[$this->count_check] = SC_Utils_Ex::makeArrayIDToKey('category_id', $arrCategory[$this->count_check]);
+            }
+            return $cidIsKey[$this->count_check];
         }
 
@@ -104 +107 @@
     public function getTree()
     {
-        $arrList = $this->getList();
-        $arrTree = SC_Utils_Ex::buildTree('category_id', 'parent_category_id', LEVEL_MAX, $arrList);
-        return $arrTree;
+        static $arrTree = array();
+        if (!isset($arrTree[$this->count_check])) {
+            $arrList = $this->getList();
+            $arrTree[$this->count_check] = SC_Utils_Ex::buildTree('category_id', 'parent_category_id', LEVEL_MAX, $arrList);
+        }
+        return $arrTree[$this->count_check];
     }
 
@@ -118 +124 @@
     public function getTreeTrail($category_id, $id_only = TRUE)
     {
-        $arrCategory = $this->getList();
-        $arrTrailID = SC_Utils_Ex::getTreeTrail($category_id, 'category_id', 'parent_category_id', $arrCategory, 0, $id_only);
+        $arrCategory = $this->getList(TRUE);
+        $arrTrailID = SC_Utils_Ex::getTreeTrail($category_id, 'category_id', 'parent_category_id', $arrCategory, TRUE, 0, $id_only);
         return $arrTrailID;
     }

branches/version-2_12-dev/data/class/util/SC_Utils.php

@@ -1969 +1969 @@
      * @param string $glue_key 親IDキー名
      * @param array $correction 階層構造が含まれている配列
+     * @param boolean $cid_is_key キーがIDの配列の場合はtrue
      * @param integer $root_id ルートID
      * @param boolean $id_only IDだけの配列を返す場合はtrue
      * @return array 親ID配列
      */
-    public static function getTreeTrail($start_id, $primary_key, $glue_key, $correction = array(), $root_id = 0, $id_only = TRUE)
-    {
-        $arrIDToKay = SC_Utils_Ex::makeArrayIDToKey($primary_key, $correction);
+    public static function getTreeTrail($start_id, $primary_key, $glue_key, $correction = array(), $cid_is_key = FALSE, $root_id = 0, $id_only = TRUE)
+    {
+        if ($cid_is_key) {
+            $arrIDToKay = $correction;
+        } else {
+            $arrIDToKay = SC_Utils_Ex::makeArrayIDToKey($primary_key, $correction);
+        }
         $id = $start_id;
         $arrTrail = array();