Timestamp.st
author Claus Gittinger <cg@exept.de>
Tue, 06 Oct 2009 21:46:45 +0200
changeset 12164 b87f20d77369
parent 11994 4665bdb0fd89
child 12166 83f638e6223d
permissions -rw-r--r--
added: #readShortGeneralizedFrom:onError:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     1
"
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     2
 COPYRIGHT (c) 1989 by Claus Gittinger
154
d4236ec280a6 *** empty log message ***
claus
parents: 92
diff changeset
     3
	      All Rights Reserved
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     4
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    11
"
5376
c2ef7d5e25ca oops - was not able to reread my own storeString.
Claus Gittinger <cg@exept.de>
parents: 5292
diff changeset
    12
"{ Package: 'stx:libbasic' }"
c2ef7d5e25ca oops - was not able to reread my own storeString.
Claus Gittinger <cg@exept.de>
parents: 5292
diff changeset
    13
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    14
AbstractTime subclass:#Timestamp
795
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
    15
	instanceVariableNames:'osTime'
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
    16
	classVariableNames:''
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
    17
	poolDictionaries:''
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    18
	category:'Magnitude-Time'
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    19
!
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    20
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    21
Object subclass:#TimestampBuilderAbstract
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    22
	instanceVariableNames:'year month day hour minute second millisecond'
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    23
	classVariableNames:''
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    24
	poolDictionaries:''
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    25
	privateIn:Timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    26
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    27
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    28
Timestamp::TimestampBuilderAbstract subclass:#TimestampISO8601Builder
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    29
	instanceVariableNames:'stream'
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    30
	classVariableNames:''
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    31
	poolDictionaries:''
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    32
	privateIn:Timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    33
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    34
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    35
!Timestamp class methodsFor:'documentation'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    36
82
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    37
copyright
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    38
"
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    39
 COPYRIGHT (c) 1989 by Claus Gittinger
154
d4236ec280a6 *** empty log message ***
claus
parents: 92
diff changeset
    40
	      All Rights Reserved
82
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    41
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    42
 This software is furnished under a license and may be used
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    43
 only in accordance with the terms of that license and with the
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    44
 inclusion of the above copyright notice.   This software may not
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    45
 be provided or otherwise made available to, or used by, any
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    46
 other person.  No title to or ownership of the software is
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    47
 hereby transferred.
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    48
"
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    49
!
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    50
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    51
documentation
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    52
"
8264
b14c26a88e96 Change AbsoluteTime to Timestamp
Stefan Vogel <sv@exept.de>
parents: 8254
diff changeset
    53
    This class represents time values in milliSeconds starting some
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    54
    time in the past. 
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    55
    (typically, from 1st. Jan 1970, as used in the Unix operating system,
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    56
     but other systems may bias the time differently.
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    57
     Actually, the implementation does not depend or even know which time/date 
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    58
     the OperatingSystem bases its time upon - it is simply keeping the value(s)
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    59
     as returned from the OS.
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    60
     For conversion, these values are given back to the OS, which will know
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    61
     how to convert these times. This has the advantage, that timestamps on files 
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    62
     (such as last-access-time or last-modification-time) can be handled transparently - 
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    63
     especially when performing comparisons).
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
    64
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    65
    You should not interpret the osTime instance variable directly, instead
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    66
    (if at all), ask the OS to convert.
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    67
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    68
    The implementation of this class is not the same as in ST-80 
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    69
    (which represents the time as seconds from Jan 1., 1901).
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    70
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
    71
    This class should not be confused with Time (which only represents the
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    72
    time within one day). Time instances cannot be used to compare times across midnight; 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    73
    instances of Timestamp can.
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
    74
8264
b14c26a88e96 Change AbsoluteTime to Timestamp
Stefan Vogel <sv@exept.de>
parents: 8254
diff changeset
    75
    Notice: this class was once called AbsoluteTime. Einstein told us in 1905, that talking
b14c26a88e96 Change AbsoluteTime to Timestamp
Stefan Vogel <sv@exept.de>
parents: 8254
diff changeset
    76
    about a absolute time is not a good idea (at least in our universe). So the class
b14c26a88e96 Change AbsoluteTime to Timestamp
Stefan Vogel <sv@exept.de>
parents: 8254
diff changeset
    77
    has been renamed to Timestamp which makes us more compatible to other ST dialects (e.g. VW)
b14c26a88e96 Change AbsoluteTime to Timestamp
Stefan Vogel <sv@exept.de>
parents: 8254
diff changeset
    78
    AbsoluteTime is still kept as an alias for backward compatibility.
3479
9ca6229713f4 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3122
diff changeset
    79
1306
c0189edbd96c checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
    80
    [author:]
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    81
        Claus Gittinger
1306
c0189edbd96c checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
    82
1282
3f5eda57c516 commentary
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    83
    [See also:]
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    84
        Time Date
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    85
        Delay ProcessorScheduler
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    86
"
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    87
! !
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    88
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    89
!Timestamp class methodsFor:'initialization'!
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    90
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    91
initialize
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    92
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    93
    AbsoluteTime := self.       "backward compatibility"
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    94
! !
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    95
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    96
!Timestamp class methodsFor:'instance creation'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    97
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
    98
UTCYear:y month:m day:d hour:h minute:min second:s millisecond:millis
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
    99
    "return an instance of the receiver, given individual components.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   100
     See also `Timestamp now' and other protocol inherited
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   101
     from my superclass."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   102
423
claus
parents: 392
diff changeset
   103
    ^ self basicNew 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   104
        fromOSTime:(OperatingSystem 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   105
                        computeOSTimeFromUTCYear:y month:m day:d 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   106
                                         hour:h minute:min second:s
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   107
                                         millisecond:millis)
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   108
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   109
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   110
     Timestamp UTCYear:1970 month:1 day:1 hour:1 minute:0 second:0 millisecond:0
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   111
     Timestamp UTCYear:1991 month:1 day:2 hour:12 minute:30 second:0 millisecond:0
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   112
     Timestamp UTCYear:1991 month:1 day:2 hour:12 minute:30 second:0 millisecond:100
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   113
     Timestamp UTCYear:1999 month:7 day:1 hour:1 minute:0 second:0 millisecond:0
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   114
     Timestamp UTCYear:2000 month:1 day:1 hour:1 minute:0 second:0 millisecond:0
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   115
    "
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   116
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   117
    "Modified: / 1.7.1996 / 15:22:07 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   118
    "Created: / 13.7.1999 / 12:34:37 / stefan"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   119
    "Modified: / 13.7.1999 / 12:42:30 / stefan"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   120
!
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   121
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   122
day:d month:m year:y hour:h minutes:min seconds:s
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   123
    "This is obsolete. User #year:month:day:hour:minute:second:"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   124
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   125
    ^ self 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   126
        year:y month:m day:d hour:h 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   127
        minute:min second:s millisecond:0
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   128
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   129
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   130
     Timestamp day:2 month:1 year:1991 hour:12 minute:30 second:0 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   131
     Timestamp day:8 month:1 year:1995 hour:0 minute:43 second:48 
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   132
    "
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   133
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   134
    "Modified: / 1.7.1996 / 15:22:26 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   135
    "Modified: / 13.7.1999 / 12:29:56 / stefan"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   136
!
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   137
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   138
day:d month:m year:y hour:h minutes:min seconds:s milliseconds:millis
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   139
    "This is obsolete. User #year:month:day:hour:minute:second:millisecond:"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   140
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   141
    ^ self year:y month:m day:d hour:h minute:min second:s millisecond:millis
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   142
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   143
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   144
     Timestamp day:1 month:1 year:1970 hour:1 minute:0 second:0 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   145
     Timestamp day:2 month:1 year:1991 hour:12 minute:30 second:0 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   146
     Timestamp day:2 month:1 year:1991 hour:12 minute:30 second:0 millisecond:100
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   147
    "
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   148
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   149
    "Created: / 1.7.1996 / 14:46:09 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   150
    "Modified: / 1.7.1996 / 15:22:07 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   151
    "Modified: / 13.7.1999 / 12:30:26 / stefan"
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   152
!
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   153
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   154
decodeFromLiteralArray:anArray
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   155
    "decode an Timestamp literalArray.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   156
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   157
     anArray may be:
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   158
        #(Timestamp '200004182000.123')
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   159
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   160
     or the deprecated old format, that is not portable between different architectures.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   161
     We parse this for backward compatibility (will be eventually removed).
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   162
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   163
        #(Timestamp #osTime: 12345678)     
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   164
    "
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   165
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   166
    (anArray at:2) == #osTime: ifTrue:[
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   167
        ^ self new osTime:(anArray at:3).
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   168
    ].
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   169
11126
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   170
    ^ self 
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   171
        readGeneralizedFrom:(anArray at:2) 
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   172
        onError:[ self conversionErrorSignal 
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   173
                    raiseErrorString:'literal array decoding' ]
8797
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   174
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   175
    "
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   176
     Timestamp
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   177
        decodeFromLiteralArray:#(Timestamp '20050323175226.014')      
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   178
    "
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   179
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   180
423
claus
parents: 392
diff changeset
   181
fromDate:aDate andTime:aTime
claus
parents: 392
diff changeset
   182
    "return an instance of the receiver, initialized from a time and a date
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   183
     object.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   184
     See also `Timestamp now' and other protocol inherited
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   185
     from my superclass."
423
claus
parents: 392
diff changeset
   186
claus
parents: 392
diff changeset
   187
    ^ self 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   188
        year:aDate year 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   189
        month:aDate month 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   190
        day:aDate day 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   191
        hour:aTime hours 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   192
        minute:aTime minutes 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   193
        second:aTime seconds 
423
claus
parents: 392
diff changeset
   194
claus
parents: 392
diff changeset
   195
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   196
     Timestamp fromDate:(Date today) andTime:(Time now)  
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   197
     Timestamp fromDate:(Date today plusDays:1) andTime:(Time now) 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   198
     Timestamp now 
423
claus
parents: 392
diff changeset
   199
    "
claus
parents: 392
diff changeset
   200
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   201
    "Modified: / 8.9.1995 / 15:07:30 / claus"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   202
    "Modified: / 19.4.1996 / 15:25:46 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   203
    "Modified: / 13.7.1999 / 12:30:47 / stefan"
423
claus
parents: 392
diff changeset
   204
!
claus
parents: 392
diff changeset
   205
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   206
newDay:dayInYear year:year
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   207
    "return a new Timestamp, given the year and the day-in-year (starting at 1).
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   208
     Date protocol compatibility"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   209
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   210
    ^ (Date newDay:dayInYear year:year) asTimestamp
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   211
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   212
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   213
     Timestamp newDay:183 year:1996
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   214
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   215
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   216
    "Modified: 2.7.1996 / 09:39:30 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   217
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   218
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   219
readFrom:aStringOrStream onError:exceptionBlock
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   220
    "return a new Timestamp, reading a printed representation from aStream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   221
     The string is interpreted as 24 hour format, as printed.
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   222
     Notice, that this is not the storeString format and 
4898
a7a32af11523 oops - reading was wrong
Claus Gittinger <cg@exept.de>
parents: 4843
diff changeset
   223
     is different from the format expected by readFrom:.
a7a32af11523 oops - reading was wrong
Claus Gittinger <cg@exept.de>
parents: 4843
diff changeset
   224
     The format read here is dd-mm-yyyy hh:mm:ss.iii"
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   225
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   226
    |stream newTime|
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   227
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   228
    stream := aStringOrStream readStream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   229
7092
630807cd320f Convert Object>>errorSignal -> Error
Stefan Vogel <sv@exept.de>
parents: 7058
diff changeset
   230
    Error handle:[:ex |
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   231
        newTime := super readFrom:stream onError:exceptionBlock 
3995
777470826394 no need for another error-handler blcok in #readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 3510
diff changeset
   232
    ] do:[
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   233
        newTime := self basicReadFrom:stream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   234
    ].
3995
777470826394 no need for another error-handler blcok in #readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 3510
diff changeset
   235
    ^ newTime
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   236
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   237
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   238
     Timestamp readFrom:'20-2-1995 13:11:06'                            
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   239
     Timestamp readFrom:'20-2-1995 13:11'                               
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   240
     Timestamp readFrom:'20-2-2001 13:11'                               
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   241
     Timestamp readFrom:'20-2-1995 13:11:06.100'                        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   242
     Timestamp readFrom:'32-2-1995 13:11:06.100' onError:'wrong'        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   243
     Timestamp readFrom:'32-foo-1995 13:11:06.100' onError:'wrong'      
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   244
     Timestamp readFrom:'20-2-1995 24:01:00.100' onError:'wrong'        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   245
     Timestamp readFrom:'20-2-1995 24:00:01.100' onError:'wrong'        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   246
     Timestamp readFrom:'2002-08-02 24:00:01.100' onError:'wrong'        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   247
     Timestamp readFrom:'foo' onError:'wrong'                           
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   248
     Timestamp readFrom:(Timestamp now storeString) onError:'wrong'                     
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   249
    "
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   250
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   251
    "Modified: / 8.10.1996 / 19:25:59 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   252
    "Modified: / 13.7.1999 / 12:31:14 / stefan"
2311
88b035dd471a New Method: #secondsSince1970.
Stefan Vogel <sv@exept.de>
parents: 1701
diff changeset
   253
!
88b035dd471a New Method: #secondsSince1970.
Stefan Vogel <sv@exept.de>
parents: 1701
diff changeset
   254
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   255
readGeneralizedFrom:aStringOrStream 
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   256
    "return a new Timestamp, reading a printed representation from aStream.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   257
     The string is interpreted as 24 hour format, as printed.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   258
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   259
     Notice, that this is not the storeString format and 
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   260
     is different from the format expected by readFrom:.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   261
     The format read here is either
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   262
        yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   263
     or:
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   264
        yyyy-mm-dd HH:MM:SS.iii +uuuu.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   265
    "
11126
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   266
    ^ self 
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   267
        readGeneralizedFrom:aStringOrStream 
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   268
        onError:[self conversionErrorSignal 
146ee0b7806e onversion errors
Claus Gittinger <cg@exept.de>
parents: 11003
diff changeset
   269
                    raiseErrorString:'Timestamp format error' ].
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   270
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   271
    "Created: / 22-08-2006 / 16:05:55 / cg"
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   272
!
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
   273
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   274
readGeneralizedFrom:aStringOrStream onError:exceptionBlock
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   275
    "return a new Timestamp, reading a printed representation from aStream.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   276
     The string is interpreted as 24 hour format, as printed.
5376
c2ef7d5e25ca oops - was not able to reread my own storeString.
Claus Gittinger <cg@exept.de>
parents: 5292
diff changeset
   277
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   278
     Notice, that this is not the storeString format and 
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   279
     is different from the format expected by readFrom:.
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   280
     The format read here is either
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   281
        yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   282
     or:
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   283
        yyyy-mm-dd HH:MM:SS.iii +uuuu.
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   284
    "
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   285
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   286
    |newTime|
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   287
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
   288
    ^ [
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   289
        |str day month year hour min sec millis c tzDelta|
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   290
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   291
        sec := millis := 0.
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   292
        str := aStringOrStream readStream.
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   293
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   294
        year := Integer readFrom:(str next:4).
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   295
        str peek == $- ifTrue:[ str next].
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   296
        month := Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   297
        (month between:1 and:12) ifFalse:[^ exceptionBlock value].
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   298
        str peek == $- ifTrue:[ str next].
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   299
        day := Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   300
        (day between:1 and:31) ifFalse:[^ exceptionBlock value].
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   301
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   302
        str skipSeparators.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   303
        hour:= Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   304
        (hour between:0 and:24) ifFalse:[^ exceptionBlock value].
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   305
        str peek == $: ifTrue:[ str next].
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   306
        min:= Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   307
        (min between:0 and:59) ifFalse:[^ exceptionBlock value].
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   308
        str atEnd ifFalse:[
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   309
            str peek == $: ifTrue:[ str next].
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   310
            sec := Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   311
            (sec between:0 and:59) ifFalse:[^ exceptionBlock value].
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   312
            str atEnd ifFalse:[
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   313
                str peek == $. ifTrue:[
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   314
                    str next.
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   315
                    millis := Integer readFrom:str.
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   316
                ].
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   317
                str skipSeparators.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   318
            ].
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   319
        ].
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   320
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   321
        str atEnd ifTrue:[
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   322
            "/ this is local time
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   323
            newTime := self year:year month:month day:day 
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   324
                            hour:hour minute:min second:sec millisecond:millis.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   325
        ] ifFalse:[
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   326
            c := str next.
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   327
            c ~~ $Z ifTrue:[ 
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   328
                |tzh tzmin|
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   329
                tzh := Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   330
                tzmin := Integer readFrom:(str next:2).
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   331
                c == $+ ifTrue:[
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   332
                    "the timezone is ahead of UTC or EAST from Greenwich: subtract hours and minutes"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   333
                    hour := hour - tzh.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   334
                    min := min - tzmin.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   335
                ] ifFalse:[
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   336
                    c ~~ $- ifTrue:[
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   337
                        ^ exceptionBlock value.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   338
                    ].
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   339
                    "the timezone is behind of UTC or WEST from Greenwich: add hours and minutes"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   340
                    hour := hour + tzh.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   341
                    min := min + tzmin.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   342
                ].
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   343
            ].
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   344
            "this is UTC time"
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   345
            newTime := self UTCYear:year month:month day:day 
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   346
                              hour:hour minute:min second:sec millisecond:millis.
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   347
        ].
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
   348
        newTime
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
   349
    ] on:Error do:exceptionBlock.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   350
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   351
    "
5656
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
   352
     |s|
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
   353
     s := '' writeStream.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   354
     Timestamp now printGeneralizedOn:s.
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   355
     Timestamp readGeneralizedFrom:s contents onError:[]
5656
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
   356
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   357
 Daylight saving time:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   358
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   359
     Timestamp readGeneralizedFrom:'20000718120000Z' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   360
     Timestamp readGeneralizedFrom:'20000718120000+0200' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   361
     Timestamp readGeneralizedFrom:'20000718120000+0300' onError:[]
5656
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
   362
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   363
 No daylight saving time:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   364
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   365
     Timestamp readGeneralizedFrom:'20000202120000Z' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   366
     Timestamp readGeneralizedFrom:'20000202120000+0100' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   367
     Timestamp readGeneralizedFrom:'20000202120000+0200' onError:[]
5656
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
   368
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   369
     Timestamp readGeneralizedFrom:'19950220131106' onError:[]   
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   370
     Timestamp readGeneralizedFrom:'199502201311' onError:[]    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   371
     Timestamp readGeneralizedFrom:'19950220131106.100' onError:[]    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   372
     Timestamp readGeneralizedFrom:'19950232131106.100' onError:'wrong'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   373
     Timestamp readGeneralizedFrom:'19950fo2131106.100' onError:'wrong'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   374
     Timestamp readGeneralizedFrom:'foo' onError:'wrong'                     
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   375
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   376
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00' onError:[]   
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   377
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100' onError:[]
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   378
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100 +0100' onError:[] 
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   379
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 -0100' onError:[]
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   380
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 +0000' onError:[] 
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   381
    "
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   382
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   383
    "Modified: / 13-07-1999 / 12:31:14 / stefan"
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
   384
    "Modified: / 22-08-2006 / 12:30:11 / cg"
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   385
!
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
   386
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   387
readIso8601FormatFrom:aStringOrStream
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   388
    "return a new Timestamp, reading an iso8601 UTC representation from aStream.
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   389
     Missing month/day values are replaced with 1; i.e. 1999T24:00
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   390
     is the same as 1999-01-01T24:00:00.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   391
     Missing minute, second and ms values are replaced with 0;
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   392
     i.e. 1999T12 is the same as 1999-01-01T12:00:00.000.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   393
     Of course, a 24 hour clock is used.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   394
     On error, raise an exception.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   395
     Please use this format for all external representations - its the standard."
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   396
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   397
    ^ self
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   398
        readIso8601FormatFrom:aStringOrStream yearAlreadyRead:nil
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   399
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   400
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   401
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   402
     Timestamp readIso8601FormatFrom:'1995-02T13:11:06'     
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   403
     Timestamp readIso8601FormatFrom:'1995T13:11:06'        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   404
     Timestamp readIso8601FormatFrom:'1995T13:11'           
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   405
     Timestamp readIso8601FormatFrom:'1995T13'              
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   406
     Timestamp readIso8601FormatFrom:'1995'              
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   407
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   408
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   409
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   410
     Timestamp readIso8601FormatFrom:'1995-02-20 13'    
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   411
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   412
   24 is allowed with ISO, and is 00:00 of the next day:
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   413
     Timestamp readIso8601FormatFrom:'1995-02-20 24:00:00'    
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   414
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   415
    "
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   416
!
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   417
8432
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   418
readIso8601FormatFrom:aStringOrStream onError:exceptionValue
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   419
    "return a new Timestamp, reading an iso8601 UTC representation from aStream.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   420
     Missing month/day values are replaced with 1; i.e. 1999T24:00
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   421
     is the same as 1999-01-01T24:00:00.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   422
     Missing minute, second and ms values are replaced with 0;
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   423
     i.e. 1999T12 is the same as 1999-01-01T12:00:00.000.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   424
     Of course, a 24 hour clock is used.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   425
     On error, raise an exception.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   426
     Please use this format for all external representations - its the standard."
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   427
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   428
    ^ self
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   429
        readIso8601FormatFrom:aStringOrStream 
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   430
        yearAlreadyRead:nil 
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   431
        onError:exceptionValue
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   432
!
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   433
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   434
readRFC1123FormatFrom:rfc1123String onError:exceptionBlock
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   435
    |parts indexModifier utcOffsetString utcOffset day year time monthName month|
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   436
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   437
"/    All HTTP/1.0 date/time stamps must be represented in Universal Time (UT), 
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   438
"/    also known as Greenwich Mean Time (GMT), without exception. 
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   439
"/    This is indicated in the first two formats by the inclusion of "GMT" as the three-letter abbreviation for time zone, 
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   440
"/    and should be assumed when reading the asctime format.
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   441
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   442
"/    HTTP-date      = rfc1123-date | rfc850-date | asctime-date
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   443
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   444
"/    rfc1123-date   = wkday "," SP date1 SP time SP "GMT"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   445
"/    rfc850-date    = weekday "," SP date2 SP time SP "GMT"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   446
"/    asctime-date   = wkday SP date3 SP time SP 4DIGIT
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   447
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   448
"/    date1          = 2DIGIT SP month SP 4DIGIT
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   449
"/                     ; day month year (e.g., 02 Jun 1982)
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   450
"/    date2          = 2DIGIT "-" month "-" 2DIGIT
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   451
"/                     ; day-month-year (e.g., 02-Jun-82)
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   452
"/    date3          = month SP ( 2DIGIT | ( SP 1DIGIT ))
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   453
"/                     ; month day (e.g., Jun  2)
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   454
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   455
"/    time           = 2DIGIT ":" 2DIGIT ":" 2DIGIT
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   456
"/                     ; 00:00:00 - 23:59:59
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   457
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   458
"/    wkday          = "Mon" | "Tue" | "Wed"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   459
"/                   | "Thu" | "Fri" | "Sat" | "Sun"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   460
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   461
"/    weekday        = "Monday" | "Tuesday" | "Wednesday"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   462
"/                   | "Thursday" | "Friday" | "Saturday" | "Sunday"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   463
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   464
"/    month          = "Jan" | "Feb" | "Mar" | "Apr"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   465
"/                   | "May" | "Jun" | "Jul" | "Aug"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   466
"/                   | "Sep" | "Oct" | "Nov" | "Dec"
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   467
"/
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   468
"/    Mon, 17 Aug 2009 11:11:15 GMT
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   469
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   470
    rfc1123String isEmptyOrNil ifTrue:[^ exceptionBlock value].
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   471
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   472
    parts := rfc1123String subStrings:Character space.
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   473
    parts size == 6 ifTrue:[
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   474
        indexModifier := 0.
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   475
    ] ifFalse:[
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   476
        parts size == 5 ifTrue:[
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   477
            indexModifier := -1.
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   478
        ] ifFalse:[
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   479
            ^ exceptionBlock value
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   480
        ].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   481
    ].
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   482
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   483
    utcOffsetString := (parts at:6 + indexModifier).
11876
2a14d6e5479c *** empty log message ***
sr
parents: 11862
diff changeset
   484
    ((utcOffsetString sameAs:'GMT') or:[utcOffsetString sameAs:'UTC']) ifFalse:[ 
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   485
        self assert:utcOffsetString size == 5.
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   486
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   487
        utcOffset := (utcOffsetString from:4 to:5) asString asNumber * 60.
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   488
        utcOffset := utcOffset + ((utcOffsetString from:2 to:3) asString asNumber * 60 * 60).
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   489
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   490
        (utcOffsetString at:1) asSymbol == #- ifTrue:[
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   491
            utcOffset := -1 * utcOffset.
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   492
        ].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   493
    ].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   494
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   495
    day := Integer readFrom:(parts at:2 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   496
    year := Integer readFrom:(parts at:4 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   497
    time := Time readFrom:(parts at:5 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   498
    monthName := parts at:3 + indexModifier.
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   499
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   500
    month := (1 to:12) asOrderedCollection detect:[:i | 
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   501
        (Date abbreviatedNameOfMonth:i language:#en) sameAs:monthName 
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   502
    ] ifNone:[^ exceptionBlock].    
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   503
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   504
    ^ (Timestamp 
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   505
        fromDate:(Date newDay:day monthIndex:month year:year) 
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
   506
        andTime:time) + utcOffset       
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   507
!
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
   508
12164
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   509
readShortGeneralizedFrom:aStringOrStream onError:exceptionBlock
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   510
    "similar to readGeneralizedFrom:aStringOrStream onError:exceptionBlock,
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   511
     but uses two digits for the year (i.e. only works 1951..2049)
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   512
     return a new Timestamp, reading a printed representation from aStream.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   513
     The string is interpreted as 24 hour format, as printed.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   514
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   515
     Notice, that this is not the storeString format and 
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   516
     is different from the format expected by readFrom:.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   517
     The format read here is either
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   518
        yymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   519
     or:
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   520
        yy-mm-dd HH:MM:SS.iii +uuuu.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   521
    "
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   522
    |twoDigitYear timeString|
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   523
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   524
    self assert:aStringOrStream isString.   "/ only works with strings, for now...
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   525
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   526
    "
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   527
     UTCTime does not contain the century - 
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   528
     so everything before 1950 and after 20049 cannot be represented!!
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   529
    "
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   530
    aStringOrStream size >= 8 ifFalse:[ ^ exceptionBlock value ].
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   531
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   532
    twoDigitYear := aStringOrStream copyFrom:1 to:2.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   533
    twoDigitYear isNumeric ifFalse:[ ^ exceptionBlock value ].
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   534
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   535
    twoDigitYear asInteger >= 50 ifTrue:[
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   536
        timeString := '19', aStringOrStream.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   537
    ] ifFalse:[
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   538
        timeString := '20', aStringOrStream.
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   539
    ].
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   540
    ^ self readGeneralizedFrom:timeString onError:exceptionBlock
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   541
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   542
    "
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   543
     Timestamp readShortGeneralizedFrom:'000202120000Z' onError:[]    
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   544
     Timestamp readShortGeneralizedFrom:'000202120000+0100' onError:[]
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   545
     Timestamp readShortGeneralizedFrom:'000202120000+0200' onError:[]
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   546
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   547
     Timestamp readShortGeneralizedFrom:'950220131106' onError:[]   
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   548
     Timestamp readShortGeneralizedFrom:'9502201311' onError:[]    
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   549
     Timestamp readShortGeneralizedFrom:'950220131106.100' onError:[]    
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   550
     Timestamp readShortGeneralizedFrom:'950232131106.100' onError:'wrong'    
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   551
     Timestamp readShortGeneralizedFrom:'950fo2131106.100' onError:'wrong'    
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   552
     Timestamp readShortGeneralizedFrom:'foo' onError:'wrong'                     
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   553
    "
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   554
!
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
   555
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   556
secondsSince1970:sec
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   557
    "set time from elapsed seconds since 1-1-1970, 0:0:0.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   558
     This is the format used in the UNIX world"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   559
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   560
    |divMod|
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   561
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   562
    divMod := sec divMod:3600.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   563
    ^ self year:1970 month:1 day:1 hour:(divMod at:1) minute:0 second:(divMod at:2) millisecond:0.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   564
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   565
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   566
     Timestamp secondsSince1970:0      
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   567
     Timestamp secondsSince1970:3600
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   568
     Timestamp secondsSince1970:3600*24
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   569
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   570
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   571
    "Created: / 21.10.1996 / 17:48:30 / stefan"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   572
    "Modified: / 13.7.1999 / 12:31:22 / stefan"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   573
!
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   574
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   575
year:y month:m day:d hour:h minute:min second:s
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   576
    "return an instance of the receiver, given individual components.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   577
     See also `Timestamp now' and other protocol inherited
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   578
     from my superclass."
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   579
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   580
    ^ self year:y month:m day:d hour:h minute:min second:s millisecond:0
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   581
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   582
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   583
     Timestamp year:1970 month:1 day:1 hour:1 minute:0 second:0 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   584
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   585
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0 millisecond:100
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   586
     Timestamp year:2000 month:1 day:1 hour:1 minutes:0 second:0 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   587
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   588
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   589
    "Modified: / 1.7.1996 / 15:22:07 / cg"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   590
    "Created: / 13.7.1999 / 12:06:39 / stefan"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   591
    "Modified: / 13.7.1999 / 12:27:47 / stefan"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   592
!
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   593
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   594
year:y month:m day:d hour:h minute:min second:s millisecond:millis
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   595
    "return an instance of the receiver, given individual components.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   596
     See also `Timestamp now' and other protocol inherited
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   597
     from my superclass."
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   598
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   599
    ^ self basicNew 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   600
        fromOSTime:(OperatingSystem 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   601
                        computeOSTimeFromYear:y month:m day:d 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   602
                                         hour:h minute:min seconds:s millis:millis)
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   603
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   604
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   605
     Timestamp year:1970 month:1 day:1 hour:0 minute:0 second:0 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   606
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   607
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0 millisecond:100
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   608
     Timestamp year:2000 month:1 day:1 hour:1 minute:0 second:0 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   609
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   610
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   611
    "Modified: / 1.7.1996 / 15:22:07 / cg"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   612
    "Created: / 13.7.1999 / 12:28:44 / stefan"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   613
    "Modified: / 13.7.1999 / 12:37:57 / stefan"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   614
! !
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   615
11857
adaac1fd5452 +current
Claus Gittinger <cg@exept.de>
parents: 11847
diff changeset
   616
!Timestamp class methodsFor:'Compatibility-Squeak'!
adaac1fd5452 +current
Claus Gittinger <cg@exept.de>
parents: 11847
diff changeset
   617
adaac1fd5452 +current
Claus Gittinger <cg@exept.de>
parents: 11847
diff changeset
   618
current
adaac1fd5452 +current
Claus Gittinger <cg@exept.de>
parents: 11847
diff changeset
   619
    ^ self now
adaac1fd5452 +current
Claus Gittinger <cg@exept.de>
parents: 11847
diff changeset
   620
! !
adaac1fd5452 +current
Claus Gittinger <cg@exept.de>
parents: 11847
diff changeset
   621
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   622
!Timestamp class methodsFor:'private'!
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   623
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   624
basicReadFrom:aStream
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   625
    "return a new Timestamp, reading a printed representation from aStream.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   626
     The string is interpreted as 24 hour format, as printed.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   627
     Notice, that this is not the storeString format and 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   628
     is different from the format expected by readFrom:.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   629
     KLUDGE: 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   630
        us and non-us format have different ordering of day and month;
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   631
        The format read here is (non-us) dd-mm-yyyy hh:mm:ss.iii
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   632
        or (us-format, for Travis) mm/dd/yyyy hh:mm:ss.iii.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   633
     On error, raise an exception"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   634
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   635
    |firstNumber secondNumber day month year hour min sec millis usFormat possibeMonthName|
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   636
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   637
    firstNumber := Integer readFrom:aStream onError:[ConversionError raiseErrorString:' - integer expected'].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   638
    firstNumber > 31 ifTrue:[
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   639
        "/ assume iso8601 format;
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   640
        ^ self readIso8601FormatFrom:aStream yearAlreadyRead:firstNumber.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   641
    ].
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   642
    aStream skipSeparators.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   643
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   644
    "/ consider this a kludge
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   645
    usFormat := (aStream peek == $/ ).
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   646
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   647
    [aStream peek isLetterOrDigit] whileFalse:[aStream next].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   648
    aStream peek isDigit ifTrue:[
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   649
        secondNumber := Integer readFrom:aStream onError:-1.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   650
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   651
        usFormat ifTrue:[
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   652
            month := firstNumber.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   653
            day := secondNumber.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   654
        ] ifFalse:[
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   655
            month := secondNumber.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   656
            day := firstNumber.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   657
        ].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   658
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   659
    ] ifFalse:[
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   660
        possibeMonthName := aStream throughAnyForWhich:[:ch | ch isLetter].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   661
        month := Date indexOfMonth:possibeMonthName asLowercase.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   662
        day := firstNumber.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   663
    ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   664
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   665
    (day between:1 and:31) ifFalse:[ ConversionError raiseErrorString:' - bad day' ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   666
    (month between:1 and:12) ifFalse:[ ConversionError raiseErrorString:' - bad month' ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   667
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   668
    [aStream peek isDigit] whileFalse:[aStream next].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   669
    year := Integer readFrom:aStream onError:[ ConversionError raiseErrorString:' - bad year' ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   670
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   671
    aStream atEnd ifTrue:[
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   672
        hour := min := sec := millis := 0.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   673
    ] ifFalse:[
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   674
        [aStream peek isDigit] whileFalse:[aStream next].
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   675
        hour := Integer readFrom:aStream onError:-1.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   676
        (hour between:0 and:24) ifFalse:[ ConversionError raiseErrorString:' - bad hour' ].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   677
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   678
        [aStream peek isDigit] whileFalse:[aStream next].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   679
        min := Integer readFrom:aStream onError:-1.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   680
        (min between:0 and:59) ifFalse:[ ConversionError raiseErrorString:' - bad minute' ].
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   681
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   682
        aStream atEnd ifTrue:[
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   683
            sec := millis := 0.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   684
        ] ifFalse:[
11140
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   685
            [aStream peek isDigit] whileFalse:[aStream next].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   686
            sec := Integer readFrom:aStream onError:-1.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   687
            (sec between:0 and:59) ifFalse:[ ConversionError raiseErrorString:' - bad second' ].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   688
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   689
            aStream peek = $. ifTrue:[
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   690
                aStream next.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   691
                millis := Integer readFrom:aStream onError:0.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   692
                millis >= 1000 ifTrue:[ ConversionError raiseErrorString:' - bad millisecond' ].
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   693
            ] ifFalse:[
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   694
                millis := 0.
130dd8b62622 be more tolerant, when reading
Claus Gittinger <cg@exept.de>
parents: 11126
diff changeset
   695
            ].
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   696
        ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   697
    ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   698
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   699
    "special check - only 24:00:00 is allowed;
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   700
     every time after that must wrap"
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   701
    hour == 24 ifTrue:[
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   702
        (min ~~ 0 or:[sec ~~ 0 or:[millis ~~ 0]]) ifTrue:[ ConversionError raiseErrorString:' - bad hour' ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   703
    ].
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   704
    ^ self year:year month:month day:day hour:hour minute:min second:sec millisecond:millis.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   705
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   706
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   707
     Timestamp basicReadFrom:'20-2-1995 13:11:06' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   708
     Timestamp basicReadFrom:'20-2-1995 13:11:06.' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   709
     (Timestamp basicReadFrom:'10-9-1995 13:11:06' readStream) month   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   710
     (Timestamp basicReadFrom:'10/9/1995 13:11:06' readStream) month   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   711
     Timestamp basicReadFrom:'20-2-1995 13:11' readStream       
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   712
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100' readStream    
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   713
     Timestamp basicReadFrom:'32-2-1995 13:11:06.100' readStream  
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   714
     Timestamp basicReadFrom:'32-foo-1995 13:11:06.100' readStream 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   715
     Timestamp basicReadFrom:'20-13-1995 13:11:06.100' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   716
     Timestamp basicReadFrom:'20-12-1995 25:11:06.100' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   717
     Timestamp basicReadFrom:'20-12-1995 23:61:06.100' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   718
     Timestamp basicReadFrom:'20-12-1995 23:10:66.100' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   719
     Timestamp basicReadFrom:'20-12-1995 23:10:00.1000' readStream   
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   720
     Timestamp basicReadFrom:'20-2-1995 24:01:00.100' readStream 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   721
     Timestamp basicReadFrom:'20-2-1995 24:00:01.100' readStream 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   722
     Timestamp basicReadFrom:'foo' readStream                    
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   723
     Timestamp basicReadFrom:(Timestamp now printString readStream)                  
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   724
     Timestamp basicReadFrom:'1995-10-20 24:00:00.000' readStream 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   725
     Timestamp basicReadFrom:'1995-10-20 12:10:00.000' readStream 
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   726
    "
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   727
!
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   728
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   729
readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   730
    "common helper for read methods.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   731
     Return a new Timestamp, reading an iso8601 UTC representation from aStream.
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   732
     Missing month/day values are replaced with 1; i.e. 1999T24:00
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   733
     is the same as 1999-01-01T24:00:00.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   734
     Missing minute, second and ms values are replaced with 0;
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   735
     i.e. 1999T12 is the same as 1999-01-01T12:00:00.000.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   736
     Of course, a 24 hour clock is used.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   737
     On error, raise an exception.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   738
     Please use this format for all external representations - its the standard."
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   739
7008
e154492de5d8 Remove unused method vars
Stefan Vogel <sv@exept.de>
parents: 7006
diff changeset
   740
    |str day month year hour min sec millis fraction|
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   741
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   742
    str := aStringOrStream readStream.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   743
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   744
    month := day := 1.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   745
    hour := min := sec := millis := 0.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   746
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   747
    yearOrNil notNil ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   748
        year := yearOrNil
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   749
    ] ifFalse:[
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
   750
        year := Integer readFrom:str onError:nil.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   751
        year isNil ifTrue:[ ConversionError raiseErrorString:' - bad year' ]
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   752
    ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   753
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   754
    str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   755
    str peek == $- ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   756
        str next.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   757
        "/ month follows.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   758
        month := Integer readFrom:str.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   759
        (month between:1 and:12) ifFalse:[ ConversionError raiseErrorString:' - bad month' ].
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   760
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   761
        str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   762
        str peek == $- ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   763
            str next.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   764
            "/ day follows.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   765
            day := Integer readFrom:str.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   766
            (day between:1 and:31) ifFalse:[ ConversionError raiseErrorString:' - bad day' ].
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   767
        ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   768
    ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   769
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   770
    str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   771
    str atEnd ifFalse:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   772
        "time follows"
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   773
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   774
        str peek == $T ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   775
            "we treat the T as optional here"
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   776
            str next.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   777
            str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   778
        ].
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   779
        hour := Integer readFrom:str onError:-1.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   780
        (hour between:0 and:24) ifFalse:[ ConversionError raiseErrorString:' - bad hour' ].
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   781
        str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   782
        str peek == $: ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   783
            str next.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   784
            "/ minutes follow.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   785
            min := Integer readFrom:str onError:-1.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   786
            (min between:0 and:59) ifFalse:[ ConversionError raiseErrorString:' - bad minute' ].
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   787
            str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   788
            str peek == $: ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   789
                str next.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   790
                "/ seconds follow.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   791
                sec := Integer readFrom:str onError:-1.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   792
                (sec between:0 and:59) ifFalse:[ ConversionError raiseErrorString:' - bad seconds' ].
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   793
                str skipSeparators.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   794
                str peek == $. ifTrue:[
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   795
                    str next.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   796
                    "/ millis follow.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
   797
                    fraction := Number readMantissaFrom:str radix:10.    
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
   798
                    millis := (1000 * fraction) rounded.  "/ mhmh - should it be truncated ?
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   799
                ]
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   800
            ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   801
        ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   802
    ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   803
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   804
    "special check - only 24:00:00 is allowed;
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   805
     every time after that must wrap"
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   806
    hour == 24 ifTrue:[
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
   807
        (min ~~ 0 or:[sec ~~ 0 or:[millis ~~ 0]]) ifTrue:[ ConversionError raiseErrorString:' - bad hour' ].
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   808
    ].
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   809
    ^ self 
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   810
        year:year month:month day:day 
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   811
        hour:hour minute:min second:sec millisecond:millis.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   812
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   813
    "
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
   814
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06.123'    
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   815
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   816
     Timestamp readIso8601FormatFrom:'1995-02T13:11:06'     
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   817
     Timestamp readIso8601FormatFrom:'1995T13:11:06'        
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   818
     Timestamp readIso8601FormatFrom:'1995T13:11'           
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   819
     Timestamp readIso8601FormatFrom:'1995T13'              
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   820
     Timestamp readIso8601FormatFrom:'1995'              
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   821
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   822
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   823
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11'    
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   824
     Timestamp readIso8601FormatFrom:'1995-02-20 13'    
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   825
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   826
   24 is allowed with ISO, and is 00:00 of the next day:
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   827
     Timestamp readIso8601FormatFrom:'1995-02-20 24:00:00'    
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   828
    "
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   829
!
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
   830
8432
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   831
readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil onError:exceptionValue
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   832
    "common helper for read methods.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   833
     Return a new Timestamp, reading an iso8601 UTC representation from aStream.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   834
     Missing month/day values are replaced with 1; i.e. 1999T24:00
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   835
     is the same as 1999-01-01T24:00:00.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   836
     Missing minute, second and ms values are replaced with 0;
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   837
     i.e. 1999T12 is the same as 1999-01-01T12:00:00.000.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   838
     Of course, a 24 hour clock is used.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   839
     On error, raise an exception.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   840
     Please use this format for all external representations - its the standard."
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   841
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   842
    |retVal|
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   843
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   844
    ConversionError handle:[:ex |
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   845
        retVal := exceptionValue value
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   846
    ] do:[
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   847
        retVal := self readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   848
    ].
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
   849
    ^ retVal
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   850
! !
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   851
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   852
!Timestamp class methodsFor:'reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   853
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   854
readISO8601From: stringOrStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   855
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   856
    ^TimestampISO8601Builder read: stringOrStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   857
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   858
    "Created: / 16-06-2005 / 16:13:36 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   859
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
   860
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   861
!Timestamp methodsFor:'accessing'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   862
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   863
day
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
   864
    "return the day-in-month of the receiver (1..31).
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
   865
     For compatibility, use instances of Date for this."
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   866
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   867
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) day.
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
   868
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
   869
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   870
     Timestamp now day 
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
   871
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   872
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   873
    "Modified: 1.7.1996 / 15:23:02 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   874
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   875
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   876
dayInWeek
7327
ab17eb5f11a6 printFormat
Claus Gittinger <cg@exept.de>
parents: 7111
diff changeset
   877
    "return the week-day of the receiver - 1 for monday, 7 for sunday
ab17eb5f11a6 printFormat
Claus Gittinger <cg@exept.de>
parents: 7111
diff changeset
   878
     WARNING: different from ANSIs dayOfWeek (which returns 1 for sunday, ... 7 for saturday).  
ab17eb5f11a6 printFormat
Claus Gittinger <cg@exept.de>
parents: 7111
diff changeset
   879
     WARNING: does not care for pre-julian dates 
ab17eb5f11a6 printFormat
Claus Gittinger <cg@exept.de>
parents: 7111
diff changeset
   880
        (i.e. do not use this for dates before 1752)"
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   881
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   882
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) dayInWeek
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   883
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   884
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   885
     Timestamp now dayInWeek 
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   886
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   887
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   888
    "Modified: 2.7.1996 / 09:20:32 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   889
    "Created: 2.7.1996 / 09:35:48 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   890
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   891
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   892
dayInYear
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   893
    "return the year-day of the receiver - 1 for Jan, 1st."
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   894
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   895
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) dayInYear
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   896
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   897
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   898
     Timestamp now dayInYear 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   899
     Timestamp newDay:184 year:1996  
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   900
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   901
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   902
    "Modified: 2.7.1996 / 10:21:02 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   903
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   904
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   905
hour
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   906
    "return the hour (0..23).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   907
     ST-80 Timestamp compatibility (I'd prefer the name #hours, for Time compatibility)."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   908
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   909
    ^ self hours
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   910
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   911
    "Created: 1.7.1996 / 15:14:50 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   912
    "Modified: 1.7.1996 / 15:15:32 / cg"
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   913
!
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   914
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   915
hours
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   916
    "return the hours (0..23)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   917
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   918
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) hours
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
   919
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
   920
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   921
     Timestamp now hours  
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   922
    "
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   923
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   924
    "Modified: 2.7.1996 / 09:20:32 / cg"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   925
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   926
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   927
millisecond
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   928
    "return the millisecond (0..999).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   929
     ST-80 Timestamp compatibility (I'd prefer the name #milliseconds)."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   930
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   931
    ^ self milliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   932
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   933
    "Created: 1.7.1996 / 15:14:50 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   934
    "Modified: 1.7.1996 / 15:15:24 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   935
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   936
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   937
milliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   938
    "return the milliseconds (0..999)"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   939
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   940
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) milliseconds
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   941
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   942
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   943
     Timestamp now milliseconds   
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   944
    "
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   945
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   946
    "Created: 1.7.1996 / 15:15:02 / cg"
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   947
    "Modified: 2.7.1996 / 09:21:41 / cg"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   948
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   949
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   950
minute
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   951
    "return the minute (0..59).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   952
     ST-80 Timestamp compatibility (I'd prefer the name #minutes, for Time compatibility)."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   953
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   954
    ^ self minutes
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   955
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   956
    "Created: 1.7.1996 / 15:14:29 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   957
    "Modified: 1.7.1996 / 15:15:37 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   958
!
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   959
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   960
minutes
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   961
    "return the minutes (0..59)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   962
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   963
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) minutes
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   964
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   965
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   966
     Timestamp now minutes 
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
   967
    "
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   968
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   969
    "Modified: 2.7.1996 / 09:20:49 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   970
!
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   971
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   972
month
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   973
    "return the month of the receiver (1..12).
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   974
     For compatibility, use instances of Date for this."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   975
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
   976
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) month
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   977
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   978
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   979
     Timestamp now month
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   980
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   981
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   982
    "Modified: 1.7.1996 / 15:23:05 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   983
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   984
8286
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   985
osTime
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   986
    "get the internal representation of the time.
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   987
     Warning: do not depend on the value (unix vs. win32 - differences)"
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   988
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   989
    ^ osTime
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   990
!
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
   991
4807
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
   992
osTime:aTime
5726
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
   993
    "set the internal representation of the time"
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
   994
4807
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
   995
    osTime := aTime.
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
   996
!
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
   997
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   998
second
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   999
    "return the second (0..59).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1000
     ST-80 Timestamp compatibility (I'd prefer the name #seconds, for Time compatibility)."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1001
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1002
    ^ self seconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1003
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1004
    "Created: 1.7.1996 / 15:14:19 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1005
    "Modified: 1.7.1996 / 15:15:49 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1006
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1007
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1008
seconds
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1009
    "return the seconds (0..59)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1010
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1011
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) seconds
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1012
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1013
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1014
     Timestamp now seconds 
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1015
    "
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1016
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1017
    "Modified: 2.7.1996 / 09:20:54 / cg"
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1018
!
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1019
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1020
timeInfo
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1021
    ^ (OperatingSystem computeTimeAndDateFrom:osTime)
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1022
!
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1023
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1024
utcOffset
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1025
    "return the difference between UTC (Greenwich Mean Time) and the local time in seconds.
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1026
     If daylight saving time applies to ourself, take that into account.
8888
4171ed260947 Fix #utcSecondsSince1970 and #utcSecondsSince1901 (wrong direction of utcOffset)
Stefan Vogel <sv@exept.de>
parents: 8886
diff changeset
  1027
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1028
     Add utcOffset to convert from local time to UTC time.
8888
4171ed260947 Fix #utcSecondsSince1970 and #utcSecondsSince1901 (wrong direction of utcOffset)
Stefan Vogel <sv@exept.de>
parents: 8886
diff changeset
  1029
     Subtract utcOffset to convert from UTC time to local time.
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1030
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1031
     If utcOffset is negative, the local timezone is east of Greenwich.
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1032
     If utcOffset is positive, the local timezone is west of Greenwich."
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1033
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1034
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) utcOffset
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1035
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1036
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1037
     Timestamp now utcOffset 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1038
     (Timestamp day:1 month:7 year:1995 hour:12 minutes:0 seconds:0) utcOffset
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1039
    "
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1040
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1041
    "Modified: 20.12.1995 / 17:28:49 / stefan"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1042
    "Modified: 1.7.1996 / 15:21:29 / cg"
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1043
!
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1044
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1045
year
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1046
    "return the year of the receiver i.e. 1992.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1047
     For compatibility, use instances of Date for this."
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1048
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1049
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) year
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1050
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1051
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1052
     Timestamp now year
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1053
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1054
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1055
    "Modified: 1.7.1996 / 15:23:08 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1056
! !
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1057
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1058
!Timestamp methodsFor:'arithmetic'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1059
10736
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1060
deltaFrom:aTimestamp
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1061
    "return the delta as a timeDuration between 2 timeStamps.
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1062
     The argument is supposed to be BEFORE the receiver"
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1063
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1064
    ^ TimeDuration fromMilliseconds:(self getMilliseconds - (aTimestamp getMilliseconds))
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1065
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1066
    "
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1067
     |t1 t2|
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1068
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1069
     t1 := Timestamp now.
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1070
     Delay waitForSeconds:0.5.
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1071
     t2 := Timestamp now.
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1072
     t2 deltaFrom:t1   
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1073
    "
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1074
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1075
    "Created: / 04-10-2007 / 13:34:28 / cg"
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1076
!
ea9e95d7f9f2 + deltaFrom:
Claus Gittinger <cg@exept.de>
parents: 9620
diff changeset
  1077
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1078
millisecondDeltaFrom:aTimestamp
3510
75824285fe74 comment
Claus Gittinger <cg@exept.de>
parents: 3479
diff changeset
  1079
    "return the delta in milliseconds between 2 absolute times.
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1080
     The argument is supposed to be BEFORE the receiver"
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1081
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1082
    ^ self getMilliseconds - (aTimestamp getMilliseconds)
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1083
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1084
    "
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1085
     |t1 t2|
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1086
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1087
     t1 := Timestamp now.
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1088
     Delay waitForSeconds:0.5.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1089
     t2 := Timestamp now.
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1090
     t2 millisecondDeltaFrom:t1   
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1091
    "
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  1092
3510
75824285fe74 comment
Claus Gittinger <cg@exept.de>
parents: 3479
diff changeset
  1093
    "Modified: / 5.6.1998 / 04:21:33 / cg"
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1094
!
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1095
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1096
secondDeltaFrom:aTimestamp
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1097
    "return the delta in seconds between 2 absolute times.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1098
     The argument is supposed to be BEFORE the receiver"
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1099
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1100
    ^ self getSeconds - (aTimestamp getSeconds)
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1101
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1102
    "
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1103
     |t1 t2|
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1104
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1105
     t1 := Timestamp now.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1106
     Delay waitForSeconds:5.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1107
     t2 := Timestamp now.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1108
     t2 secondDeltaFrom:t1   
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1109
    "
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1110
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  1111
    "Modified: / 5.6.1998 / 04:21:33 / cg"
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1112
! !
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1113
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1114
!Timestamp methodsFor:'comparing'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1115
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1116
= aTime
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1117
    "return true if the argument, aTime represents the same time"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1118
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1119
    (aTime species == self species) ifFalse:[^ false].
1520
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  1120
    ^ (self getMilliseconds = aTime getMilliseconds)
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  1121
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  1122
    "Modified: 3.7.1996 / 13:10:24 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1123
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1124
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1125
hash
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1126
    "return an integer useful for hashing on times"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1127
1520
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  1128
    ^ osTime // 1000
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  1129
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  1130
    "Modified: 3.7.1996 / 13:10:52 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1131
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1132
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1133
!Timestamp methodsFor:'converting'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1134
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1135
asAbsoluteTime
8254
73b6109ab982 Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8246
diff changeset
  1136
    "deprecated, use #asTimestamp"
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1137
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1138
    <resource:#obsolete>
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1139
9061
20af48b9b295 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9056
diff changeset
  1140
    self obsoleteMethodWarning:'use #asTimestamp'.
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1141
    ^ self
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1142
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1143
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1144
asDate
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1145
    "return a Date object from the receiver.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1146
     The returned date will only represent the day - not the timeOfDay."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1147
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1148
    ^ Date fromOSTime:osTime 
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1149
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1150
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1151
     Timestamp now  
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1152
     Timestamp now asDate
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1153
     (Timestamp now addTime:3600) asDate 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1154
     (Timestamp now addTime:3600) asTime 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1155
     Timestamp fromSeconds:(Timestamp now asSeconds + 3600) 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1156
     (Timestamp fromSeconds:(Timestamp now asSeconds + 3600)) asDate  
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1157
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1158
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1159
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1160
asLocalTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1161
    "convert an utc timestamp to local time "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1162
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1163
    ^ self - self utcOffset
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1164
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1165
    "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1166
     Timestamp now asUtcTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1167
     Timestamp now asUtcTimestamp asLocalTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1168
    "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1169
!
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1170
7466
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1171
asMilliseconds
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1172
    "return the number of milliSeconds elapsed since whatever time the
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1173
     OperatingSystem bases its time upon. Since this is totally
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1174
     OS-dependent, do not interpret the value returned by this method.
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1175
     You can use it to add/subtract milliSeconds or get time deltas, though."
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1176
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1177
    ^ self getMilliseconds
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1178
!
87775b24d5ea category and comment change;
Claus Gittinger <cg@exept.de>
parents: 7327
diff changeset
  1179
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1180
asSeconds
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1181
    "return the number of seconds elapsed since whatever time the
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1182
     OperatingSystem bases its time upon. Since this is totally
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1183
     OS-dependent, do not interpret the value returned by this method.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1184
     You can use it to add/subtract seconds or get time deltas, though."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1185
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1186
    ^ self getSeconds
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1187
7004
6cd2080ea0a3 added asUTCSecondsSince1901
penk
parents: 6955
diff changeset
  1188
    "                                                 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1189
     Timestamp now asSeconds
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1190
     Timestamp fromSeconds:(Timestamp now asSeconds + 3600) 
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1191
     Time hour:23 minutes:33 seconds:0         
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1192
     Time fromSeconds:((Time hour:23 minutes:33 seconds:0) asSeconds + 3600) 
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1193
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1194
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1195
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1196
asTime
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1197
    "return a Time object from the receiver.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1198
     The returned time will only represent the timeOfDay - not the day."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1199
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1200
    ^ Time fromOSTime:osTime
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1201
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1202
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1203
     Timestamp now  
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1204
     Timestamp now asTime
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1205
     (Timestamp now addTime:3600) asTime 
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1206
    "
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1207
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1208
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1209
asTimestamp
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1210
    "return an Timestamp object from the receiver - thats the receiver."
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1211
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1212
    ^ self 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1213
!
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1214
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1215
asUtcTimestamp
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1216
    "convert a local time timestamp to UTC"
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1217
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1218
    ^ self + self utcOffset
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1219
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1220
    "
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  1221
     Timestamp now asUtcTimestamp
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1222
    "
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1223
!
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  1224
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1225
literalArrayEncoding
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1226
    "encode myself as an array, from which a copy of the receiver
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1227
     can be reconstructed with #decodeAsLiteralArray.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1228
     The encoding is: 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1229
        (#Timestamp YYYYMMDDhhmmss.iii)
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1230
    "
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1231
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1232
    |s|
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1233
8223
56da5d8f8bc1 replaced '' writeStream by String writeStream
Claus Gittinger <cg@exept.de>
parents: 8111
diff changeset
  1234
    s := WriteStream on:(String new:18).
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1235
    self printGeneralizedOn:s isLocal:true.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1236
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1237
    ^ Array
9416
f57d66ea3bae Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9402
diff changeset
  1238
        with:self class name
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1239
        with:s contents
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1240
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1241
    "
9416
f57d66ea3bae Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9402
diff changeset
  1242
      Timestamp now literalArrayEncoding
f57d66ea3bae Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9402
diff changeset
  1243
        decodeAsLiteralArray
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1244
    "
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1245
!
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1246
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1247
utcSecondsSince1901
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1248
    "return the number of seconds elapsed since Jan, 1st 1901"
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1249
9430
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  1250
"   
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  1251
    secondsBetween1901and1970 := 
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  1252
        ((Date day:1 month:1 year:1970) subtractDate:(Date day:1 month:1 year:1901))
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  1253
        *  (24 * 60 * 60)
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  1254
"
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1255
9449
6ba774be6aa1 stc can compile large integers!
Stefan Vogel <sv@exept.de>
parents: 9433
diff changeset
  1256
    ^ self utcSecondsSince1970 + 2177452800.  
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1257
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1258
    "                                                 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1259
     Timestamp now utcSecondsSince1901 
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  1260
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1261
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1262
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1263
!Timestamp methodsFor:'printing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1264
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1265
printISO8601
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1266
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1267
    ^ TimestampISO8601Builder print: self
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1268
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1269
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1270
     Timestamp now printISO8601           
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1271
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1272
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1273
    "Created: / 16-06-2005 / 16:11:15 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1274
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1275
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1276
printISO8601Compressed
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1277
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1278
    ^ TimestampISO8601Builder printCompressed: self
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1279
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1280
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1281
     Timestamp now printISO8601Compressed           
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1282
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1283
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1284
    "Created: / 16-06-2005 / 16:11:31 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1285
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1286
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1287
printISO8601CompressedOn: aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1288
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1289
    TimestampISO8601Builder printCompressed: self on: aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1290
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1291
    "Created: / 16-06-2005 / 16:11:50 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1292
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1293
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1294
printISO8601On: aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1295
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1296
    TimestampISO8601Builder print: self on: aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1297
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1298
    "Created: / 16-06-2005 / 16:11:07 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1299
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1300
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1301
!Timestamp methodsFor:'printing & storing'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1302
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  1303
addPrintBindingsTo:dict language:languageOrNil
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  1304
    "private print support: add bindings for printing to aDictionary
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  1305
     languageOrNil can only be #en or nil for the current language."
5726
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  1306
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  1307
    self asDate addPrintBindingsTo:dict language:languageOrNil.
6795
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  1308
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  1309
    self year == Date today year ifTrue:[
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  1310
        dict at:#yearOrTime put:(self asTime printStringFormat:'%h:%m').
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  1311
    ].
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  1312
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  1313
    super addPrintBindingsTo:dict language:languageOrNil.
4843
3a4484b834dd better printing
Claus Gittinger <cg@exept.de>
parents: 4839
diff changeset
  1314
!
3a4484b834dd better printing
Claus Gittinger <cg@exept.de>
parents: 4839
diff changeset
  1315
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1316
printGeneralizedOn:aStream 
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1317
    "append a representation of the receiver to aStream in a general format,
9385
f46f04a13052 comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
  1318
     top-down, without separators: 'yyyymmddHHMMSS.mmm+0100'
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1319
     This format is used for the ASN.1 GeneralizedTime as defined in X.208 Sec. 33,
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1320
     so read this before changing the output format."
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1321
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1322
    ^ self printGeneralizedOn:aStream isLocal:false.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1323
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1324
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1325
printGeneralizedOn:aStream isLocal:isLocal
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1326
    "append a representation of the receiver to aStream in a general format,
11177
f5faa6cb49ed fix typo in comment
Stefan Vogel <sv@exept.de>
parents: 11140
diff changeset
  1327
     top-down, without separators: 'yyyymmddHHMMSS.mmm+0100'
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1328
     This format is used for the ASN.1 GeneralizedTime as defined in X.208 Sec. 33,
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1329
     so read this before changing the output format.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1330
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1331
     If isLocal is true, represent as local time, otherwise add UTC time offset."
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1332
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1333
    |t off|
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1334
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1335
    t := OperatingSystem computeTimeAndDateFrom:osTime.
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1336
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1337
    t year    printOn:aStream leftPaddedTo:4 with:$0.
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1338
    t month   printOn:aStream leftPaddedTo:2 with:$0.
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1339
    t day     printOn:aStream leftPaddedTo:2 with:$0.
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1340
    t hours   printOn:aStream leftPaddedTo:2 with:$0. 
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1341
    t minutes printOn:aStream leftPaddedTo:2 with:$0.
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1342
    t seconds printOn:aStream leftPaddedTo:2 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1343
    aStream nextPut:$..
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1344
    t milliseconds printOn:aStream leftPaddedTo:3 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1345
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1346
    isLocal ifFalse:[
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1347
        "/ this should be printed as non-local-time
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1348
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  1349
        off := t utcOffset.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1350
        off == 0 ifTrue:[
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1351
            aStream nextPut:$Z.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1352
        ] ifFalse:[ |min|
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1353
            off < 0 ifTrue:[
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1354
                aStream nextPut:$+.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1355
                off := off negated.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1356
            ] ifFalse:[
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1357
                aStream nextPut:$-.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1358
            ].
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1359
            min := off // 60.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1360
            min // 60 printOn:aStream leftPaddedTo:2 with:$0.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  1361
            min \\ 60 printOn:aStream leftPaddedTo:2 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1362
        ].
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1363
    ].
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1364
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1365
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1366
     Timestamp now printGeneralizedOn:Transcript. Transcript cr. 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1367
     (Timestamp fromSeconds:0) printGeneralizedOn:Transcript. Transcript cr.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1368
     Time now printOn:Transcript. Transcript cr.           
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1369
     Date today printOn:Transcript. Transcript cr.        
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1370
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1371
     Time now asTimestamp printGeneralizedOn:Transcript. Transcript cr.           
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1372
     Timestamp now printGeneralizedOn:Transcript. Transcript cr. 
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1373
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1374
     Date today asTimestamp printGeneralizedOn:Transcript. Transcript cr.           
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1375
     Date today printOn:Transcript. Transcript cr.           
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1376
    "
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1377
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1378
    "Modified: / 1.7.1996 / 15:20:59 / cg"
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1379
    "Modified: / 17.1.2000 / 15:53:02 / stefan"
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1380
!
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  1381
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1382
printIso8601FormatOn:aStream
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1383
    "append the iso8601 UTC representation of the receiver to aStream.
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1384
     This format looks like:
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1385
        1999-01-01T24:00:00
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1386
     or, for zero hr:min:sec, 
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1387
        1999-01-01
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1388
     Of course, a 24 hour clock is used."
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1389
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1390
    |format|
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1391
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1392
    format := '%(year)-%(month)-%(day)T%h:%m:%s.%i'.
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1393
    self milliseconds = 0 ifTrue:[
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1394
        format := '%(year)-%(month)-%(day)T%h:%m:%s'.
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1395
        self seconds = 0 ifTrue:[
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1396
            format := '%(year)-%(month)-%(day)T%h:%m'.
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1397
            ((self hours = 0) and:[self minutes = 0]) ifTrue:[
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1398
                format := '%(year)-%(month)-%(day)'.
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1399
            ]
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1400
        ]
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1401
    ].
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1402
    self printOn:aStream format:format 
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1403
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1404
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1405
     Timestamp now printIso8601FormatOn:Transcript   
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1406
     Timestamp readIso8601FormatFrom:(Timestamp now printStringIso8601Format).
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1407
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1408
!
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1409
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1410
printOn:aStream
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1411
    "append a user readable representation of the receiver to aStream.
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1412
     The format is compatible with readFromString:, but not with readFrom:."
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1413
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1414
    "/ now, use ISO format...
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1415
    self printOn:aStream format:'%(year)-%(mon)-%(day) %h:%m:%s.%i'  
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1416
"/    self printOn:aStream format:'%(Day)-%(mon)-%(year) %h:%m:%s.%i'  
5678
5e1e70d18067 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5677
diff changeset
  1417
"/    self printOn:aStream format:'%(mon)/%(Day)/%(year) %h:%m:%s.%i'  
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1418
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1419
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1420
     Timestamp now printOn:Transcript. Transcript cr. 
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1421
     (Timestamp fromSeconds:0) printOn:Transcript. Transcript cr.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1422
     Time now printOn:Transcript. Transcript cr.           
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1423
     Date today printOn:Transcript. Transcript cr.        
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1424
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1425
     Time now asTimestamp printOn:Transcript. Transcript cr.           
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1426
     Timestamp now printOn:Transcript. Transcript cr. 
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1427
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1428
     Date today asTimestamp printOn:Transcript. Transcript cr.           
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1429
     Date today printOn:Transcript. Transcript cr.           
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1430
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1431
5719
cf09067dbd1d can do millisecondDelta easier
Claus Gittinger <cg@exept.de>
parents: 5678
diff changeset
  1432
    "Modified: 1.7.1996 / 15:20:59 / cg"
cf09067dbd1d can do millisecondDelta easier
Claus Gittinger <cg@exept.de>
parents: 5678
diff changeset
  1433
!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1434
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1435
printRFC1123FormatOn:aStream
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1436
    "append the RFC1123 representation of the receiver to aStream.
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1437
     This format is used in HTTP requests and looks like:
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1438
        'Fri, 04 Jul 2003 15:56:11 GMT'
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1439
     (always GMT and all names in english)"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1440
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1441
"/       HTTP-date      = rfc1123-date | rfc850-date | asctime-date
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1442
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1443
"/       rfc1123-date   = wkday "," SP date1 SP time SP "GMT"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1444
"/       rfc850-date    = weekday "," SP date2 SP time SP "GMT"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1445
"/       asctime-date   = wkday SP date3 SP time SP 4DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1446
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1447
"/       date1          = 2DIGIT SP month SP 4DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1448
"/                        ; day month year (e.g., 02 Jun 1982)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1449
"/       date2          = 2DIGIT "-" month "-" 2DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1450
"/                        ; day-month-year (e.g., 02-Jun-82)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1451
"/       date3          = month SP ( 2DIGIT | ( SP 1DIGIT ))
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1452
"/                        ; month day (e.g., Jun  2)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1453
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1454
"/       time           = 2DIGIT ":" 2DIGIT ":" 2DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1455
"/                        ; 00:00:00 - 23:59:59
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1456
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1457
"/       wkday          = "Mon" | "Tue" | "Wed"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1458
"/                      | "Thu" | "Fri" | "Sat" | "Sun"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1459
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1460
"/       weekday        = "Monday" | "Tuesday" | "Wednesday"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1461
"/                      | "Thursday" | "Friday" | "Saturday" | "Sunday"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1462
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1463
"/       month          = "Jan" | "Feb" | "Mar" | "Apr"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1464
"/                      | "May" | "Jun" | "Jul" | "Aug"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1465
"/                      | "Sep" | "Oct" | "Nov" | "Dec"
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1466
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1467
    |meUTC timeInfo|
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1468
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1469
    meUTC := self class fromSeconds:((self asSeconds) + (self utcOffset)).
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1470
    timeInfo := meUTC timeInfo.
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1471
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1472
    aStream nextPutAll:(#('Mon' 'Tue' 'Wed' 'Thu' 'Fri' 'Sat' 'Sun') at:timeInfo dayInWeek);
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1473
            nextPutAll:', '.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1474
    timeInfo day printOn:aStream leftPaddedTo:2 with:$0.
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1475
    aStream space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1476
    aStream nextPutAll:(#('Jan' 'Feb' 'Mar' 'Apr' 'May' 'Jun' 'Jul' 'Aug' 'Sep' 'Oct' 'Nov' 'Dec') at:timeInfo month).
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1477
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1478
"/ The following line is wrong, because the names are printed in the current locale!!
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1479
"/    timeInfo printOn:aStream format:'%(ShortDayName), %(day) %(ShortMonthName) %y %h:%m:%s GMT'. 
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1480
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1481
"/ the following is too slow for heavy use    
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1482
"/    timeInfo printOn:aStream format:' %y %h:%m:%s GMT'. 
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1483
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1484
    aStream nextPut:Character space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1485
    timeInfo year printOn:aStream.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1486
    aStream nextPut:Character space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1487
    timeInfo hours printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1488
    aStream nextPut:$:.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1489
    timeInfo minutes printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1490
    aStream nextPut:$:.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1491
    timeInfo seconds printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1492
    aStream nextPutAll:' GMT'.
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  1493
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1494
    "
8414
dca52c2725ef comment
ca
parents: 8396
diff changeset
  1495
     Timestamp now printRFC1123FormatOn:Transcript   
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1496
    "
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1497
!
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1498
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1499
printStringIso8601Format
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1500
    "return the Iso8601 representation of the receiver.
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1501
     This format looks like:
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1502
        1999-01-01T24:00:00
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1503
     or, for zero hr:min:sec, 
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1504
        1999-01-01
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1505
     Of course, a 24 hour clock is used."
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1506
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1507
    ^ String streamContents:[:s | self printIso8601FormatOn:s]
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1508
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1509
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1510
     Timestamp now printStringIso8601Format
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1511
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1512
!
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  1513
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1514
printStringRFC1123Format
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1515
    "return the RFC1123 representation of the receiver.
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1516
     This format is used in HTTP requests and looks like:
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  1517
        'Fri, 04 Jul 2003 15:56:11 GMT'
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1518
     (always GMT)"
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1519
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1520
    ^ String streamContents:[:s | self printRFC1123FormatOn:s]
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1521
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1522
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1523
     Timestamp now printStringRFC1123Format
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1524
    "
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1525
!
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  1526
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1527
storeOn:aStream
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1528
    "store the receiver in a format suitable for reconstruction of the
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1529
     receiver via readFrom:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1530
     Use a OS/architecture independent format"
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1531
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1532
    aStream nextPut:$(; 
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1533
            nextPutAll:self class name; 
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1534
            nextPutAll:' readIso8601FormatFrom:'''.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1535
    self printIso8601FormatOn:aStream.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1536
    aStream nextPutAll:''')'.
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  1537
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1538
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1539
     Timestamp now storeString 
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1540
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1541
     Object readFrom:(Timestamp now storeString) readStream
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1542
     Timestamp readFrom:(Timestamp now storeString) readStream
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1543
    "
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1544
! !
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1545
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1546
!Timestamp methodsFor:'private'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1547
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1548
fromOSTime:anUninterpretedOSTime
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1549
    "strictly private: set the seconds from an OS time (since whatever)"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1550
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1551
    osTime := anUninterpretedOSTime
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1552
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1553
    "Created: 1.7.1996 / 14:33:21 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1554
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1555
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1556
getMilliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1557
    "strictly private: return the milliseconds (since whatever)"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1558
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1559
    ^ osTime
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1560
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1561
    "Created: 1.7.1996 / 14:33:56 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1562
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1563
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1564
getSeconds
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1565
    "strictly private: return the seconds (since whatever)"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1566
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1567
    ^ osTime // 1000
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1568
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1569
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1570
setMilliseconds:millis
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1571
    "strictly private: set the milliseconds (since whatever)"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1572
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1573
    osTime := millis.
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1574
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1575
    "Modified: 20.12.1995 / 11:46:36 / stefan"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1576
    "Created: 1.7.1996 / 14:34:24 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1577
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1578
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1579
setSeconds:secs
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1580
    "strictly private: set the seconds (since whatever)"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1581
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1582
    osTime := secs * 1000.
795
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
  1583
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
  1584
    "Modified: 20.12.1995 / 11:46:36 / stefan"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1585
    "Modified: 1.7.1996 / 14:34:10 / cg"
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1586
!
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1587
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1588
utcSecondsSince1970
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1589
    "return the UTC seconds since 1970"
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1590
9430
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  1591
    ^ self getSeconds
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1592
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1593
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1594
     Timestamp now utcSecondsSince1970
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  1595
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1596
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1597
12164
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  1598
8396
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1599
!Timestamp methodsFor:'visiting'!
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1600
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1601
acceptVisitor:aVisitor with:aParameter
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1602
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1603
    ^ aVisitor visitTimestamp:self with:aParameter
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1604
! !
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  1605
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1606
!Timestamp::TimestampBuilderAbstract methodsFor:'error reporting'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1607
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1608
malformed: aString
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1609
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1610
    ConversionError raiseErrorString: aString
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1611
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1612
    "Created: / 15-06-2005 / 15:54:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1613
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1614
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1615
!Timestamp::TimestampBuilderAbstract methodsFor:'support'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1616
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1617
addHoursAndMinutes: arrayWithHoursAndMinutes
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1618
    "Add the given number of hours and minutes to the current timestamp state. If the time
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1619
    is to be subtracted, both numbers in the array must be negated. When the are not the same
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1620
    sign, the behavior may be strange. It's intended only for time zone corrections, where
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1621
    not more than 12 (in fact, 23) hours is added or subtracted (ie. date can be modified only
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1622
    one day forward or backward)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1623
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1624
    | hours minutes |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1625
    hours := arrayWithHoursAndMinutes first.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1626
    minutes := arrayWithHoursAndMinutes second.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1627
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1628
    minutes isZero ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1629
	minute := minute + minutes.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1630
	minute >= 60 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1631
	    hours := hours + minute // 60.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1632
	    minute := minute \\ 60.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1633
	].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1634
	minute < 0 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1635
	    hours := hours + minute // 60.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1636
	    minute := (minute \\ 60) negated
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1637
	]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1638
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1639
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1640
    "Hours may get zero by time zone specification or by minutes modifications above."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1641
    hours isZero ifTrue: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1642
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1643
    "Add or subtract the hour and make date corrections if necessary."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1644
    hour := hour + hours.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1645
    hour < 0 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1646
	"Oops, got to previous day, must adjust even the date."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1647
	hour := 24 - ((hour negated) \\ 24).
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1648
	day := day - 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1649
	day <= 0 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1650
	    "Got to previous month..."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1651
	    month := month - 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1652
	    month <= 0 ifTrue: [year := year - 1. month := 12].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1653
	    day := self lastDayInMonth: month]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1654
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1655
    hour >= 24 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1656
	hour := hour \\ 24.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1657
	day := day + 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1658
	day > (self lastDayInMonth: month) ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1659
	    month := month + 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1660
	    month > 12 ifTrue: [year := year + 1. month := 1].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1661
	    day := 1]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1662
    ]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1663
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1664
    "Created: / 15-06-2005 / 16:45:49 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1665
    "Modified: / 16-06-2005 / 15:04:45 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1666
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1667
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1668
dateFromDayNumber: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1669
    "Set month and day from an absolute number of the day in the year. 1.1. is day number one."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1670
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1671
    | leap |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1672
    leap := self isLeapYear: year.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1673
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1674
    (anInteger between: 1 and: 365) ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1675
	(leap and: [anInteger = 366])
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1676
	    ifFalse: [self malformed: 'Bad day number: ' , anInteger printString]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1677
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1678
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1679
    self shouldImplement
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1680
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1681
    "Created: / 15-06-2005 / 11:27:35 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1682
    "Modified: / 16-06-2005 / 12:31:37 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1683
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1684
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1685
dateFromWeek: weekInteger andWeekday: dayInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1686
    "Compute the month and day. Find the first day (weekday) in the year, maybe even
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1687
    adjust the year. Both week and day are 1-based, the first week in a year is the one
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1688
    with thursday (or the one containing 4.1.)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1689
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1690
    "Check numbers. Year may be checked if it contains 53 weeks or 52 weeks only."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1691
    (dayInteger between: 1 and: 7) ifFalse: [self malformed: 'Bad weekday number: ' , dayInteger printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1692
    (weekInteger between: 1 and: 53) ifFalse: [self malformed: 'Bad week number: ' , weekInteger printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1693
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1694
    self shouldImplement
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1695
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1696
    "Created: / 15-06-2005 / 11:29:42 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1697
    "Modified: / 15-06-2005 / 16:42:33 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1698
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1699
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1700
isAllowedDay: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1701
    "Answer whether the given day is allowed in the current month."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1702
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1703
    ^anInteger between: 1 and: (self lastDayInMonth: month)
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1704
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1705
    "Created: / 15-06-2005 / 16:22:51 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1706
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1707
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1708
isLeapYear: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1709
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1710
    ^(anInteger bitAnd: 3) = 0 and: [anInteger \\ 100 > 0 or: [anInteger \\ 400 = 0]]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1711
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1712
    "Created: / 15-06-2005 / 16:16:31 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1713
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1714
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1715
lastDayInMonth: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1716
    "Answer the number of the last day of the given month in the current year."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1717
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1718
    ^anInteger = 2
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1719
	ifTrue: [(self isLeapYear: year) ifTrue: [29] ifFalse: [28]]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1720
	ifFalse: [#(31 28 31 30 31 30 31 31 30 31 30 31) at: month]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1721
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1722
    "Created: / 15-06-2005 / 17:12:31 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1723
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1724
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1725
timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1726
    "Answer the timestamp as it has been parsed."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1727
    "Notes:
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1728
     - Should use UTCYear:... here? This will produce timezone-dependent timestamp.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1729
     - On UNIX, timestamps can only hold dates between 1970-01-01T01:00:00Z and 2038-01-19T00:00:00Z"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1730
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1731
    ^Timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1732
	year: year month: month day: day
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1733
	hour: hour minute: minute second: second millisecond: millisecond
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1734
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1735
    "Created: / 15-06-2005 / 15:39:24 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1736
    "Modified: / 30-06-2005 / 16:48:25 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1737
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1738
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1739
!Timestamp::TimestampISO8601Builder class methodsFor:'documentation'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1740
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1741
documentation
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1742
"
11994
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1743
    TimestampISO8601Builder is designed to read any (almost) format of ISO 8601 encoded timestamp. Also, class
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1744
    methods can be used to print but the main reading job is done in instance protocol. It has been
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1745
    written because of insufficient abilities of Timestamp #readIso8601FormatFrom: method.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1746
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1747
    It produces timestamps, ie. when the string (or stream) contains only a time, an error will result
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1748
    (it may also pass in some cases but with the time undestood as date). It survives incomplete dates,
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1749
    broken years, incomplete times and timezones. All times read with timezone difference are recomputed
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1750
    to UTC before the timestamp is created (even passing across new year boundary is handled correctly).
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1751
    Unknown offsets (usually local) are considered UTC - this may be wrong and more work is probably needed.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1752
    All data is checked for validity (including leap years, leap seconds,...) during reading and as soon as
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1753
    possible. For an example of what the builder can read, see the examples method and ISO 8601 itself.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1754
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1755
    [author:]
11994
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1756
        Martin Dvorak (masca@volny.cz)
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1757
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1758
    [instance variables:]
11994
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1759
        stream          A stream the builder operates on. Assigned on each call to instance method #read:,
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1760
                        so the builder instance can be reused (by at most one thread).
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1761
        year            Current timestamp year. No default value, date must be present.
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1762
        month           Current timestamp month. May change during parsing. Defaults to 1.
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1763
        day             Current timestamp day. Defaults to 1.
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1764
        hour            Current timestamp hour. Defaults to 0.
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1765
        minute          Current timestamp minute. Defaults to 0.
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1766
        second          Current timestamp second. Defaults to 0.
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1767
        millisecond     Current timestamp millisecond. Defaults to 0.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1768
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1769
    [see also:]
11994
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1770
        Timestamp
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1771
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1772
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1773
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1774
examples
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1775
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1776
    See the testing protocol on instance protocol (should be turned into a TestCase).
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1777
    It covers the main features this builder has.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1778
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1779
    Just to introduce some coding examples, try:
11994
4665bdb0fd89 *** empty log message ***
fm
parents: 11993
diff changeset
  1780
        TimestampISO8601Builder read: (TimestampISO8601Builder print: Timestamp now)
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1781
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1782
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1783
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1784
history
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1785
    "Created: / 16-06-2005 / 16:28:38 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1786
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1787
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1788
!Timestamp::TimestampISO8601Builder class methodsFor:'parsing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1789
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1790
read: stringOrStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1791
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1792
    ^self new read: stringOrStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1793
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1794
    "Created: / 15-06-2005 / 17:52:03 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1795
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1796
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1797
!Timestamp::TimestampISO8601Builder class methodsFor:'printing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1798
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1799
print: aTimestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1800
    "Print the given timestamp in general ISO8601 format."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1801
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1802
    | stream |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1803
    stream := String new writeStream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1804
    self print: aTimestamp on: stream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1805
    ^stream contents
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1806
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1807
    "Created: / 15-06-2005 / 17:52:29 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1808
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1809
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1810
print: aTimestamp on: aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1811
    "Print the given timestamp in general ISO8601 format."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1812
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1813
    aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1814
	nextPutAll: (aTimestamp year printStringRadix: 10 size: 4 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1815
	nextPut: $-;
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1816
	nextPutAll: (aTimestamp month printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1817
	nextPut: $-;
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1818
	nextPutAll: (aTimestamp day printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1819
	nextPut: $T;
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1820
	nextPutAll: (aTimestamp hour printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1821
	nextPut: $:;
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1822
	nextPutAll: (aTimestamp minute printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1823
	nextPut: $:;
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1824
	nextPutAll: (aTimestamp second printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1825
	nextPut: $Z
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1826
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1827
    "Created: / 15-06-2005 / 17:56:51 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1828
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1829
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1830
printCompressed: aTimestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1831
    "Print in special compressed format for timestamp interchange with mobile devices."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1832
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1833
    | stream |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1834
    stream := String new writeStream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1835
    self printCompressed: aTimestamp on: stream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1836
    ^stream contents
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1837
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1838
    "Created: / 15-06-2005 / 17:52:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1839
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1840
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1841
printCompressed: aTimestamp on: aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1842
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1843
    aStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1844
	nextPutAll: (aTimestamp year printStringRadix: 10 size: 4 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1845
	nextPutAll: (aTimestamp month printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1846
	nextPutAll: (aTimestamp day printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1847
	nextPut: $T;
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1848
	nextPutAll: (aTimestamp hour printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1849
	nextPutAll: (aTimestamp minute printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1850
	nextPutAll: (aTimestamp second printStringRadix: 10 size: 2 fill: $0);
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1851
	nextPut: $Z
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1852
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1853
    "Created: / 15-06-2005 / 17:54:17 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1854
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1855
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1856
!Timestamp::TimestampISO8601Builder methodsFor:'private-reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1857
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1858
nextDigit
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1859
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1860
    | char |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1861
    char := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1862
    char ifNil: [^-1].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1863
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1864
    ^char isDigit
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1865
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1866
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1867
	    char codePoint - $0 codePoint]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1868
	ifFalse: [-1]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1869
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1870
    "Created: / 14-06-2005 / 11:48:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1871
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1872
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1873
nextDigitOrError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1874
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1875
    | digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1876
    digit := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1877
    ^digit < 0
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1878
	ifTrue: [self malformed: 'No digit found']
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1879
	ifFalse: [digit]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1880
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1881
    "Created: / 15-06-2005 / 10:57:00 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1882
    "Modified: / 15-06-2005 / 17:22:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1883
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1884
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1885
nextDigits: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1886
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1887
    | char number |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1888
    number := 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1889
    anInteger timesRepeat: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1890
	char := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1891
	char ifNil: [self malformed: 'Stream does not contain all ' , anInteger printString , ' digits'].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1892
	char isDigit
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1893
	    ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1894
		stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1895
		number := number * 10 + char codePoint - $0 codePoint]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1896
	    ifFalse: [self malformed: 'Requested ' , anInteger printString , ' digits not found']
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1897
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1898
    ^number
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1899
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1900
    "Created: / 14-06-2005 / 11:57:22 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1901
    "Modified: / 15-06-2005 / 15:54:29 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1902
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1903
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1904
!Timestamp::TimestampISO8601Builder methodsFor:'processing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1905
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1906
read: stringOrStream
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1907
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1908
    | peek |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1909
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1910
    stream := stringOrStream readStream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1911
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1912
    month := day := 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1913
    hour := minute := second := millisecond := 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1914
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1915
    "Read the year. This will read and swallow up to four year digits."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1916
    self readYear.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1917
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1918
    "Check if date has been read, ie. T or space necountered. If yes, read the time.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1919
    There is possible inconsistency - a dash may be read followed by T, which is not
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1920
    valid. But don't mind that, timestamps will be well-formatted in most cases."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1921
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1922
    peek ifNil: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1923
	"End of stream, only year has been read."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1924
	^self timestamp].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1925
    peek = $- ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1926
	"Skip the dash after year, if present."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1927
	stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1928
	peek := stream peek].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1929
    peek := peek asUppercase.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1930
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1931
    (peek = $T or: [peek = Character space])
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1932
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1933
	    "Got time signature. Skip the signature, read time and answer the timestamp."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1934
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1935
	    self readTime.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1936
	    self readTimezone.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1937
	    ^self timestamp]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1938
	ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1939
	    "Date not read completely yet, expecting month/day or week/day or day"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1940
	    peek = $W
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1941
		ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1942
		    "Parse week number and (possibly) day number."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1943
		    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1944
		    self readWeekNumber]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1945
		ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1946
		    "Got digit, read month number followed by day or day number."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1947
		    self readMonthOrDay]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1948
	].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1949
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1950
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1951
    peek ifNil: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1952
	"End of stream, only year has been read."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1953
	^self timestamp].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1954
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1955
    (peek asUppercase = $T or: [peek = Character space])
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1956
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1957
	    "Got time signature, expecting time follows. Otherwise only date was in the stream."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1958
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1959
	    self readTime.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1960
	    self readTimezone].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1961
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1962
    ^self timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1963
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1964
    "Created: / 14-06-2005 / 11:45:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1965
    "Modified: / 16-06-2005 / 10:15:35 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1966
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1967
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1968
!Timestamp::TimestampISO8601Builder methodsFor:'reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1969
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1970
readMilliseconds
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1971
    "Read an arbitrary number of digits representing milliseconds. As the timestamp can
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1972
    hold only integer amounts of milliseconds, don't mind the rest of the digits."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1973
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1974
    | digit factor |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1975
    factor := 100.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1976
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1977
    [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1978
	digit := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1979
	digit >= 0
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1980
    ] whileTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1981
	factor > 0 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1982
	    "Factor still > 0, did not read all three digits of mantissa."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1983
	    millisecond := digit * factor + millisecond.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1984
	    factor := (factor / 10) integerPart
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1985
	]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1986
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1987
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1988
    factor = 100 ifTrue: [self malformed: 'No digits after millisecond separator']
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1989
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1990
    "Created: / 15-06-2005 / 15:25:45 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1991
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1992
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1993
readMonthOrDay
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1994
    "Read month number, optionally followed by day, or absolute day number (three digit)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1995
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1996
    | dayDigit1 dayDigit2 |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1997
    month := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1998
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1999
    stream peek = $-
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2000
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2001
	    "Got dash. Day number must follow."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2002
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2003
	    day := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2004
	    (self isAllowedDay: day) ifFalse: [self malformed: 'Bad day: ' , day printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2005
	    ^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2006
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2007
    dayDigit1 := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2008
    dayDigit1 < 0 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2009
	"No more digits than month, leave day unspecified."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2010
	(month between: 1 and: 12) ifFalse: [self malformed: 'Bad month: ' , month printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2011
	^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2012
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2013
    dayDigit2 := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2014
    dayDigit2 < 0
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2015
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2016
	    "Read only three digits, this is absolute day number in a year."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2017
	    self dateFromDayNumber: month * 10 + dayDigit1]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2018
	ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2019
	    "Read four digits. So there's month and day."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2020
	    (month between: 1 and: 12) ifFalse: [self malformed: 'Bad month: ' , month printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2021
	    day := dayDigit1 * 10 + dayDigit2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2022
	    (self isAllowedDay: day) ifFalse: [self malformed: 'Bad day: ' , day printString]]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2023
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2024
    "Created: / 15-06-2005 / 11:12:02 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2025
    "Modified: / 16-06-2005 / 11:47:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2026
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2027
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2028
readTime
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2029
    "Date read, don't mind it. Read only the time value."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2030
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2031
    | peek |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2032
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2033
    hour := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2034
    (hour between: 0 and: 24) ifFalse: [self malformed: 'Bad hour: ' , hour printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2035
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2036
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2037
    peek = $:
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2038
	ifTrue: [stream next]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2039
	ifFalse: [(peek notNil and: [peek isDigit]) ifFalse: [^self]].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2040
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2041
    minute := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2042
    (minute between: 0 and: 59) ifFalse: [self malformed: 'Bad minute: ' , minute printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2043
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2044
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2045
    peek = $:
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2046
	ifTrue: [stream next]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2047
	ifFalse: [(peek notNil and: [peek isDigit]) ifFalse: [^self]].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2048
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2049
    second := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2050
    (second between: 0 and: 59) ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2051
	"Seconds are usually in this range, do a special check for leap seconds."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2052
	second <= 61
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2053
	    ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2054
		"Leap seconds can occur only on midnight on 31.12. or 30.6. Dont' check year
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2055
		as it's not deterministic."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2056
		(minute = 59 and: [hour = 23 and: [(month = 12 and: [day = 31]) or: [month = 6 and: [day = 30]]]])
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2057
		    ifFalse: [self malformed: 'Bad leap second']]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2058
	    ifFalse: [self malformed: 'Bad second: ' , second printString]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2059
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2060
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2061
    "Hour, minute and second read. Read appendices."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2062
    stream peek = $.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2063
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2064
	    "Read dot. Skip it and read milliseconds."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2065
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2066
	    self readMilliseconds].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2067
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2068
    hour = 24 ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2069
	(minute = 0 and: [second = 0 and: [millisecond = 0]])
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2070
	    ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2071
		"On 24 hour, advance to the next day."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2072
		"hour := 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2073
		self addMinutes: 1440"]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2074
	    ifFalse: [self malformed: 'Bad 24 hour (minutes, seconds and millis not 0)']
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2075
    ]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2076
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2077
    "Created: / 14-06-2005 / 17:27:00 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2078
    "Modified: / 30-06-2005 / 11:34:38 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2079
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2080
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2081
readTimezone
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2082
    "Read time zone information. There are three possibilities of what can occur.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2083
    If there is nothing more to read, the offset is unknown - this is treated as
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2084
    Zulu time as this may not be true."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2085
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2086
    | peek |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2087
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2088
    peek ifNil: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2089
    peek := peek asUppercase.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2090
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2091
    "If the time is in Zulu, don't modify the timestamp. This makes the machine
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2092
    run in Zulu time zone, maybe some corrections would be nice."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2093
    peek = $Z
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2094
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2095
	    "Time read, skip Zulu signature and exit."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2096
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2097
	    ^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2098
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2099
    peek = $+
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2100
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2101
	    "Read a plus, expect a negative time zone difference."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2102
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2103
	    self addHoursAndMinutes: (self readTimezoneOffset collect: [:e | e negated]).
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2104
	    ^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2105
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2106
    peek = $-
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2107
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2108
	    "Read a minus, expect positive time zone difference or unknown offset."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2109
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2110
	    self addHoursAndMinutes: self readTimezoneOffset.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2111
	    ^self]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2112
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2113
    "Created: / 16-06-2005 / 09:54:21 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2114
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2115
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2116
readTimezoneOffset
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2117
    "Read time zone offset as a number minutes. Generally, there should be hours only
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2118
    but as the format introduces minutes in offsets, we must accept them."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2119
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2120
    | hours digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2121
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2122
    "Read hours."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2123
    hours := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2124
    (hours between: 0 and: 12) ifFalse: [self malformed: 'Bad offset hour: ' , hours printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2125
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2126
    stream peek = $:
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2127
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2128
	    "Colon read, minutes must follow."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2129
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2130
	    digit := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2131
	    (digit between: 0 and: 59) ifFalse: [self malformed: 'Bad offset minute: ' , digit printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2132
	    ^Array with: hours with: digit].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2133
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2134
    "Read next digit and check whether minutes follow. If not, return only with hours. If yes,
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2135
    check boundaries."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2136
    digit := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2137
    digit < 0 ifTrue: [^Array with: hours with: 0].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2138
    digit >= 6 ifTrue: [self malformed: 'Bad offset minute: ' , (digit * 10) printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2139
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2140
    "Read the last digit of offset, it must be present."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2141
    ^Array with: hours with: digit * 10 + self nextDigitOrError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2142
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2143
    "Created: / 15-06-2005 / 15:35:41 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2144
    "Modified: / 15-06-2005 / 17:45:58 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2145
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2146
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2147
readWeekNumber
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2148
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2149
    | week day digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2150
    "Read week number. It is always two digits long."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2151
    week := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2152
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2153
    stream peek = $-
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2154
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2155
	    "Got dash, day number must follow."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2156
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2157
	    digit := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2158
	    digit < 0 ifTrue: [self malformed: 'Bad weekday number'].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2159
	    self dateFromWeek: week andWeekday: digit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2160
	    ^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2161
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2162
    "Read day number that follows the week. If the number is not given, consider it monday."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2163
    day := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2164
    day <= 0 ifTrue: [day := 1].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2165
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2166
    self dateFromWeek: week andWeekday: day
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2167
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2168
    "Created: / 14-06-2005 / 12:06:47 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2169
    "Modified: / 15-06-2005 / 15:53:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2170
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2171
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2172
readYear
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2173
    "Read YYYY or :Y (broken decade) from the stream. Also handles correctly YY- and YYY-."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2174
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2175
    | read peek |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2176
    stream peek = $:
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2177
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2178
	    "Broken two digit year > 1999 follows."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2179
	    stream next.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2180
	    year := self nextDigitOrError + 2000.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2181
	    ^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2182
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2183
    "Expecting two-, three- or four-digit year"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2184
    "Read the first two digits. They must be there."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2185
    read := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2186
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2187
    "Check if there's a dash, this can help us deciding whether the year ends."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2188
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2189
    peek ifNil: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2190
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2191
    year := peek = $-
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2192
	ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2193
	    "OK, got two digits. These are expected to be the year after 1970."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2194
	    read < 70
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2195
		ifTrue: [read + 2000]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2196
		ifFalse: [read + 1900]]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2197
	ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2198
	    "Read the next digit for the case of three-digit year after 1900 (ie. year > 1999)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2199
	     read := read * 10 + self nextDigitOrError.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2200
	     peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2201
	     (peek isNil or: [peek = $-])
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2202
		ifTrue: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2203
		    "Read three digit year, return it."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2204
		    read + 1900]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2205
		ifFalse: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2206
		    "Read the fourth digit of the year. These can be month digits but the
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2207
		    two-digit year format is deprecated anyway."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2208
		    read := read * 10 + self nextDigitOrError]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2209
	]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2210
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2211
    "Created: / 14-06-2005 / 12:01:11 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2212
    "Modified: / 15-06-2005 / 17:31:56 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2213
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2214
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2215
!Timestamp::TimestampISO8601Builder methodsFor:'testing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2216
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2217
test
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2218
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2219
    self test_date.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2220
    self test_time.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2221
    self test_timezone.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2222
    self test_edge.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2223
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2224
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2225
        TimestampISO8601Builder new test
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2226
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2227
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2228
    "Created: / 15-06-2005 / 17:51:16 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2229
    "Modified: / 16-06-2005 / 10:15:55 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2230
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2231
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2232
test_date
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2233
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2234
    | ts |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2235
    ts := Timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2236
         year: 2005 month: 6 day: 15
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2237
         hour: 0 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2238
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2239
    "Test common dates"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2240
    self assert: ts = (self read: '20050615').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2241
    self assert: ts = (self read: '2005-06-15').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2242
    self assert: ts = (self read: '05-06-15').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2243
    self assert: ts = (self read: '05-0615'). "/ Is this correct?
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2244
    self assert: ts = (self read: ':50615'). "/ Should not happen and should not appear after 2009
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2245
    self assert: ts = (self read: '200506-15'). "/ Is this corect?
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2246
    self assert: ts = (self read: '105-06-15'). "/ Should not happen
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2247
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2248
    "Test week numbers"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2249
    "/self assert: ts = (self read: '05W243').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2250
    "/self assert: ts = (self read: '2005W24-3').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2251
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2252
    "Test day numbers"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2253
    "self assert: ts = (self read: '2005-166').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2254
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2255
    ts := Timestamp year: 2004 month: 12 day: 31 hour: 0 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2256
    self assert: ts = (self read: '2004-366').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2257
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2258
    ts := Timestamp year: 2005 month: 12 day: 31 hour: 0 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2259
    self assert: ts = (self read: '2004-365')."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2260
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2261
    "Test february"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2262
    ts := Timestamp year: 2000 month: 2 day: 28 hour: 0 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2263
    self assert: ts = (self read: '20000228').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2264
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2265
    ts := Timestamp year: 2000 month: 2 day: 29 hour: 0 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2266
    self assert: ts = (self read: '20000229').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2267
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2268
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2269
        TimestampISO8601Builder new test_date
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2270
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2271
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2272
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2273
    "Created: / 15-06-2005 / 17:21:56 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2274
    "Modified: / 16-06-2005 / 11:50:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2275
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2276
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2277
test_edge
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2278
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2279
    | ts |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2280
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2281
    self test_mustFail: [self read: '20050229'].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2282
    self test_mustFail: [self read: '20050029'].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2283
    self test_mustFail: [self read: '20050332'].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2284
    self test_mustFail: [self read: '2005-366'].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2285
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2286
    ts := Timestamp year: 2005 month: 1 day: 1 hour: 0 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2287
    self assert: ts = (self read: '20041231T22-0200').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2288
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2289
    ts := Timestamp year: 2004 month: 12 day: 31 hour: 22 minute: 0 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2290
    self assert: ts = (self read: '20050101T0000+0200').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2291
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2292
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2293
        TimestampISO8601Builder new test_edge
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2294
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2295
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2296
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2297
    "Created: / 16-06-2005 / 09:44:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2298
    "Modified: / 16-06-2005 / 11:48:59 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2299
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2300
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2301
test_mustFail: aBlock
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2302
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2303
    ConversionError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2304
	handle: [:ex | ex return]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2305
	do: [
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2306
	    aBlock value.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2307
	    self error: 'Assertion failed'
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2308
	]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2309
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2310
    "Created: / 16-06-2005 / 09:43:37 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2311
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2312
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2313
test_time
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2314
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2315
    | ts |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2316
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2317
    ts := Timestamp  year: 2005 month: 6 day: 15 hour: 17 minute: 37 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2318
    self assert: ts = (self read: '2005-06-15 17:37').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2319
    self assert: ts = (self read: '20050615T1737').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2320
    self assert: ts = (self read: '05-0615T17:3700').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2321
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2322
    ts := Timestamp  year: 2005 month: 6 day: 15 hour: 17 minute: 37 second: 0 millisecond: 30.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2323
    self assert: ts = (self read: '05-0615T17:3700.03').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2324
    self assert: ts = (self read: '2005-06-15T17:37:00.0305486-00:00').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2325
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2326
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2327
        TimestampISO8601Builder new test_time
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2328
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2329
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2330
    "Created: / 15-06-2005 / 17:39:26 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2331
    "Modified: / 16-06-2005 / 11:54:30 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2332
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2333
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2334
test_timezone
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2335
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2336
    | ts |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2337
    ts := Timestamp
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2338
         year: 2005 month: 6 day: 15
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2339
         hour: 17 minute: 37 second: 0 millisecond: 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2340
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2341
    self assert: ts = (self read: '2005-06-15T17:37Z').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2342
    self assert: ts = (self read: '2005-06-15T17:37+0000').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2343
    self assert: ts = (self read: '2005-06-15T17:37-00:00').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2344
    self assert: ts = (self read: '2005-06-15T15:37:00-0200').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2345
    self assert: ts = (self read: '2005-06-15T19:37:00+0200').
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2346
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2347
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2348
        TimestampISO8601Builder new test_timezone
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2349
    "
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2350
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2351
    "Created: / 15-06-2005 / 17:40:23 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2352
    "Modified: / 16-06-2005 / 10:17:57 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2353
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2354
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2355
!Timestamp class methodsFor:'documentation'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2356
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2357
version
12164
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  2358
    ^ '$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.123 2009-10-06 19:46:45 cg Exp $'
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  2359
!
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  2360
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  2361
version_CVS
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  2362
    ^ '$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.123 2009-10-06 19:46:45 cg Exp $'
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2363
! !
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2364
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2365
Timestamp initialize!