support for ISODate parsing

2 files changed, 34 insertions, 11 deletions

diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 7bd8a70..17031c7 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -558,60 +558,83 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
           second = readInt(str, strpos);
           if (second < 0 || second > 59)
             goto error;
 
           break;
         }
     }
   if (g_12h)
     {
       hour %= 12;
       if (pm) hour += 12;
     }
 
   if (ok) *ok = true;
   return QTime(hour, minute, second);
 
  error:
   if (ok) *ok = false;
   return QTime(-1, -1, -1); // return invalid date if it didn't work
   // This will be removed in the near future, since it gives a warning on stderr.
   // The presence of the bool* (since KDE-3.0) removes the need for an invalid QTime.
 }
 
 QDateTime KLocale::readDateTime(const QString &intstr, 
-                                bool shortFormat,
-                                bool includeSeconds,
                                 IntDateFormat intIntDateFormat, 
                                 bool* ok) const
 {
   bool ok1, ok2;
 
-  QDate m_date = readDate(date, &ok1);
-                    QTime m_time = KGlobal::locale()->readTime(time, &ok2);
-                    if ((ok1 == false) || (ok2 == false))
-                      qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
+  // AT the moment we can not read any other format then ISODate
+  if ( intIntDateFormat != ISODate )
+    {
+      qDebug("KLocale::readDateTime, only ISODate is supported.");
+      return QDateTime();
+    }  
+
+  int pos = intstr.find("T");
+  QString date = intstr.left(pos);
+  QString time = intstr.mid(pos+1);
 
+  QString dformat = dateFormat(intIntDateFormat);
+  QString tformat = timeFormat(intIntDateFormat);
+
+  QDate m_date = readDate(date, dformat, &ok1);
+  QTime m_time = readTime(time, tformat, &ok2);
+
+  if (ok)
+    {
+      if ((ok1 == false) || (ok2 == false))
+        *ok = false;
+      else
+        *ok = true;
+    }
+  QDateTime m_dt;
+  m_dt.setDate(m_date);
+  m_dt.setTime(m_time);
+
+  qDebug("KLocale::readDateTime() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
+  return m_dt;
 }
 
 
 bool KLocale::use12Clock() const
 {
     return !mHourF24Format ;;
 }
 
 bool KLocale::weekStartsMonday() const
 {
     return mWeekStartsMonday;
 }
 
 int KLocale::weekStartDay() const
 {
     if ( mWeekStartsMonday )
         return 1;
     return 7;
 }
 
 QString KLocale::weekDayName(int i,bool shortName) const
 {
   if ( shortName )
     switch ( i )
@@ -665,63 +688,62 @@ QString KLocale::monthName(int i,bool shortName) const
       case 3:   return i18n("March");
       case 4:   return i18n("April");
       case 5:   return i18n("May long", "May");
       case 6:   return i18n("June");
       case 7:   return i18n("July");
       case 8:   return i18n("August");
       case 9:   return i18n("September");
       case 10:  return i18n("October");
       case 11:  return i18n("November");
       case 12:  return i18n("December");
       }
 
   return QString::null;
 }
 
 QString KLocale::country() const
 {
   return QString::null;
 }
 
 QString KLocale::dateFormat(IntDateFormat intIntDateFormat) const
 {
   const IntDateFormat dformat = (intIntDateFormat == Undefined)?mIntDateFormat:intIntDateFormat;
     
+  if ( dformat == ISODate )
+    return "%Y-%m-%d";
+
     if ( QApplication::desktop()->width() < 480 ) {
         if ( dformat == Default )
             return "%a %d %b %Y";
         else  if ( dformat == Format1 )
             return "%a %b %d %Y";
-        else  if ( dformat == ISODate )
-            return "%a %Y %b %d";
     } else {
-
         if ( dformat == Default )
             return "%A %d %B %Y";
         else  if ( dformat == Format1 )
             return "%A %B %d %Y";
-        else  if ( dformat == ISODate )
-            return "%A %Y %B %d";
+
     }
     return  mDateFormat ;
 }
 
 QString KLocale::dateFormatShort(IntDateFormat intIntDateFormat) const
 {
   const IntDateFormat dformat = (intIntDateFormat == Undefined)?mIntDateFormat:intIntDateFormat;
  
   if ( dformat == Default )
         return "%d.%m.%Y"; 
     else  if ( dformat == Format1 )
         return "%m.%d.%Y"; 
     else  if ( dformat == ISODate )  // = Qt::ISODate
         return "%Y-%m-%d"; 
   return mDateFormatShort ;
 
 }
 
 
 QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const
 {
     const IntDateFormat tformat = (intIntTimeFormat == Undefined)?mIntTimeFormat:intIntTimeFormat;
  
     if ( tformat == Default )
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h
index 153b12a..949301a 100644
--- a/microkde/kdecore/klocale.h
+++ b/microkde/kdecore/klocale.h
@@ -32,48 +32,49 @@ class KLocale
     QString formatNumber(const QString &numStr) const;
     double readNumber(const QString &numStr, bool * ok = 0) const;
     
     QString decimalSymbol() const;
     QString thousandsSeparator() const;
     QString positiveSign() const;
     QString negativeSign() const;
 
 
     QString translate( const char *index ) const;
     QString translate( const char *index, const char *fallback) const;
 
     enum IntDateFormat { Undefined=-1, Default=0, Format1=1, ISODate=2, Userdefined=3 };
     
     QString formatDate(const QDate &pDate, bool shortFormat = false, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatTime(const QTime &pTime, bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat = Undefined) const;
     QString formatDateTime(const QDateTime &pDateTime,
                            bool shortFormat,
                            bool includeSecs = false, IntDateFormat intIntDateFormat = Undefined) const;
 
     QDate readDate(const QString &str, bool* ok = 0) const;
     QDate readDate( const QString &intstr, const QString &fmt, bool* ok = 0) const;
     QTime readTime(const QString &str, bool* ok = 0) const;
+    QDateTime readDateTime(const QString &intstr, IntDateFormat intIntDateFormat, bool* ok) const;
 
     bool use12Clock() const;
     bool weekStartsMonday() const;
     int weekStartDay() const;
     
     QString weekDayName(int,bool=false) const;
     QString monthName(int,bool=false) const;
 
     QString country() const;
 
     QString dateFormat(IntDateFormat intIntDateFormat = Undefined) const;
     QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const;
     QString timeFormat(IntDateFormat intIntDateFormat = Undefined) const;
 
     void insertCatalogue ( const QString & );
 
     KCalendarSystem *calendar();
     void setHore24Format ( bool );
     void setWeekStartMonday( bool );
     void setIntDateFormat( IntDateFormat );
     void setIntTimeFormat( IntDateFormat );
     IntDateFormat getIntDateFormat( );
     IntDateFormat getIntTimeFormat( );
     void setLanguage( int );