diff --git a/src/dbtree/nodetree2chcompati.cpp b/src/dbtree/nodetree2chcompati.cpp index 7c7a91aa5..8d4bb5324 100644 --- a/src/dbtree/nodetree2chcompati.cpp +++ b/src/dbtree/nodetree2chcompati.cpp @@ -74,60 +74,6 @@ void NodeTree2chCompati::init_loading() -// -// キャッシュに保存する前の前処理 -// -// 先頭にrawモードのステータスが入っていたら取り除く -// -char* NodeTree2chCompati::process_raw_lines( std::string& rawlines ) -{ - char* pos = rawlines.data(); - - if( *pos == '+' || *pos == '-' || *pos == 'E' ){ - - int status = 0; - if( pos[ 1 ] == 'O' && pos[ 2 ] == 'K' ) status = 1; - if( pos[ 1 ] == 'E' && pos[ 2 ] == 'R' && pos[ 3 ] == 'R' ) status = 2; - if( pos[ 1 ] == 'I' && pos[ 2 ] == 'N' && pos[ 3 ] == 'C' && pos[ 4 ] == 'R' ) status = 3; - if( pos[ 0 ] == 'E' && pos[ 1 ] == 'R' && pos[ 2 ] == 'R' && pos[ 3 ] == 'O' && pos[ 4 ] == 'R' ) status = 4; - -#ifdef _DEBUG - std::cout << "NodeTree2chCompati::process_raw_lines : raw mode status = " << status << std::endl; -#endif - - if( status != 0 ){ - pos = skip_status_line( pos, status ); - } - } - - return pos; -} - - -// -// ステータス行のスキップ処理 -// status == 1 : 正常ステータス -// status != 1 : 異常ステータス -// -char* NodeTree2chCompati::skip_status_line( char* pos, int status ) -{ - // この行を飛ばす - char* pos_msg = pos; - while( *pos != '\n' && *pos != '\0' ) ++pos; - - // エラー - if( status != 1 ){ - const std::string& ext_err = m_iconv->convert( pos_msg, pos - pos_msg ); - set_ext_err( ext_err ); - MISC::ERRMSG( ext_err ); - } - - if( *pos == '\n' ) ++pos; - - return pos; -} - - // // raw データを dat 形式に変換 // diff --git a/src/dbtree/nodetree2chcompati.h b/src/dbtree/nodetree2chcompati.h index af416fa99..5d2c7288e 100644 --- a/src/dbtree/nodetree2chcompati.h +++ b/src/dbtree/nodetree2chcompati.h @@ -32,11 +32,8 @@ namespace DBTREE void clear() override; void init_loading() override; - char* process_raw_lines( std::string& rawlines ) override; const char* raw2dat( char* rawlines, int& byte ) override; - char* skip_status_line( char* pos, int status ); - void create_loaderdata( JDLIB::LOADERDATA& data ) override; }; }