Yammy日記

_ [Book] RailsによるアジャイルWebアプリケーション開発

_ [EC-CUBE] 2008-03-17EC-CUBE更新内容1

Date: 2008-03-17 18:02:18 +0900 (Mon, 17 Mar 2008)
New Revision: 27
 
Modified:
   eccube2/trunk/data/class/batch/SC_Batch_Update.php
   eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
Log:
auto commit
 
Modified: eccube2/trunk/data/class/batch/SC_Batch_Update.php
===================================================================
--- eccube2/trunk/data/class/batch/SC_Batch_Update.php	2008-03-13 07:01:52 UTC (rev 26)
+++ eccube2/trunk/data/class/batch/SC_Batch_Update.php	2008-03-17 09:02:18 UTC (rev 27)
@@ -123,9 +123,10 @@
                             break 2;
                         }
 
-                        if ($sha1 == sha1_file($out)) {
+                        if (file_exists($out) && $sha1 == sha1_file($out)) {
                             $msg = "同じ内容のファイルをスキップしました: " . $out;
                             $this->printLog($msg);
+                            continue;
                         }
 
                         // バックアップを作成
 
Modified: eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
===================================================================
--- eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2008-03-13 07:01:52 UTC (rev 26)
+++ eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2008-03-17 09:02:18 UTC (rev 27)
@@ -32,7 +32,7 @@
  *
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Upgrade_Download.php 16932 2007-12-19 09:14:35Z adachi $
+ * @version $Id: LC_Page_Upgrade_Download.php 17160 2008-03-17 08:23:37Z adachi $
  */
 class LC_Page_Upgrade_Download extends LC_Page_Upgrade_Base {
 
@@ -212,12 +212,14 @@
             $objLog->log("* insert dtb_module_update start");
             $this->registerUpdateLog($arrCopyLog, $objRet->data);
 
-            if ($mode != 'patch_download') {
-	            // dtb_moduleの更新
-	            $objLog->log("* insert/update dtb_module start");
-	            $this->updateMdlTable($objRet->data);
-            }
+            // dtb_moduleの更新
+            $objLog->log("* insert/update dtb_module start");
+            $this->updateMdlTable($objRet->data);
 
+            // DB更新ファイルの読み込み、実行
+            $objLog->log("* file execute start");
+            $this->fileExecute();
+
             // 配信サーバへ通知
             $objLog->log("* notify to lockon server start");
             $objReq = $this->notifyDownload($mode, $objReq->getResponseCookies());
@@ -369,5 +371,23 @@
         $objQuery = new SC_Query;
         $objQuery->insert('dtb_module_update_logs', $arrInsert);
     }
+
+    /**
+     * DB更新ファイルの読み込み、実行
+     *
+     * パッチ側でupdate.phpを用意する.
+     * 他の変数・関数とかぶらないよう、
+     * LC_Update_Updater::execute()で処理を実行する.
+     */
+    function fileExecute() {
+        $file = DATA_PATH . 'downloads/update/update.php';
+        if (file_exists($file)) {
+            @include_once $file;
+            if (class_exists('LC_Update_Updater')) {
+                $update = new LC_Update_Updater;
+                $update->execute();
+            }
+        }
+    }
 }
 ?>

_ [EC-CUBE] 2008-03-17EC-CUBE更新内容2

Date: 2008-03-17 20:01:35 +0900 (Mon, 17 Mar 2008)
New Revision: 28
 
Modified:
   eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
Log:
auto commit
 
Modified: eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
===================================================================
--- eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2008-03-17 09:02:18 UTC (rev 27)
+++ eccube2/trunk/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2008-03-17 11:01:35 UTC (rev 28)
@@ -32,7 +32,7 @@
  *
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Upgrade_Download.php 17160 2008-03-17 08:23:37Z adachi $
+ * @version $Id: LC_Page_Upgrade_Download.php 17161 2008-03-17 10:57:32Z adachi $
  */
 class LC_Page_Upgrade_Download extends LC_Page_Upgrade_Base {
 
@@ -218,7 +218,7 @@
 
             // DB更新ファイルの読み込み、実行
             $objLog->log("* file execute start");
-            $this->fileExecute();
+            $this->fileExecute($objRet->data->product_code);
 
             // 配信サーバへ通知
             $objLog->log("* notify to lockon server start");
@@ -379,8 +379,8 @@
      * 他の変数・関数とかぶらないよう、
      * LC_Update_Updater::execute()で処理を実行する.
      */
-    function fileExecute() {
-        $file = DATA_PATH . 'downloads/update/update.php';
+    function fileExecute($productCode) {
+        $file = DATA_PATH . 'downloads/update/' . $productCode . '_update.php';
         if (file_exists($file)) {
             @include_once $file;
             if (class_exists('LC_Update_Updater')) {