From f2412760a338a357d69f127d2ebc77472b4f6690 Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 17 May 2007 05:49:37 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1455 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- modules/importer/importer.controller.php | 74 +++++++++++------------ modules/importer/tpl/index.html | 2 - modules/importer/tpl/js/importer_admin.js | 6 +- 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index 97b6b78d0..acdf94a60 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -24,7 +24,7 @@ * 2 : 1 + DB 쿼리 * 3 : 모든 로그 **/ - define('__DEBUG__', 3); + define('__DEBUG__', 0); /** * @brief 간단하게 사용하기 위한 함수 정의한 파일 require diff --git a/modules/importer/importer.controller.php b/modules/importer/importer.controller.php index fbf8af0f0..d132f4071 100644 --- a/modules/importer/importer.controller.php +++ b/modules/importer/importer.controller.php @@ -118,7 +118,7 @@ $is_finished = $this->importMember($xml_file); } - if($this->position+$this->limit_count > $this->imported_count) { + if($is_finished) { $this->add('is_finished', 'Y'); $this->setMessage( sprintf(Context::getLang('msg_import_finished'), $this->imported_count) ); } else { @@ -221,7 +221,6 @@ while(!feof($fp)) { $str = fread($fp,1024); $buff .= $str; - flush(); $buff = preg_replace_callback("!(.*?)<\/document>!is", array($this, '_importDocument'), trim($buff)); if($this->position+$this->limit_count <= $this->imported_count) { @@ -296,44 +295,45 @@ $args->allow_trackback = $xml_doc->document->allow_trackback->body; $output = $this->oDocumentController->insertDocument($args, true); - if(!$output->toBool()) return; + if($output->toBool()) { - // 코멘트 입력 - $comments = $xml_doc->document->comments->comment; - if($comments && !is_array($comments)) $comments = array($comments); - if(count($comments)) { - foreach($comments as $key => $val) { - $comment_args->document_srl = $args->document_srl; - $comment_args->comment_srl = getNextSequence(); - $comment_args->module_srl = $this->module_srl; - $comment_args->parent_srl = $val->parent_srl->body; - $comment_args->content = $val->content->body; - $comment_args->password = $val->password->body; - $comment_args->nick_name = $val->nick_name->body; - $comment_args->user_id = $val->user_id->body; - $comment_args->user_name = $val->user_name->body; - $comment_args->member_srl = -1; - $comment_args->email_address = $val->email_address->body; - $comment_args->regdate = $val->regdate->body; - $comment_args->ipaddress = $val->ipaddress->body; - $this->oCommentController->insertComment($comment_args, true); + // 코멘트 입력 + $comments = $xml_doc->document->comments->comment; + if($comments && !is_array($comments)) $comments = array($comments); + if(count($comments)) { + foreach($comments as $key => $val) { + $comment_args->document_srl = $args->document_srl; + $comment_args->comment_srl = getNextSequence(); + $comment_args->module_srl = $this->module_srl; + $comment_args->parent_srl = $val->parent_srl->body; + $comment_args->content = $val->content->body; + $comment_args->password = $val->password->body; + $comment_args->nick_name = $val->nick_name->body; + $comment_args->user_id = $val->user_id->body; + $comment_args->user_name = $val->user_name->body; + $comment_args->member_srl = -1; + $comment_args->email_address = $val->email_address->body; + $comment_args->regdate = $val->regdate->body; + $comment_args->ipaddress = $val->ipaddress->body; + $this->oCommentController->insertComment($comment_args, true); + } } - } - // 트랙백 입력 - $trackbacks = $xml_doc->document->trackbacks->trackback; - if($trackbacks && !is_array($trackbacks)) $trackbacks = array($trackbacks); - if(count($trackbacks)) { - foreach($trackbacks as $key => $val) { - $trackback_args->document_srl = $args->document_srl; - $trackback_args->module_srl = $this->module_srl; - $trackback_args->url = $val->url->body; - $trackback_args->title = $val->title->body; - $trackback_args->blog_name = $val->blog_name->body; - $trackback_args->excerpt = $val->excerpt->body; - $trackback_args->regdate = $val->regdate->body; - $trackback_args->ipaddress = $val->ipaddress->body; - $this->oTrackbackController->insertTrackback($trackback_args, true); + // 트랙백 입력 + $trackbacks = $xml_doc->document->trackbacks->trackback; + if($trackbacks && !is_array($trackbacks)) $trackbacks = array($trackbacks); + if(count($trackbacks)) { + foreach($trackbacks as $key => $val) { + $trackback_args->document_srl = $args->document_srl; + $trackback_args->module_srl = $this->module_srl; + $trackback_args->url = $val->url->body; + $trackback_args->title = $val->title->body; + $trackback_args->blog_name = $val->blog_name->body; + $trackback_args->excerpt = $val->excerpt->body; + $trackback_args->regdate = $val->regdate->body; + $trackback_args->ipaddress = $val->ipaddress->body; + $this->oTrackbackController->insertTrackback($trackback_args, true); + } } } diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html index dce07d095..fc8cf28d1 100644 --- a/modules/importer/tpl/index.html +++ b/modules/importer/tpl/index.html @@ -81,8 +81,6 @@