Changeset 21927 for branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php

Timestamp:

2012/06/20 11:57:43 (12 years ago)

Author:

pineray

Message:

#1669 #1859 初期化漏れ、無駄な変数等

File:

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

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

@@ -75 +75 @@
         // 正常に接続されている場合
         if (!$objQuery->isError()) {
-            list($db_type) = explode(':', $dsn);
-
             // カラムリストを取得
             $columns = $objQuery->listTableFields($table_name);
@@ -111 +109 @@
         $exists = $objQuery->exists($table_name, $where, $arrWhereVal);
 
-        // データを追加する
-        if (!$exists && $add) {
-            $objQuery->exec($sql);
-        }
-        return $ret;
+        // データが存在する場合 TRUE
+        if ($exists) {
+            return TRUE;
+        // $add が TRUE の場合はデータを追加する
+        } elseif ($add) {
+            return $objQuery->exec($sql);
+        // $add が FALSE で、データが存在しない場合 FALSE
+        } else {
+            return FALSE;
+        }
     }
 
@@ -129 +132 @@
      */
     function sfGetBasisData($force = false, $col = '') {
-        static $data;
-
-        if ($force || !isset($data)) {
+        static $data = array();
+
+        if ($force || empty($data)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -177 +180 @@
         if (!$this->g_root_on) {
             $this->g_root_on = true;
-            $objQuery =& SC_Query_Ex::getSingletonInstance();
 
             if (!isset($_GET['product_id'])) $_GET['product_id'] = '';
@@ -292 +294 @@
             return;
         } else {
-            foreach ($arrTree as $key => $val) {
+            foreach ($arrTree as $val) {
                 if ($val['category_id'] == $parent) {
                     $result[] = array(
@@ -367 +369 @@
 
         // カテゴリ名称を取得する
-        foreach ($arrCatID as $key => $val) {
+        foreach ($arrCatID as $val) {
             $sql = 'SELECT category_name FROM dtb_category WHERE category_id = ?';
             $arrVal = array($val);
@@ -448 +450 @@
 
         $max = count($arrRet);
+        $arrList = array();
         for ($cnt = 0; $cnt < $max; $cnt++) {
             $id = $arrRet[$cnt]['category_id'];
@@ -486 +489 @@
         $max = count($arrRet);
 
+        $arrValue = array();
+        $arrOutput = array();
         for ($cnt = 0; $cnt < $max; $cnt++) {
             if ($parent_zero) {
@@ -523 +528 @@
         } else if (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && SC_Helper_DB_Ex::sfIsRecord('dtb_products','product_id', $product_id, $status)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
-            $where = 'product_id = ?';
             $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', 'product_id = ?', array($product_id));
         } else {
@@ -943 +947 @@
         $arrList = $objQuery->select($col, $table, $where, $arrVal);
         $count = count($arrList);
+        $arrRet = array();
         for ($cnt = 0; $cnt < $count; $cnt++) {
             $key = $arrList[$cnt][$keyname];
@@ -1278 +1283 @@
             } else if (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && $this->sfIsRecord('dtb_products','product_id', $product_id, $status)) {
                 $objQuery =& SC_Query_Ex::getSingletonInstance();
-                $where = 'product_id = ?';
                 $maker_id = $objQuery->getCol('maker_id', 'dtb_products', 'product_id = ?', array($product_id));
                 $this->g_maker_id = $maker_id;
@@ -1320 +1324 @@
 
         $max = count($arrRet);
+        $arrList = array();
         for ($cnt = 0; $cnt < $max; $cnt++) {
             $id = $arrRet[$cnt]['maker_id'];
@@ -1343 +1348 @@
     /**
      * 店舗基本情報に基づいて税金付与した金額を返す
+     * SC_Utils_Ex::sfCalcIncTax とどちらか統一したほうが良い
      *
      * @param integer $price 計算対象の金額