Changeset 17552

Timestamp:

2008/08/22 21:02:42 (16 years ago)

Author:

Seasoft

Message:

・正式版からのマージ(ごく一部)
・ポイントの0セットに関わる調整( http://xoops.ec-cube.net/modules/newbb/viewtopic.php?topic_id=1240&forum=2&viewmode=flat&order=ASC&start=30)
・フォーマット修正

Location:

branches/comu-ver2

Files:

• data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (modified) (1 diff)
• data/class/helper/SC_Helper_DB.php (modified) (8 diffs)
• html/install/index.php (modified) (1 diff)

branches/comu-ver2/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -75 +75 @@
      * @return array 文字コード情報
      */
-     function getCharSet() {
-        $objQuery = new SC_Query();
-        $arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'");
-        return $arrRet;
-     }
+    function getCharSet() {
+        $objQuery = new SC_Query();
+        $arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'");
+        return $arrRet;
+    }
     
     /**

branches/comu-ver2/data/class/helper/SC_Helper_DB.php

@@ -55 +55 @@
      */
     function sfGetDBVersion($dsn = "") {
-        $dbFactory = SC_DB_DBFactory::getInstance();
+        $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         return $dbFactory->sfGetDBVersion($dsn);
     }
@@ -67 +67 @@
      */
     function sfTabaleExists($table_name, $dsn = "") {
-        $dbFactory = SC_DB_DBFactory::getInstance();
+        $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
 
@@ -100 +100 @@
      */
     function sfColumnExists($table_name, $col_name, $col_type = "", $dsn = "", $add = false) {
-        $dbFactory = SC_DB_DBFactory::getInstance();
+        $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
 
@@ -146 +146 @@
      */
     function sfIndexExists($table_name, $col_name, $index_name, $length = "", $dsn = "", $add = false) {
-        $dbFactory = SC_DB_DBFactory::getInstance();
+        $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
 
@@ -180 +180 @@
      */
     function sfDataExists($table_name, $where, $arrval, $dsn = "", $sql = "", $add = false) {
-        $dbFactory = SC_DB_DBFactory::getInstance();
+        $dbFactory = SC_DB_DBFactory_Ex::getInstance();
         $dsn = $dbFactory->getDSN($dsn);
 
@@ -294 +294 @@
         $objPage->tpl_total_pretax = 0;     // 費用合計(税込み)
         $objPage->tpl_total_tax = 0;        // 消費税合計
-    if (USE_POINT !== false) {
         $objPage->tpl_total_point = 0;      // ポイント合計
-    }
 
         // カート内情報の取得
@@ -400 +398 @@
         $objPage->tpl_total_tax = $objCartSess->getAllProductsTax($arrInfo);
         // 全商品合計ポイント
-    if (USE_POINT !== false) {
         $objPage->tpl_total_point = $objCartSess->getAllProductsPoint();
-    }
 
         return $objPage;
@@ -944 +940 @@
         // 最下層(level=5)のカテゴリから順に足し合わせていく。
         for ($i = 5; $i >= 1; --$i) {
-            $sql = " INSERT INTO dtb_category_total_count (category_id, product_count, create_date) ";
-            $sql .= " SELECT category_id, SUM(product_count), NOW() ";
-            $sql .= " FROM (SELECT T1.parent_category_id AS category_id, T2.product_count ";
-            $sql .= " FROM dtb_category AS T1, dtb_category_total_count AS T2 ";
-            $sql .= " WHERE T2.category_id = T1.category_id AND T1.level = ? ";
-            $sql .= " UNION ALL SELECT T3.category_id, T4.product_count ";
-            $sql .= " FROM dtb_category AS T3, dtb_category_count AS T4 ";
-            $sql .= " WHERE T4.category_id = T3.category_id AND T3.level = ?) AS T5 ";
-            $sql .= " GROUP BY category_id; ";
-
+            $sql = <<< __EOS__
+                INSERT INTO dtb_category_total_count (category_id, product_count, create_date)
+                SELECT category_id, SUM(product_count), NOW()
+                FROM
+                    (
+                        SELECT T1.parent_category_id AS category_id, T2.product_count
+                        FROM dtb_category AS T1, dtb_category_total_count AS T2
+                        WHERE T2.category_id = T1.category_id AND T1.level = ?
+                        UNION ALL
+                        SELECT T3.category_id, T4.product_count
+                        FROM dtb_category AS T3, dtb_category_count AS T4
+                        WHERE T4.category_id = T3.category_id AND T3.level = ?
+                    ) AS T5
+                GROUP BY category_id;
+__EOS__;
             $objQuery->query($sql, array($i+1, $i));
         }

branches/comu-ver2/html/install/index.php

@@ -762 +762 @@
             $sql_split = split(";",$sql);
             foreach($sql_split as $key => $val){
-                echo ' ';
+                SC_Utils::sfFlush();
                 if (trim($val) != "") {
                     $ret = $objDB->query($val);