Changeset 17206

Timestamp:

2008/04/04 15:41:15 (16 years ago)

Author:

satou

Message:

fixed by Yammy (merge r17155)

Location:

branches/version-2/data/class

Files:

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

branches/version-2/data/class/helper/SC_Helper_CSV.php

@@ -105 +105 @@
 
         $from = "vw_product_class AS prdcls";
-        $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols);
+        $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols, true, array('category_id'));
 
         $objQuery = new SC_Query();
@@ -114 +114 @@
 
         // 規格分類名一覧
-        $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
+        if (!empty($arrOutputCols['classcategory_id1']) || !empty($arrOutputCols['classcategory_id2'])) {
+            $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
+        }
 
         if (!isset($data)) $data = "";
         for($i = 0; $i < $max; $i++) {
             // 関連商品情報の付与
-            $list_data[$i]['classcategory_id1'] = $arrClassCatName[$list_data[$i]['classcategory_id1']];
-            $list_data[$i]['classcategory_id2'] = $arrClassCatName[$list_data[$i]['classcategory_id2']];
-
-            $arrCategory_id = $objQuery->getCol("dtb_product_categories",
-                              "category_id",
-                              "product_id = ?",
-                              array($list_data[$i]['product_id']));
-
-            // カテゴリID 付与
-            for ($j = 0; $j < count($arrCategory_id); $j++) {
-                $list_data[$i]['category_id'] .= $arrCategory_id[$j];
-                if ($j < count($arrCategory_id) - 1) {
-                    $list_data[$i]['category_id'] .= "|";
+            if (in_array('classcategory_id1', $arrOutputCols)) {
+                $list_data[$i]['classcategory_id1'] = $arrClassCatName[$list_data[$i]['classcategory_id1']];
+            }
+            if (in_array('classcategory_id2', $arrOutputCols)) {
+                $list_data[$i]['classcategory_id2'] = $arrClassCatName[$list_data[$i]['classcategory_id2']];
+            }
+
+            if (in_array('category_id', $arrOutputCols)) {
+                $arrCategory_id = $objQuery->getCol("dtb_product_categories",
+                                  "category_id",
+                                  "product_id = ?",
+                                  array($list_data[$i]['product_id']));
+
+                // カテゴリID 付与
+                for ($j = 0; $j < count($arrCategory_id); $j++) {
+                    $list_data[$i]['category_id'] .= $arrCategory_id[$j];
+                    if ($j < count($arrCategory_id) - 1) {
+                        $list_data[$i]['category_id'] .= "|";
+                    }
                 }
             }
 
             // 各項目をCSV出力用に変換する。
-            $data .= $this->lfMakeProductsCSV($list_data[$i]);
+            $data .= $this->lfMakeProductsCSV($list_data[$i], $arrOutputCols);
         }
         return $data;
@@ -223 +231 @@
 
     // 各項目をCSV出力用に変換する。(商品)
-    function lfMakeProductsCSV($list) {
+    function lfMakeProductsCSV($list, $arrOutputCols) {
         $line = "";
         if(is_array($list)) {
-            foreach($list as $key => $val) {
+            foreach($arrOutputCols as $key) {
                 $tmp = "";
                 switch($key) {
@@ -233 +241 @@
                         $tmp = '0';
                     } else {
-                        $tmp = $val;
+                        $tmp = $list[$key];
                     }
                     break;
                 default:
-                    $tmp = $val;
+                    $tmp = $list[$key];
                     break;
                 }

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

@@ -489 +489 @@
 
     // 配列の値をカンマ区切りで返す。
-    function sfGetCommaList($array, $space=true) {
+    function sfGetCommaList($array, $space=true, $arrPop = array()) {
         if (count($array) > 0) {
             $line = "";
             foreach($array as $val) {
-                if ($space) {
-                    $line .= $val . ", ";
-                }else{
-                    $line .= $val . ",";
+                if (!in_array($val, $arrPop)) {
+                    if ($space) {
+                        $line .= $val . ", ";
+                    } else {
+                        $line .= $val . ",";
+                    }
                 }
             }
             if ($space) {
                 $line = ereg_replace(", $", "", $line);
-            }else{
+            } else {
                 $line = ereg_replace(",$", "", $line);
             }
             return $line;
-        }else{
+        } else {
             return false;
         }