From b2386ea646b7fcf6472e9c541dc4f9900547b24e Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 12 Feb 2009 12:03:14 +0000 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=83=84=E3=83=BC?= =?UTF-8?q?=E3=83=AB:=E3=82=A8=E3=83=A9=E3=83=BC=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E8=BF=94=E3=82=8A=E5=80=A4=E3=83=99=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=81=8B=E3=82=89=E4=BE=8B=E5=A4=96=E3=83=99=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@163 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWLChecker.ncb | Bin 6958080 -> 6958080 bytes .../MasterEditorTWLChecker.suo | Bin 25088 -> 26624 bytes .../MasterEditorTWLChecker/Debug/BuildLog.htm | Bin 14758 -> 11250 bytes .../MasterEditorTWLChecker.cpp | 29 ++++---- .../MasterEditorTWLChecker/check.cpp | 5 +- .../MasterEditorTWLChecker/check.h | 7 +- .../MasterEditorTWLChecker/check_sheet.cpp | 65 ++++-------------- 7 files changed, 35 insertions(+), 71 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb index dd2fe9b23144b16f2b758e30779f9b128e86f6bd..f56299d9d546b45fea1f9444db606546b389b3f9 100644 GIT binary patch delta 3445 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 delta 2525 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 J-L`I^?0=`c>a_p> delta 1251 zcmZvbZD?Cn7{~9qIX7=N&0FtgvLv%F+v-Txrn76M)+U*^>sz)YHFlP%t85?UK-{#V z+myvpP#8nWAN*>kUj~Db?SL=fhtzJ+Z6CHmK|ctJ9|ZA>Vm7F_*5~8~L9=^#IM4Y# z_niBGp7Wg2JyyEGD#umV#-{Z|@tT_BennBP71FHCvn+~L-q!Ng;-BipTg*m*^lqHx zw>?|PZ7kZPPj;Z{nK{zSB}2ABYtOgZo?sDiKX6F3GZ%fJTN;cUmU*wJ8F@|XAlzo*Z4JDQ zGu6=XSLA^1p{Pnmi$!WI#TY{-dLO0jCA_h}Uz3uz;&kk0xowOD*Ar}8W80-?e~yA) zhO_PCSk~!p?GeV)_9RDYCWcep8ajEa80*y4|I?tju+!5_akuLOv9No{hQ-hq$j3X- z)8)rE6HZi$91HP5QB61*ibX%Z-*bZ5km*i|sVFBj5Wvr&IE#v?A4#JUINBZeiOvem_ho*36c;~;dH)k$hPhVE~rIpEU{8TVd-S6C& zAw9mjDn*&4kv05RXq3lyqQN9TN7hC5u6RFgV`bCSw$kh|>uAjS0c$T2@nGFN&$2i( zG9i0Gf16m)+8CLER=l^@FFFqFU|PL4D8%FLW6CLd73J%kD2;9~4d&H~LL0Z@lW~J? zQlYp-RL4Dx%O$usQNdEORL+{3L5tj$g6sm@h4pNXg{}F)oSlUz9H~!h2cy=_F%BIM z%e%Blp-W_+k$p}k*~YcP>(qt4Y0USp1!V3op8Mkp4fXa{a5@|b$V8qcdzDQ34^Svv z;J5mJ`I3qn)kX2`}TUJc8ZQDeM+ygr#x+Hvi%*F+UYgs zlb-e=v8Qn6@MOI_0m(d{5=&SWRIucVp&Isz&A}j}TAplf@gI*Ek7$(m%ZW$Ok7kFO JDQw3c{sR!;iMjv) diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Debug/BuildLog.htm index c9d6126ab5275ae1cb4b92adc444a7b432d6362b..0e04e96019fc7fe4f20e29dd9099bba4a926d152 100644 GIT binary patch delta 314 zcmZ2h{3(1x5}TkogAs!{g9(EHkTzj3W-!}a$hMnp@&n$G$?N!hCY$k!P3BXV*&HBg z!iYufPJw<#K?`&vCKs}qZWfZQW1XBNd1G>)0MFz)ExpMi++v$|D0?wZ{-Gu|SwU52 z@*h5q%{;1y7&r5&hhQ;fbD;*%a7!$P8*g^fDr3STwNpTP^CKM}MnOk(U7Kz7*qNj; zgcN|#D;K(w`oKarZpCd~DhPrLznfOlJQ&WsbIANXu5hnrZ!0v0JtSdr^yh`0mNG3Pq5 z{v58MgcZ2ks7rDx5|A52Yme9A0kvTkjZO|KV?8#kv7W>p?J^1~75L-X=Q4W{d6coN z*3C+{L&mz;P~w~TB|Zroo8l?|Y{XDUfd!SYOtCS_AXt!jU zO3Wl<%(EdC#>u0`&td!$+@^o5kI&o=LqS&K2UTD=X2=VJeO9tZiQ(Y=J@TFRqq-7$ zZm6lq7ejszpHltNIinM=?hLX|6p*cr7XoKJfR)EWd((1 zVI~6dZsL&qo#>CWZ9p3$I4~+dCj!3zbN`Sysb}tQ#dsBtO3z4q?_2R#yb(`?yqB;W z3rtdHM_o#pgSBxOvpB*#%Qd^f8C7wc)|P&@+2tyGuji>JnI`5ssp{1%QETIT^LDAJ zGKP)gq$(&Wz3JR~{bE^2HwdV4PwRwMaCMtNx=CP~x=wOBRh=IC%oDwpz+nm-r ^args) { - FilenameItem ^fItem = gcnew FilenameItem; - fItem->parseFilename( args[0] ); - - SheetItem ^sItem = gcnew SheetItem; - sItem->readSheet( args[0] ); - - System::String^ errmsg = checkSheet( fItem, sItem ); - if( errmsg != nullptr ) + try { - Console::WriteLine( "NG " + errmsg ); - } - else - { - Console::WriteLine( "OK" ); - } + FilenameItem ^fItem = gcnew FilenameItem; + fItem->parseFilename( args[0] ); - Console::WriteLine(L"Hello World"); + SheetItem ^sItem = gcnew SheetItem; + sItem->readSheet( args[0] ); + + checkSheet( fItem, sItem ); + } + catch( System::Exception ^ex ) + { + Console::WriteLine( "NG - " + ex->Message); + return -1; + } + Console::WriteLine( "OK" ); return 0; } diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp index a80f6f4..d8bb09e 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp @@ -7,7 +7,7 @@ using namespace System; // ファイル名の解析 // ------------------------------------------------------------------ -System::Boolean FilenameItem::parseFilename( System::String ^filepath ) +System::Void FilenameItem::parseFilename( System::String ^filepath ) { System::String ^filename = System::IO::Path::GetFileNameWithoutExtension(filepath); @@ -22,6 +22,5 @@ System::Boolean FilenameItem::parseFilename( System::String ^filepath ) Console::WriteLine( "Ogn: " + this->ogn ); Console::WriteLine( "Rating: " + this->rating ); Console::WriteLine( "Lang: " + this->lang ); - - return true; + return; } diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h index 3b26bdf..ef1d826 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h @@ -13,7 +13,7 @@ public: public: FilenameItem(){} public: - System::Boolean parseFilename( System::String ^filepath ); + System::Void parseFilename( System::String ^filepath ); }; // @@ -34,7 +34,8 @@ public: public: SheetItem(){} public: - System::Boolean readSheet( System::String ^sheetfile ); + System::Void readSheet( System::String ^sheetfile ); }; -System::String^ checkSheet( FilenameItem ^fItem, SheetItem ^sItem ); +// 提出確認書の文字列と真値を比較 +System::Void checkSheet( FilenameItem ^fItem, SheetItem ^sItem ); diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_sheet.cpp b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_sheet.cpp index 6859f69..518250a 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_sheet.cpp +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_sheet.cpp @@ -13,41 +13,24 @@ using namespace System; // 提出確認書の読み込み // ------------------------------------------------------------------ -System::Boolean SheetItem::readSheet( System::String ^sheetfile ) +System::Void SheetItem::readSheet( System::String ^sheetfile ) { // XSLによってXML変換 System::String ^tmpfile = ".\\temp" + System::DateTime::Now.ToString("yyyyMMddHHmmss") + ".xml"; System::Xml::Xsl::XslCompiledTransform ^xslt = gcnew System::Xml::Xsl::XslCompiledTransform; System::String ^xslpath = System::IO::Path::GetDirectoryName( System::Reflection::Assembly::GetEntryAssembly()->Location ) + "\\extract_sheet.xsl"; - try - { - //Console::WriteLine( "xslpath: " + xslpath ); - xslt->Load( xslpath ); - xslt->Transform( sheetfile, tmpfile ); - } - catch( System::Exception ^ex ) - { - (void)ex; - //Console::WriteLine( "XSLT Error" ); - return false; - } + + //Console::WriteLine( "xslpath: " + xslpath ); + xslt->Load( xslpath ); + xslt->Transform( sheetfile, tmpfile ); + // 変換したXMLを読み込み System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument; - try - { - doc->Load( tmpfile ); - } - catch( System::Exception ^ex ) - { - (void)ex; - //Console::WriteLine( "Load error" ); - return false; - } + doc->Load( tmpfile ); // XMLからデータを抽出 System::Xml::XmlElement ^root = doc->DocumentElement; - try { this->region = MasterEditorTWL::getXPathText( root, "/Sheet/Region" ); this->CERO = MasterEditorTWL::getXPathText( root, "/Sheet/RatingCERO" ); @@ -79,19 +62,12 @@ System::Boolean SheetItem::readSheet( System::String ^sheetfile ) Console::WriteLine( "OFLC: " + this->OFLC ); Console::WriteLine( "Unnecessary: " + this->IsUnnecessaryRating.ToString() ); } - catch( System::Exception ^ex ) - { - //(void)ex; - Console::WriteLine( ex->Message ); - return false; - } // 中間ファイルを削除 if( System::IO::File::Exists( tmpfile ) ) { System::IO::File::Delete( tmpfile ); } - return true; } @@ -101,23 +77,13 @@ System::Boolean SheetItem::readSheet( System::String ^sheetfile ) // @arg [in] ファイル情報 // @arg [in] 提出確認書の情報 -// -// @ret エラーメッセージ (エラーなしのときnullptr) -System::String^ checkSheet( FilenameItem ^fItem, SheetItem ^sItem ) +System::Void checkSheet( FilenameItem ^fItem, SheetItem ^sItem ) { System::Xml::XmlDocument ^doc = gcnew System::Xml::XmlDocument; - try - { - System::String ^cfgfile = System::IO::Path::GetDirectoryName( System::Reflection::Assembly::GetEntryAssembly()->Location ) - + "\\config.xml"; - doc->Load( cfgfile ); - } - catch( System::Exception ^ex ) - { - (void)ex; - //Console::WriteLine( "Load error" ); - return (gcnew System::String("Failed to load XML")); - } + System::String ^cfgfile = System::IO::Path::GetDirectoryName( System::Reflection::Assembly::GetEntryAssembly()->Location ) + + "\\config.xml"; + doc->Load( cfgfile ); + // XMLからデータを抽出 System::Xml::XmlElement ^root = doc->DocumentElement; @@ -134,7 +100,7 @@ System::String^ checkSheet( FilenameItem ^fItem, SheetItem ^sItem ) // リージョンの文字列をチェック if( sItem->region != region ) { - return (gcnew System::String("In Sheet, region is illegal string.")); + throw (gcnew System::Exception("In Sheet, region is illegal string.")); } // レーティングの文字列をチェック if( fItem->region == "JP" ) @@ -240,8 +206,7 @@ System::String^ checkSheet( FilenameItem ^fItem, SheetItem ^sItem ) } if( errmsg != nullptr ) { - return errmsg; + throw (gcnew System::Exception(errmsg)); } - - return nullptr; + return; } \ No newline at end of file