From af09ff7e1ba0ba9a1b917596a7a7ec0dd1320436 Mon Sep 17 00:00:00 2001
From: ikemo <ikemo@56b19765-1e22-0410-a548-a0f45d66c51a>
Date: Sun, 11 May 2003 04:58:21 +0000
Subject: [PATCH] Fix: forgot to consider threads without ID.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@219 56b19765-1e22-0410-a548-a0f45d66c51a
---
 kita/ChangeLog            |  4 ++++
 kita/src/part/kita2ch.cpp | 35 +++++++++++++++--------------------
 kita/src/part/kita2ch.h   |  4 ++--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/kita/ChangeLog b/kita/ChangeLog
index 494fb91..05b6328 100644
--- a/kita/ChangeLog
+++ b/kita/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-10  Hideki Ikemoto  <ikemo@users.sourceforge.jp>
+
+	* kita2ch.{h, cpp}: Fix: forgot to consider threads without ID.
+
 2003-05-07  Hideki Ikemoto  <ikemo@users.sourceforge.jp>
 
 	* kita2ch.{h, cpp}: fix slip comment when abone occurs.
diff --git a/kita/src/part/kita2ch.cpp b/kita/src/part/kita2ch.cpp
index fe0e576..236600e 100644
--- a/kita/src/part/kita2ch.cpp
+++ b/kita/src/part/kita2ch.cpp
@@ -139,33 +139,29 @@ const QString Thread::name() const
   return m_threadName;
 }
 
-Comment::Comment(QString line) : m_isValid(false), m_abone(false)
+Comment::Comment(QString line) : m_isValid(false)
 {
   QStringList list = QStringList::split("<>", line, true);
 
   if(list.size() != 5) {
     return;
   }
-  if(parseDateId(list[2]) == false) {
-    return;
-  }
   m_name = list[0];
   m_address = list[1];
+  parseDateId(list[2]);
   m_body = list[3];
   m_subject = list[4];
 
   m_isValid = true;
 }
 
-bool Comment::parseDateId(QString& str)
+void Comment::parseDateId(QString& str)
 {
-  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)( ID:(.*))?");
 
-  if(str == QString::fromLocal8Bit("¤¢¤Ü¡¼¤ó")) {
-    m_abone = true;
-    return true;
-  } else if(regexp.search(str) == -1) {
-    return false;
+  if(regexp.search(str) == -1) {
+    m_dateId = str;
+    return;
   }
 
   int year = regexp.cap(1).toInt();
@@ -178,13 +174,8 @@ bool Comment::parseDateId(QString& str)
   QDateTime dateTime( QDate(year, regexp.cap(2).toInt(), regexp.cap(3).toInt()),
                       QTime(regexp.cap(4).toInt(), regexp.cap(5).toInt()) );
 
-  if(!dateTime.isValid()) {
-    return false;
-  }
   m_dateTime = dateTime;
-  m_id = regexp.cap(6);
-
-  return true;
+  m_id = regexp.cap(7);
 }
 
 QString Comment::linkedAddress() const
@@ -220,10 +211,14 @@ QString Comment::linkedBody() const
 
 QString Comment::getDateId() const
 {
-  if( m_abone ) {
-    return QString::fromLocal8Bit("¤¢¤Ü¡¼¤ó");
+  if( ! m_dateId.isEmpty() ) {
+    return m_dateId;
   } else {
-    return m_dateTime.toString(i18n("yyyy/MM/dd hh:mm ID:%1")).arg(m_id);
+    QString dateTime = m_dateTime.toString(i18n("yyyy/MM/dd hh:mm"));
+    if( ! m_id.isEmpty() ) {
+      dateTime.append(QString(" ID:%1").arg(m_id));
+    }
+    return dateTime;
   }
 }
 
diff --git a/kita/src/part/kita2ch.h b/kita/src/part/kita2ch.h
index 03d510a..cbd2017 100644
--- a/kita/src/part/kita2ch.h
+++ b/kita/src/part/kita2ch.h
@@ -65,7 +65,7 @@ namespace Kita2ch
     QString m_body;
     QString m_subject;
     bool m_isValid;
-    bool m_abone;
+    QString m_dateId;
   public:
     Comment(QString line);
     ~Comment() {}
@@ -77,7 +77,7 @@ namespace Kita2ch
     bool isValid() const { return m_isValid; }
     QString toHtml(int num) const;
   private:
-    bool parseDateId(QString&);
+    void parseDateId(QString&);
     QString linkedAddress() const;
     QString linkedBody() const;
   };
-- 
2.11.0