Ticket #2512: zip_insert.patch

data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php

@@ -233 +233 @@
         $img_cnt = 0;
 
         $fp = $this->openZipCsv();
-        while (!feof($fp)) {
-            $arrCSV = fgetcsv($fp, ZIP_CSV_LINE_MAX);
-            if (empty($arrCSV)) continue;
-            $cntCurrentLine++;
-            if ($cntCurrentLine >= $start) {
-                $sqlval = array();
-                $sqlval['zip_id'] = $cntCurrentLine;
-                $sqlval['zipcode'] = $arrCSV[2];
-                $sqlval['state'] = $arrCSV[6];
-                $sqlval['city'] = $arrCSV[7];
-                $sqlval['town'] = $arrCSV[8];
-                $objQuery->insert('mtb_zip', $sqlval);
+        $begin = microtime(true);
+
+        if ($fp !== false) {
+            $line = file(ZIP_CSV_UTF8_REALFILE);
+            // $dbconn = pg_connect("host=127.0.0.1 dbname=eccube_213 user=kentaro_ohkouchi password=foo");
+            // pg_query($dbconn, 'BEGIN');
+            // $result = pg_prepare($dbconn, 'zip_insert', 'INSERT INTO mtb_zip (zip_id, zipcode, state, city, town) VALUES ($1, $2, $3, $4, $5)');
+            $objQuery->begin();
+            $sth = $objQuery->prepare('INSERT INTO mtb_zip (zip_id, zipcode, state, city, town) VALUES (?, ?, ?, ?, ?)', null, MDB2_PREPARE_MANIP);
+
+            for($i = 0; $line[$i] != ''; $i ++){
+                $array = explode(",", $line[$i]);
+                // pg_send_execute($dbconn, 'zip_insert', array($i, $array[2], $array[6], $array[7], $array[8]));
+                $objQuery->execute($sth, array($i, $array[2], $array[6], $array[7], $array[8]));
+
+                if ($i % $disp_line == 0 && $img_cnt < IMAGE_MAX) {
+                    echo '<img src="' . $img_path . 'graph_1_w.gif">';
+                    SC_Utils_Ex::sfFlush();
+                    $img_cnt++;
+                }
+                SC_Utils_Ex::extendTimeOut();
                 $cntInsert++;
             }
 
-            // $disp_line件ごとに進捗表示する
-            if ($cntCurrentLine % $disp_line == 0 && $img_cnt < IMAGE_MAX) {
-                echo '<img src="' . $img_path . 'graph_1_w.gif">';
-                SC_Utils_Ex::sfFlush();
-                $img_cnt++;
-            }
-            SC_Utils_Ex::extendTimeOut();
+            $objQuery->commit();
+            // pg_query($dbconn, 'COMMIT');
+            // pg_close($dbconn);
+
         }
+
+        $end = microtime(true);
         fclose($fp);
 
         echo '<img src="' . $img_path . 'space_w.gif">';
@@ -270 +278 @@
                     document.open('text/html','replace');
                     document.clear();
                     document.write('<p>完了しました。<br />');
-                    document.write("<?php echo $cntInsert ?> 件を追加しました。</p>");
+                    document.write("<?php echo $cntInsert ?> 件を追加しました。<?php echo ($end-$begin); ?> 秒かかりました</p>");
                     document.write("<p><a href='?' target='_top'>戻る</a></p>");
                     document.close();
                 }