fix: can't show ID

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1140 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/README.machibbs b/README.machibbs
index 23f0d0d..34c07b9 100644 (file)
--- a/README.machibbs
+++ b/README.machibbs
@@ -9,6 +9,7 @@
 
 ¡¦HTML¤ò²òÀϤ¹¤ëɬÍפ¬¤¢¤ë¡£
 ¥Ñ¥¿¡¼¥ó¤Ï¥á¡¼¥ë¥¢¥É¥ì¥¹¤¢¤ê¤Ê¤·¤Ç2¤Ä³ÎǧºÑ¤ß¡£
+-> Ë̳¤Æ»¤ÇÊ̥ѥ¿¡¼¥ó³Îǧorz
 
 ¡¦¤¢¤Ü¡¼¤ó¤Ï¤½¤Î¤Þ¤ÞÆ©ÌÀºï½ü¤µ¤ì¤ë¤é¤·¤¤¡£
 ¤Ê¤Î¤Ç¥ì¥¹ÈÖ¹æ¤Ï²òÀϤ·¤¿Êª¤ò»È¤¦É¬Íפ¬¤¢¤ë¡£
@@ -23,7 +24,7 @@
 ¥Ð¥°
 ¡¦¥ì¥¹¿ô¡¢´ûÆÉ¿ô¤¬0¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¡£
 ¡¦¥ì¥¹¤¬¥Ý¥Ã¥×¥¢¥Ã¥×¤µ¤ì¤Ê¤¤¡£
-¡¦ID¤¬É½¼¨¤µ¤ì¤Ê¤¤¡£
+¡¦Åê¹Æ¤Î'ÉÃ'¤¬É½¼¨¤µ¤ì¤Ê¤¤
 ¡¦Æ©ÌÀ¤Ç¤Ê¤¤¤¢¤Ü¡¼¤ó¤ÎÂбþ¤¬¤Ê¤µ¤ì¤Æ¤¤¤Ê¤¤(¢­¤Ê¤É)¡£
 http://chugoku.machi.to/bbs/read.pl?BBS=cyugoku&KEY=1084952272
 

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index d246c6d..295abba 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -142,6 +142,7 @@ void DatInfo::copyRawDataToBuffer_MachiBBS( const QString& rawData )
             QString message = regexp.cap( 6 );
             QString datStr = name + "<><>" + date + " " + time + " ID:" + id
             + "<>" + message + "<>";
+            qDebug("datStr = '%s'", (const char *)datStr.local8Bit());
             setDat( datStr, num );
             maxResNum = QMAX( maxResNum, num );
         } else if ( regexp2.search( line ) != -1 ) {
@@ -154,6 +155,7 @@ void DatInfo::copyRawDataToBuffer_MachiBBS( const QString& rawData )
             QString message = regexp2.cap( 7 );
             QString datStr = name + "<>" + mail + "<>" + date + " " + time + " ID:" + id
             + "<>" + message + "<>";
+            qDebug("datStr = '%s'", (const char *)datStr.local8Bit());
             setDat( datStr, num );
             maxResNum = QMAX( maxResNum, num );
         }

diff --git a/kita/src/libkita/parsemisc.cpp b/kita/src/libkita/parsemisc.cpp
index 97fad04..71d8708 100644 (file)
--- a/kita/src/libkita/parsemisc.cpp
+++ b/kita/src/libkita/parsemisc.cpp
@@ -892,7 +892,7 @@ void ParseMisc::parseDateId( const QString& str ,
                                QString &dateIdstr, QDateTime &dTime )
 
 {
-    QRegExp regexp( "(\\d\\d)/(\\d\\d)/(\\d\\d) (\\d\\d):(\\d\\d)( ID:(.*))?" );
+    QRegExp regexp( "(\\d\\d(\\d\\d)?)/(\\d\\d)/(\\d\\d) (\\d\\d):(\\d\\d)(:\\d\\d)?( ID:(.*))?" );
 
     if ( regexp.search( str ) == -1 ) {
         dateIdstr = str;
@@ -900,18 +900,18 @@ void ParseMisc::parseDateId( const QString& str ,
     }
 
     int year = regexp.cap( 1 ).toInt();
-    if ( year >= 70 ) {
+    if ( year >= 70 && year < 100 ) {
         year += 1900;
-    } else {
+    } else if ( year < 70 ) {
         year += 2000;
     }
 
     QDateTime
-    dateTime( QDate( year, regexp.cap( 2 ).toInt(), regexp.cap( 3 ).toInt() ),
-              QTime( regexp.cap( 4 ).toInt(), regexp.cap( 5 ).toInt() ) );
+    dateTime( QDate( year, regexp.cap( 3 ).toInt(), regexp.cap( 4 ).toInt() ),
+              QTime( regexp.cap( 5 ).toInt(), regexp.cap( 6 ).toInt(), regexp.cap( 7 ).toInt() ) );
 
     dTime = dateTime;
-    idstr = regexp.cap( 7 );
+    idstr = regexp.cap( 9 );
 }