Changeset 5724 for temp/trunk/html/admin/system

Timestamp:

2006/09/25 14:09:05 (20 years ago)

Author:

kakinaka

Message:

blank

File:

• temp/trunk/html/admin/system/bkup.php (modified) (5 diffs)

temp/trunk/html/admin/system/bkup.php

@@ -350 +350 @@
         
         $objQuery->begin();
+        
         // DB¤ò¥¯¥ê¥¢
-        lfDeleteAll($objQuery);
+        $err = lfDeleteAll($objQuery);
         
         // INSERT¼Â¹Ô
-        lfExeInsertSQL($objQuery, $bkup_dir . "bkup_data.csv");
+        if ($err) $err = lfExeInsertSQL($objQuery, $bkup_dir . "bkup_data.csv");
 
         // ²èÁü¤Î¥³¥Ô¡¼
@@ -364 +365 @@
         sfDelFile($bkup_dir);
         
-        $objQuery->commit();
+        // ¥ê¥¹¥È¥¢À®¸ù¤Ê¤é¥³¥ß¥Ã¥È¼ºÇԤʤé¥í¡¼¥ë¥Ð¥Ã¥¯
+        if ($err) {
+            $objQuery->commit();
+        }else{
+            $objQuery->rollback();
+        }
     }
 }
@@ -378 +384 @@
     $tbl_flg = false;
     $col_flg = false;
+    $ret = true;
     
     foreach($arrCsvData as $key => $val){
         $data = trim($val);
+        
+        // ¥¨¥é¡¼¤¬¤¢¤ì¤Ð½ªÎ»
+        if (!$ret){
+            return $ret;
+        }
+        
         //¶õÇò¹Ô¤Î¤È¤­¤Ï¥Æ¡¼¥Ö¥ëÊѹ¹
         if ($data == "") {
@@ -405 +418 @@
         // ¥¤¥ó¥µ¡¼¥È¤¹¤ëÃͤò¥»¥Ã¥È
         $sql = $base_sql . " ($data);\n";
-        $objQuery->query($sql);
-    }
-    
-    return $sql;
+        $ret = $objQuery->query($sql);
+    }
+    
+    return $ret;
 }
 
 // DB¤òÁ´¤Æ¥¯¥ê¥¢¤¹¤ë
 function lfDeleteAll($objQuery){
+    $ret = true;
 
     $arrTableList = lfGetTableList();
@@ -420 +434 @@
         if ($val != "dtb_bkup") {
             $trun_sql = "DELETE FROM $val;";
-            $objQuery->query($trun_sql);
-        }
-    }
+            $ret = $objQuery->query($trun_sql);
+            
+            if (!$ret) return $ret;
+        }
+    }
+    
+    return $ret;
 }