Changeset 17552


Ignore:
Timestamp:
2008/08/22 21:02:42 (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

    r17549 r17552  
    7575     * @return array 文字コード情報 
    7676     */ 
    77      function getCharSet() { 
    78         $objQuery = new SC_Query(); 
    79         $arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'"); 
    80         return $arrRet; 
    81      } 
     77    function getCharSet() { 
     78        $objQuery = new SC_Query(); 
     79        $arrRet = $objQuery->getAll("SHOW VARIABLES LIKE 'char%'"); 
     80        return $arrRet; 
     81    } 
    8282     
    8383    /** 
  • branches/comu-ver2/data/class/helper/SC_Helper_DB.php

    r17549 r17552  
    5555     */ 
    5656    function sfGetDBVersion($dsn = "") { 
    57         $dbFactory = SC_DB_DBFactory::getInstance(); 
     57        $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    5858        return $dbFactory->sfGetDBVersion($dsn); 
    5959    } 
     
    6767     */ 
    6868    function sfTabaleExists($table_name, $dsn = "") { 
    69         $dbFactory = SC_DB_DBFactory::getInstance(); 
     69        $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    7070        $dsn = $dbFactory->getDSN($dsn); 
    7171 
     
    100100     */ 
    101101    function sfColumnExists($table_name, $col_name, $col_type = "", $dsn = "", $add = false) { 
    102         $dbFactory = SC_DB_DBFactory::getInstance(); 
     102        $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    103103        $dsn = $dbFactory->getDSN($dsn); 
    104104 
     
    146146     */ 
    147147    function sfIndexExists($table_name, $col_name, $index_name, $length = "", $dsn = "", $add = false) { 
    148         $dbFactory = SC_DB_DBFactory::getInstance(); 
     148        $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    149149        $dsn = $dbFactory->getDSN($dsn); 
    150150 
     
    180180     */ 
    181181    function sfDataExists($table_name, $where, $arrval, $dsn = "", $sql = "", $add = false) { 
    182         $dbFactory = SC_DB_DBFactory::getInstance(); 
     182        $dbFactory = SC_DB_DBFactory_Ex::getInstance(); 
    183183        $dsn = $dbFactory->getDSN($dsn); 
    184184 
     
    294294        $objPage->tpl_total_pretax = 0;     // 費用合計(税込み) 
    295295        $objPage->tpl_total_tax = 0;        // 消費税合計 
    296     if (USE_POINT !== false) { 
    297296        $objPage->tpl_total_point = 0;      // ポイント合計 
    298     } 
    299297 
    300298        // カート内情報の取得 
     
    400398        $objPage->tpl_total_tax = $objCartSess->getAllProductsTax($arrInfo); 
    401399        // 全商品合計ポイント 
    402     if (USE_POINT !== false) { 
    403400        $objPage->tpl_total_point = $objCartSess->getAllProductsPoint(); 
    404     } 
    405401 
    406402        return $objPage; 
     
    944940        // 最下層(level=5)のカテゴリから順に足し合わせていく。 
    945941        for ($i = 5; $i >= 1; --$i) { 
    946             $sql = " INSERT INTO dtb_category_total_count (category_id, product_count, create_date) "; 
    947             $sql .= " SELECT category_id, SUM(product_count), NOW() "; 
    948             $sql .= " FROM (SELECT T1.parent_category_id AS category_id, T2.product_count "; 
    949             $sql .= " FROM dtb_category AS T1, dtb_category_total_count AS T2 "; 
    950             $sql .= " WHERE T2.category_id = T1.category_id AND T1.level = ? "; 
    951             $sql .= " UNION ALL SELECT T3.category_id, T4.product_count "; 
    952             $sql .= " FROM dtb_category AS T3, dtb_category_count AS T4 "; 
    953             $sql .= " WHERE T4.category_id = T3.category_id AND T3.level = ?) AS T5 "; 
    954             $sql .= " GROUP BY category_id; "; 
    955  
     942            $sql = <<< __EOS__ 
     943                INSERT INTO dtb_category_total_count (category_id, product_count, create_date) 
     944                SELECT category_id, SUM(product_count), NOW() 
     945                FROM 
     946                    ( 
     947                        SELECT T1.parent_category_id AS category_id, T2.product_count 
     948                        FROM dtb_category AS T1, dtb_category_total_count AS T2 
     949                        WHERE T2.category_id = T1.category_id AND T1.level = ? 
     950                        UNION ALL 
     951                        SELECT T3.category_id, T4.product_count 
     952                        FROM dtb_category AS T3, dtb_category_count AS T4 
     953                        WHERE T4.category_id = T3.category_id AND T3.level = ? 
     954                    ) AS T5 
     955                GROUP BY category_id; 
     956__EOS__; 
    956957            $objQuery->query($sql, array($i+1, $i)); 
    957958        } 
  • branches/comu-ver2/html/install/index.php

    r17477 r17552  
    762762            $sql_split = split(";",$sql); 
    763763            foreach($sql_split as $key => $val){ 
    764                 echo ' '; 
     764                SC_Utils::sfFlush(); 
    765765                if (trim($val) != "") { 
    766766                    $ret = $objDB->query($val); 
Note: See TracChangeset for help on using the changeset viewer.