From bed6e627f5e3aa666737193b9bdb733d8e72b1ba Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 May 2007 09:39:47 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1430
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/importer/importer.controller.php  | 6 +++---
 modules/importer/tpl/index.html           | 2 ++
 modules/importer/tpl/js/importer_admin.js | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/importer/importer.controller.php b/modules/importer/importer.controller.php
index 6262ae341..d661ac4a1 100644
--- a/modules/importer/importer.controller.php
+++ b/modules/importer/importer.controller.php
@@ -209,9 +209,9 @@
             if($fp) {
                 $buff = '';
                 while(!feof($fp)) {
-                    $str = fgets($fp,1024);
+                    $str = fread($fp,1024);
                     $buff .= $str;
-
+                    flush();
                     $buff = preg_replace_callback("!<document sequence=\"([^\"]*)\">(.*?)<\/document>!is", array($this, '_importDocument'), trim($buff));
 
                     if($this->position+$this->limit_count <= $this->imported_count) break;
@@ -239,7 +239,7 @@
                 foreach($files as $key => $val) {
                     $filename = $val->attrs->name;
                     $downloaded_count = (int)$val->downloaded_count->body;
-                    $file_buff = base64_decode($val->buff);
+                    $file_buff = base64_decode($val->buff->body);
 
                     $tmp_filename = './files/cache/tmp_uploaded_file';
                     FileHandler::writeFile($tmp_filename, $file_buff);
diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html
index fc8cf28d1..93fcf1fd1 100644
--- a/modules/importer/tpl/index.html
+++ b/modules/importer/tpl/index.html
@@ -81,6 +81,8 @@
 <!-- step 2. XML 파일 지정 -->
 <div id="step2" style="display:none">
     <form action="./" method="get" onsubmit="return doStep2(this)" id="fo_step2">
+        <input type="hidden" name="module" value="importer" />
+        <input type="hidden" name="act" value="procImporterAdminImport" />
         <input type="hidden" name="module_srl" value="" />
         <input type="hidden" name="category_srl" value="" />
         <input type="hidden" name="position" value="0" />
diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js
index 49a60e4a5..eef003a9b 100644
--- a/modules/importer/tpl/js/importer_admin.js
+++ b/modules/importer/tpl/js/importer_admin.js
@@ -75,7 +75,8 @@ function doStep2(fo_obj) {
         fo_obj.category_srl.value = category_srl;
     }
 
-    procFilter(fo_obj, import_xml);
+    fo_obj.submit();
+    //procFilter(fo_obj, import_xml);
 
     xGetElementById('step2_status').style.display = 'block';
     return false;