From 5c65224fd100ca292d5b74abebd2e67ee4b269b0 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 17 May 2007 05:26:11 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1453
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/blog/skins/default/comment.html       |  9 ---------
 modules/blog/skins/default/trackback.html     |  3 ---
 modules/blog/skins/default/view_document.html | 14 +++++++++++---
 modules/importer/importer.controller.php      | 11 ++++++++---
 modules/importer/tpl/index.html               |  2 ++
 modules/importer/tpl/js/importer_admin.js     |  7 +++++--
 6 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/modules/blog/skins/default/comment.html b/modules/blog/skins/default/comment.html
index bf86b7b19..7f0e69627 100644
--- a/modules/blog/skins/default/comment.html
+++ b/modules/blog/skins/default/comment.html
@@ -1,12 +1,4 @@
 <!--%import("filter/insert_comment.xml")-->
-
-<!-- 댓글 정보 출력 -->
-<a name="comment_top_{$document->document_srl}"></a>
-
-<!-- 댓글 출력 -->
-<div id="comment_{$document->document_srl}" style="display:none">
-    <!-- 댓글 목록 -->
-
     <!--@if($document->comment_list)-->
 
         <!--@foreach($document->comment_list as $key => $val)-->
@@ -69,4 +61,3 @@
     <!--@if($grant->write_comment && $document->lock_comment == 'N')-->
         <div id="comment_form_{$document->document_srl}"></div>
     <!--@end-->
-</div>
diff --git a/modules/blog/skins/default/trackback.html b/modules/blog/skins/default/trackback.html
index 09e1ab4ed..48e27b3c3 100644
--- a/modules/blog/skins/default/trackback.html
+++ b/modules/blog/skins/default/trackback.html
@@ -1,5 +1,3 @@
-<!-- 엮인글 목록 -->
-<div id="trackback_{$document->document_srl}" style="display:none">
 <!--@if($document->trackback_list)-->
     <!--@foreach($document->trackback_list as $key => $val)-->
     <a name="trackback_{$val->trackback_srl}"></a>
@@ -38,4 +36,3 @@
 
     <!--@end-->
 <!--@end-->
-</div>
diff --git a/modules/blog/skins/default/view_document.html b/modules/blog/skins/default/view_document.html
index aaf21b09e..8f0e1e6dc 100644
--- a/modules/blog/skins/default/view_document.html
+++ b/modules/blog/skins/default/view_document.html
@@ -69,14 +69,22 @@
     <a href="#" onclick="doDisplayTrackback('{$document->document_srl}');return false;">{$lang->trackback} : {count($document->trackback_list)}</a>
 </div>
 
+<!-- 엮인글 목록 -->
+<a name="trackback_{$document->document}"></a>
+
+<div id="trackback_{$document->document_srl}" style="display:none">
 <!-- 엮인글 파일 include -->
 <!--@if($document->allow_trackback=='Y')-->
-    <a name="trackback"></a>
-    <!--#include("./trackback.html")-->
+        <!--#include("./trackback.html")-->
 <!--@end-->
+</div>
 
+<!-- 댓글 정보 출력 -->
+<a name="comment_top_{$document->document_srl}"></a>
+
+<div id="comment_{$document->document_srl}" style="display:none">
 <!-- 댓글 파일 include -->
 <!--@if($grant->write_comment&&$document->allow_comment=='Y')-->
-    <a name="comment"></a>
     <!--#include("./comment.html")-->
 <!--@end-->
+</div>
diff --git a/modules/importer/importer.controller.php b/modules/importer/importer.controller.php
index 40b34367b..fbf8af0f0 100644
--- a/modules/importer/importer.controller.php
+++ b/modules/importer/importer.controller.php
@@ -96,7 +96,7 @@
             @set_time_limit(0);
 
             // 디버그 메세지의 양이 무척 커지기에 디버그 메세지 생성을 중단
-            //define('__STOP_DEBUG__', true);
+            define('__STOP_DEBUG__', true);
 
             // 변수 체크
             $this->module_srl = Context::get('module_srl');
@@ -110,8 +110,13 @@
             $this->oXml = new XmlParser();
 
             // module_srl이 있으면 module데이터로 판단하여 처리, 아니면 회원정보로..
-            if($this->module_srl) $is_finished = $this->importDocument($xml_file);
-            else $is_finished = $this->importMember($xml_file);
+            if($this->module_srl) {
+                $this->limit_count = 20;
+                $is_finished = $this->importDocument($xml_file);
+            } else {
+                $this->limit_count = 50;
+                $is_finished = $this->importMember($xml_file);
+            }
 
             if($this->position+$this->limit_count > $this->imported_count) {
                 $this->add('is_finished', 'Y');
diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html
index fc8cf28d1..dce07d095 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="action" 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..88b3197e0 100644
--- a/modules/importer/tpl/js/importer_admin.js
+++ b/modules/importer/tpl/js/importer_admin.js
@@ -75,7 +75,9 @@ function doStep2(fo_obj) {
         fo_obj.category_srl.value = category_srl;
     }
 
-    procFilter(fo_obj, import_xml);
+    //procFilter(fo_obj, import_xml);
+    fo_obj.submit();
+
 
     xGetElementById('step2_status').style.display = 'block';
     return false;
@@ -94,7 +96,8 @@ function completeImport(ret_obj) {
         var fo_obj = xGetElementById('fo_step2');
         fo_obj.position.value = position;
         xInnerHtml('step2_position', position);
-        procFilter(fo_obj, import_xml);
+        //procFilter(fo_obj, import_xml);
+        fo_obj.submit();
     }
 }