Timestamp.st
author Merge Script
Tue, 10 Nov 2015 07:06:23 +0100
branchjv
changeset 18887 0a420700cb60
parent 18768 99079a967eb0
parent 18886 abf121c38718
child 19635 875eb54afd2c
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
     1
"{ Encoding: utf8 }"
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
     2
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     3
"
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     4
 COPYRIGHT (c) 1989 by Claus Gittinger
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
     5
	      All Rights Reserved
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     6
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     7
 This software is furnished under a license and may be used
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     8
 only in accordance with the terms of that license and with the
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    10
 be provided or otherwise made available to, or used by, any
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    11
 other person.  No title to or ownership of the software is
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    12
 hereby transferred.
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    13
"
5376
c2ef7d5e25ca oops - was not able to reread my own storeString.
Claus Gittinger <cg@exept.de>
parents: 5292
diff changeset
    14
"{ Package: 'stx:libbasic' }"
c2ef7d5e25ca oops - was not able to reread my own storeString.
Claus Gittinger <cg@exept.de>
parents: 5292
diff changeset
    15
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
    16
"{ NameSpace: Smalltalk }"
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
    17
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    18
AbstractTime subclass:#Timestamp
17005
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    19
	instanceVariableNames:'osTime'
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
    20
	classVariableNames:'Epoch MinOSTime MaxOSTime'
17005
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    21
	poolDictionaries:''
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    22
	category:'Magnitude-Time'
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    23
!
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    24
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    25
Object subclass:#TimestampBuilderAbstract
17005
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    26
	instanceVariableNames:'year month day hour minute second millisecond isUtcTime
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    27
		hasTimezone yearAlreadyRead utcOffset'
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    28
	classVariableNames:''
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    29
	poolDictionaries:''
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    30
	privateIn:Timestamp
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    31
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    32
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    33
Timestamp::TimestampBuilderAbstract subclass:#TimestampISO8601Builder
17005
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    34
	instanceVariableNames:'stream'
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    35
	classVariableNames:''
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    36
	poolDictionaries:''
d6d98374dd39 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17003
diff changeset
    37
	privateIn:Timestamp
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    38
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
    39
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
    40
!Timestamp class methodsFor:'documentation'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    41
82
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    42
copyright
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    43
"
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    44
 COPYRIGHT (c) 1989 by Claus Gittinger
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
    45
	      All Rights Reserved
82
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    46
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    47
 This software is furnished under a license and may be used
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    48
 only in accordance with the terms of that license and with the
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    49
 inclusion of the above copyright notice.   This software may not
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    50
 be provided or otherwise made available to, or used by, any
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    51
 other person.  No title to or ownership of the software is
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    52
 hereby transferred.
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    53
"
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    54
!
0147b4f725ae *** empty log message ***
claus
parents: 77
diff changeset
    55
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    56
documentation
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    57
"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    58
    This class represents time values in milliSeconds starting some time in the past.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    59
    When printing and accessing values like #hour,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
    60
    the timestamp will be interpreted in the local timezone
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
    61
    (as opposed to UtcTimestamp, which presents itself in UTC,
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    62
     and as opposed to TZTimestamp, which remembers the timezone in which it was created).
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    63
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    64
    The internal representation, osTime, will typically start with 1970-01-01 0:00,
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    65
    as used in the Unix operating system, but other systems may bias the time differently.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    66
    Actually, the implementation does not depend or even know which time/date
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    67
    the OperatingSystem bases its time upon - it is simply keeping the value(s)
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    68
    as returned from the OS.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    69
    For conversion, these values are given back to the OS, which will know
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    70
    how to convert these times. This has the advantage, that timestamps on files
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    71
    (such as last-access-time or last-modification-time) can be handled transparently -
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    72
    especially when performing comparisons.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    73
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    74
    You should not interpret the osTime instance variable directly,
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
    75
    instead (if at all), ask the OS to convert.
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    76
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    77
    The implementation of this class is not the same as in ST-80
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
    78
    (which represents the time as seconds from Jan 1., 1901).
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
    79
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
    80
    This class should not be confused with Time (which only represents the
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
    81
    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
    82
    instances of Timestamp can.
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
    83
8264
b14c26a88e96 Change AbsoluteTime to Timestamp
Stefan Vogel <sv@exept.de>
parents: 8254
diff changeset
    84
    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
    85
    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
    86
    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
    87
    AbsoluteTime is still kept as an alias for backward compatibility.
3479
9ca6229713f4 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3122
diff changeset
    88
16922
148cb53b8691 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16921
diff changeset
    89
    Also Note:
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    90
        On UNIX, osTime can only hold dates between 1970-01-01T00:00:00Z and 2038-01-19T00:00:00Z
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    91
        However, timestamp instances can now hold negative osTime values (which are timestamps
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    92
        before 1.1.1970 and greater than 4294967295 (2^32-1) for timestamps after 2038-01-19.
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    93
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    94
        For dates before 1582 (when calendars were changed from Julian to Grgorian),
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    95
        the so called 'proleptic gregorian calendar' is used. This assumes leap years to continue in
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    96
        the past as if a gregorian calendar was used. Thus, 0000 is considered a leap year.
16972
d8db8a2c3323 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16967
diff changeset
    97
1306
c0189edbd96c checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
    98
    [author:]
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    99
        Claus Gittinger
1306
c0189edbd96c checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
   100
1282
3f5eda57c516 commentary
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
   101
    [See also:]
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
   102
        UtcTimestamp Time Date
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
   103
        Delay ProcessorScheduler
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   104
"
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   105
! !
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   106
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   107
!Timestamp class methodsFor:'initialization'!
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   108
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   109
initialize
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   110
    AbsoluteTime := self.       "backward compatibility"
16995
f228434f6e34 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16994
diff changeset
   111
17008
b3c0cf461687 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17006
diff changeset
   112
    MinOSTime := OperatingSystem epochStartOSTime.
b3c0cf461687 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17006
diff changeset
   113
    MaxOSTime := OperatingSystem epochEndOSTime.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   114
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   115
    Epoch := UtcTimestamp basicNew setSeconds:0.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   116
! !
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   117
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   118
!Timestamp class methodsFor:'instance creation'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   119
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   120
UTCYear:y month:m day:d hour:h minute:min second:s millisecond:millis
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   121
    "return an instance of the receiver, given individual components,
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   122
     interpreted in the UTC timezone."
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   123
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   124
    ^ self basicNew
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   125
	    UTCyear:y month:m day:d hour:h minute:min second:s millisecond:millis
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   126
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   127
    "
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
   128
     Timestamp UTCYear:1970 month:1 day:1 hour:0 minute:0 second:0 millisecond:0
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   129
     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
   130
     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
   131
     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
   132
     Timestamp UTCYear:2000 month:1 day:1 hour:1 minute:0 second:0 millisecond:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   133
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   134
     UtcTimestamp UTCYear:2000 month:1 day:1 hour:1 minute:0 second:0 millisecond:0
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   135
    "
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   136
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   137
    "Modified: / 1.7.1996 / 15:22:07 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   138
    "Created: / 13.7.1999 / 12:34:37 / stefan"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   139
    "Modified: / 13.7.1999 / 12:42:30 / stefan"
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
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   142
decodeFromLiteralArray:anArray
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   143
    "decode a Timestamp literalArray.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   144
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   145
     anArray may be:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   146
	#(Timestamp '200004182000.123')
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   147
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   148
     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
   149
     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
   150
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   151
	#(Timestamp #osTime: 12345678)
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   152
    "
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   153
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   154
    (anArray at:2) == #osTime: ifTrue:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   155
	^ self new osTime:(anArray at:3).
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
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   158
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   159
	readGeneralizedFrom:(anArray at:2)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   160
	onError:[ self conversionErrorSignal
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   161
		    raiseErrorString:'literal array decoding' ]
8797
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   162
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   163
    "
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   164
     Timestamp
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   165
	decodeFromLiteralArray:#(Timestamp '20050323175226.014')
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   166
     Timestamp
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   167
	decodeFromLiteralArray:#(Timestamp '20050323175226.014-01')
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   168
     Timestamp
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   169
	decodeFromLiteralArray:#(Timestamp '20050323175226.014Z')
8797
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   170
    "
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   171
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   172
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   173
epoch
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   174
    "the epoch is based to 0 for 1970-01-01 00:00:00.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   175
     However, we allow negative values to represent timestamps before that"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   176
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   177
    ^ Epoch
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
   178
!
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
   179
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   180
fromDate:aDate
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   181
    "return an instance of the receiver, initialized from a time and a date
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   182
     object.
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   183
     See also `Timestamp now' and other protocol inherited
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   184
     from my superclass."
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   185
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   186
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   187
	year:aDate year
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   188
	month:aDate month
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   189
	day:aDate day
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   190
	hour:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   191
	minute:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   192
	second:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   193
	millisecond:0
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   194
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   195
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   196
     Timestamp fromDate:(Date today) andTime:(Time now)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   197
     Timestamp fromDate:(Date today plusDays:1) andTime:(Time now)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   198
     Timestamp now
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   199
    "
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   200
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   201
    "Modified: / 8.9.1995 / 15:07:30 / claus"
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   202
    "Modified: / 19.4.1996 / 15:25:46 / cg"
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   203
    "Modified: / 13.7.1999 / 12:30:47 / stefan"
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   204
!
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   205
423
claus
parents: 392
diff changeset
   206
fromDate:aDate andTime:aTime
claus
parents: 392
diff changeset
   207
    "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
   208
     object.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   209
     See also `Timestamp now' and other protocol inherited
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   210
     from my superclass."
423
claus
parents: 392
diff changeset
   211
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   212
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   213
	year:aDate year
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   214
	month:aDate month
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   215
	day:aDate day
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   216
	hour:aTime hours
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   217
	minute:aTime minutes
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   218
	second:aTime seconds
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   219
	millisecond:aTime milliseconds
16946
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   220
423
claus
parents: 392
diff changeset
   221
    "
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   222
     Timestamp fromDate:(Date today) andTime:(Time now)
16946
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   223
     Timestamp fromDate:(Date today) andTime:(Time nowWithMilliseconds)
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   224
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   225
     Timestamp fromDate:(Date today plusDays:1) andTime:(Time now)
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   226
     Timestamp now
423
claus
parents: 392
diff changeset
   227
    "
claus
parents: 392
diff changeset
   228
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   229
    "Modified: / 8.9.1995 / 15:07:30 / claus"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   230
    "Modified: / 19.4.1996 / 15:25:46 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   231
    "Modified: / 13.7.1999 / 12:30:47 / stefan"
423
claus
parents: 392
diff changeset
   232
!
claus
parents: 392
diff changeset
   233
16946
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   234
newDay:day month:month year:year
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   235
    "return a new Timestamp, given the year, month and day (starting at 1).
16930
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   236
     Date protocol compatibility"
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   237
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   238
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   239
	year:year
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   240
	month:month
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   241
	day:day
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   242
	hour:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   243
	minute:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   244
	second:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   245
	millisecond:0
16930
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   246
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   247
    "
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   248
     Timestamp newDay:1 month:1 year:1996
16930
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   249
    "
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   250
!
66a377261f90 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16928
diff changeset
   251
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   252
newDay:dayInYear year:year
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   253
    "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
   254
     Date protocol compatibility"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   255
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   256
    ^ self fromDate:(Date newDay:dayInYear year:year)
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   257
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   258
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   259
     Timestamp newDay:183 year:1996
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   260
     Timestamp newDay:1 year:1996
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   261
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   262
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   263
    "Modified: 2.7.1996 / 09:39:30 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   264
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   265
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   266
secondsSince1970:secs
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   267
    "set time from elapsed seconds since 1-1-1970, 00:00:00.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   268
     This is the format used in the UNIX world"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   269
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   270
    ^ self basicNew setSeconds:secs.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   271
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   272
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   273
     Timestamp secondsSince1970:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   274
     Timestamp secondsSince1970:3600
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   275
     Timestamp secondsSince1970:3600*24
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   276
     (Timestamp year:2010 month:7 day:1 hour:0 minute:0 second:0)
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   277
       =
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   278
     (Timestamp secondsSince1970:1277935200)
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   279
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   280
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   281
    "Created: / 21-10-1996 / 17:48:30 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   282
    "Modified: / 13-07-1999 / 12:31:22 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   283
    "Modified: / 08-01-2011 / 16:06:28 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   284
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   285
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   286
utcMillisecondsSince1970:secs
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   287
    "set time from elapsed milliseconds since the epoch 1-1-1970, 00:00:00."
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   288
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   289
    ^ self basicNew setMilliseconds:secs
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   290
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   291
    "Created: / 08-01-2011 / 16:09:32 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   292
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   293
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   294
utcNow
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   295
    "return now as utc timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   296
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   297
    ^ UtcTimestamp now
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   298
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   299
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   300
     Timestamp now
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   301
     Timestamp utcNow
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   302
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   303
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   304
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   305
utcSecondsSince1970:secs
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   306
    "set time from elapsed seconds since 1-1-1970, 00:00:00.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   307
     This is the format used in the UNIX world"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   308
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   309
    ^ self secondsSince1970:secs
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   310
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   311
"/    |divMod|
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   312
"/
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   313
"/    divMod := secs divMod:3600.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   314
"/    ^ self year:1970 month:1 day:1 hour:(divMod at:1) minute:0 second:(divMod at:2) millisecond:0.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   315
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   316
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   317
     Timestamp secondsSince1970:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   318
     Timestamp secondsSince1970:3600
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   319
     Timestamp secondsSince1970:3600*24
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   320
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   321
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   322
    "Modified: / 13-07-1999 / 12:31:22 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   323
    "Created: / 08-01-2011 / 16:05:09 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   324
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   325
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   326
year:y month:m day:d hour:h minute:min second:s
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   327
    "return an instance of the receiver, given individual components.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   328
     See also `Timestamp now' and other protocol inherited
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   329
     from my superclass."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   330
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   331
    ^ self year:y month:m day:d hour:h minute:min second:s millisecond:0
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   332
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   333
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   334
     Timestamp year:1970 month:1 day:1 hour:1 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   335
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   336
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0 millisecond:100
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   337
     Timestamp year:2000 month:7 day:1 hour:1 minute:0 second:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   338
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   339
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   340
    "Modified: / 1.7.1996 / 15:22:07 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   341
    "Created: / 13.7.1999 / 12:06:39 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   342
    "Modified: / 13.7.1999 / 12:27:47 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   343
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   344
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   345
year:y month:m day:d hour:h minute:min second:s millisecond:millis
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   346
    "return an instance of the receiver, given individual components.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   347
     See also `Timestamp now' and other protocol inherited
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   348
     from my superclass."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   349
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   350
    ^ self basicNew
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   351
	    year:y month:m day:d hour:h minute:min second:s millisecond:millis
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   352
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   353
     Timestamp year:1970 month:1 day:1 hour:0 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   354
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   355
     Timestamp year:1991 month:1 day:2 hour:12 minute:30 second:0 millisecond:100
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   356
     Timestamp year:2000 month:7 day:1 hour:1 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   357
     UtcTimestamp year:2000 month:7 day:1 hour:1 minute:0 second:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   358
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   359
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   360
    "Modified: / 1.7.1996 / 15:22:07 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   361
    "Created: / 13.7.1999 / 12:28:44 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   362
    "Modified: / 13.7.1999 / 12:37:57 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   363
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   364
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   365
!Timestamp class methodsFor:'Compatibility-Squeak'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   366
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   367
current
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   368
    ^ self now
13604
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   369
!
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   370
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   371
readFrom:aStringOrStream
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   372
    "Answer a new instance for the value given by aStringOrStream"
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   373
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   374
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   375
	readFrom:aStringOrStream
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   376
	onError:[ ConversionError raiseRequestWith:aStringOrStream errorString:' - timestamp']
13604
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   377
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   378
    "
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   379
     self readFrom:'23-jun-2000 15:00'
14969
13470ec6f8c8 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 14713
diff changeset
   380
     self fromString:'23-jun-2000 15:00'
13604
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   381
     self readFrom:'23-jun-2000 '
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   382
    "
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   383
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   384
    "Modified (comment): / 20-08-2011 / 16:52:10 / cg"
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   385
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   386
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   387
year: year month: month day: day hour: hour minute: minute second: second millisecond: millisecond offset:timeDuration
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   388
    ^ (UtcTimestamp year: year month: month day: day hour: hour minute: minute second: second millisecond: millisecond)
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   389
        utcOffset:timeDuration
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   390
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   391
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   392
     Timestamp year:2015 month:11 day:9 hour:12 minute:0 second:0 millisecond:0 offset:(2 hours)
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   393
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   394
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   395
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   396
year: year month: month day: day hour: hour minute: minute second: second offset:timeDuration
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   397
    ^ (UtcTimestamp year: year month: month day: day hour: hour minute: minute second: second)
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   398
        utcOffset:timeDuration
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   399
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   400
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   401
     Timestamp year:2015 month:11 day:9 hour:12 minute:0 second:0 offset:(2 hours)
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   402
    "
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   403
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   404
13700
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   405
!Timestamp class methodsFor:'format strings'!
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   406
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   407
defaultFormatString
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   408
    "a format string to present times in user interfaces.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   409
     Do not use this to store/retrieve times (use ISO8601 for that).
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   410
     Although the string below looks like ISO8601, it does not include TZ information,
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   411
     so when read back, it will always be interpreted as a local timestamp."
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   412
13700
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   413
    ^ '%(year)-%(month)-%(day) %h:%m:%s.%i'
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   414
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   415
    "Created: / 16-01-2011 / 11:23:36 / cg"
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   416
! !
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   417
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   418
!Timestamp class methodsFor:'obsolete'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   419
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   420
day:d month:m year:y hour:h minutes:min seconds:s
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   421
    <resource: #obsolete>
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   422
    "This is obsolete. User #year:month:day:hour:minute:second:"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   423
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   424
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   425
	year:y month:m day:d hour:h
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   426
	minute:min second:s millisecond:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   427
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   428
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   429
    "Modified: / 1.7.1996 / 15:22:26 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   430
    "Modified: / 13.7.1999 / 12:29:56 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   431
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   432
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   433
day:d month:m year:y hour:h minutes:min seconds:s milliseconds:millis
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   434
    <resource: #obsolete>
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   435
    "This is obsolete. User #year:month:day:hour:minute:second:millisecond:"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   436
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   437
    ^ self year:y month:m day:d hour:h minute:min second:s millisecond:millis
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   438
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   439
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   440
     Timestamp day:1 month:1 year:1970 hour:1 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   441
     Timestamp day:2 month:1 year:1991 hour:12 minute:30 second:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   442
     Timestamp day:2 month:1 year:1991 hour:12 minute:30 second:0 millisecond:100
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   443
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   444
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   445
    "Created: / 1.7.1996 / 14:46:09 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   446
    "Modified: / 1.7.1996 / 15:22:07 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   447
    "Modified: / 13.7.1999 / 12:30:26 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   448
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   449
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   450
!Timestamp class methodsFor:'private'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   451
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   452
basicReadFrom:aStream
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   453
    "return a new Timestamp, reading a printed representation from aStream.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   454
     The string is interpreted as 24 hour format, as printed.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   455
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   456
     Notice, that this is NOT the storeString format, which is iso8601
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   457
     This is more or less a heuristic attempt to read any reasonable format.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   458
     If the input starts with an integer > 31,
16935
14fe31ad5f88 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16932
diff changeset
   459
     it is assumed to be a year and the rest is read in iso8601 format.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   460
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   461
     KLUDGE:
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   462
        us and non-us format have different ordering of day and month;
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   463
        The format read here is (non-us) dd-mm-yyyy hh:mm:ss.iii
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   464
        or (us-format, for Travis) mm/dd/yyyy hh:mm:ss.iii.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   465
     On error, raise an exception"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   466
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   467
    |monthOrYear firstNumber secondNumber day month year hour min sec millis usFormat possibeMonthName ch utcOffsetOrNil count|
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   468
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   469
    count := 0.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   470
    monthOrYear := aStream throughAnyForWhich:[:ch | count := count+1. ch isDigit and:[count <= 4]].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   471
    firstNumber := Integer readFrom:monthOrYear onError:[TimeConversionError raiseErrorString:' - integer expected'].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   472
    firstNumber > 31 ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   473
        "/ assume iso8601 format;
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   474
        ^ self readIso8601FormatFrom:aStream yearAlreadyRead:firstNumber.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   475
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   476
    aStream skipSeparators.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   477
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   478
    "/ consider this a kludge
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   479
    usFormat := (aStream peek == $/ ).
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   480
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   481
    [(ch := aStream peekOrNil) notNil and:[ch isLetterOrDigit]] whileFalse:[aStream next].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   482
    (ch notNil and:[ch isDigit]) ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   483
        secondNumber := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   484
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   485
        usFormat ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   486
            month := firstNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   487
            day := secondNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   488
        ] ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   489
            month := secondNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   490
            day := firstNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   491
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   492
    ] ifFalse:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   493
        possibeMonthName := aStream throughAnyForWhich:[:ch | ch isLetter].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   494
        month := Date indexOfMonth:possibeMonthName asLowercase.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   495
        day := firstNumber.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   496
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   497
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   498
    (day between:1 and:31) ifFalse:[ TimeConversionError raiseErrorString:' - bad day' ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   499
    (month between:1 and:12) ifFalse:[ TimeConversionError raiseErrorString:' - bad month' ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   500
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   501
    [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   502
    year := Integer readFrom:aStream onError:[ TimeConversionError raiseErrorString:' - bad year' ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   503
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   504
    aStream atEnd ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   505
        hour := min := sec := millis := 0.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   506
    ] ifFalse:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   507
        [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   508
        hour := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   509
        (hour between:0 and:24) ifFalse:[ TimeConversionError raiseErrorString:' - bad hour' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   510
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   511
        [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   512
        min := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   513
        (min between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad minute' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   514
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   515
        aStream atEnd ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   516
            sec := millis := 0.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   517
        ] ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   518
            [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   519
            sec := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   520
            (sec between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad second' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   521
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   522
            aStream peek == $. ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   523
                aStream next.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   524
                millis := Integer readFrom:aStream onError:0.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   525
                millis >= 1000 ifTrue:[ TimeConversionError raiseErrorString:' - bad millisecond' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   526
            ] ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   527
                millis := 0.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   528
            ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   529
            aStream atEnd ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   530
                utcOffsetOrNil := self utcOffsetFrom:aStream
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   531
            ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   532
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   533
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   534
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   535
    "special check - only 24:00:00 is allowed;
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   536
     every time after that must wrap"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   537
    hour == 24 ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   538
        (min ~~ 0 or:[sec ~~ 0 or:[millis ~~ 0]]) ifTrue:[ TimeConversionError raiseErrorString:' - bad hour' ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   539
    ].
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   540
    utcOffsetOrNil notNil ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   541
        utcOffsetOrNil = 0 ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   542
            "/ utc timestamp
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   543
            ^ UtcTimestamp year:year month:month day:day hour:hour minute:min second:sec millisecond:millis
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   544
        ].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   545
        ^ TZTimestamp new 
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   546
                UTCyear:year month:month day:day hour:hour minute:min second:sec millisecond:millis;
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   547
                utcOffset:utcOffsetOrNil;
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   548
                addSeconds:utcOffsetOrNil.
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   549
    ].
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   550
    "/ a local timestamp
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   551
    ^ self year:year month:month day:day hour:hour minute:min second:sec millisecond:millis.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   552
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   553
    "some ad hoc formats:
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   554
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   555
     Timestamp basicReadFrom:'20-2-1995 13:11:06' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   556
     Timestamp basicReadFrom:'20-2-1995 13:11:06.' readStream
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   557
     Timestamp basicReadFrom:'20-feb-1995 13:11:06' readStream
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   558
     Timestamp basicReadFrom:'20-foo-1995 13:11:06' readStream
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   559
     (Timestamp basicReadFrom:'10-9-1995 13:11:06' readStream) month    - european
16935
14fe31ad5f88 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16932
diff changeset
   560
     (Timestamp basicReadFrom:'10/9/1995 13:11:06' readStream) month    - us
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   561
     Timestamp basicReadFrom:'20-2-1995 13:11' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   562
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100' readStream
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   563
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100 MESZ' readStream
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   564
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100+0200' readStream
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   565
     Timestamp basicReadFrom:'32-2-1995 13:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   566
     Timestamp basicReadFrom:'32-foo-1995 13:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   567
     Timestamp basicReadFrom:'20-13-1995 13:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   568
     Timestamp basicReadFrom:'20-12-1995 25:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   569
     Timestamp basicReadFrom:'20-12-1995 23:61:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   570
     Timestamp basicReadFrom:'20-12-1995 23:10:66.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   571
     Timestamp basicReadFrom:'20-12-1995 23:10:00.1000' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   572
     Timestamp basicReadFrom:'20-2-1995 24:01:00.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   573
     Timestamp basicReadFrom:'20-2-1995 24:00:01.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   574
     Timestamp basicReadFrom:'foo' readStream
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   575
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   576
     any iso8601 format:.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   577
     Timestamp basicReadFrom:(Timestamp now printString readStream)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   578
     Timestamp basicReadFrom:'1995-10-20 24:00:00.000' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   579
     Timestamp basicReadFrom:'1995-10-20 12:10:00.000' readStream
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   580
     Timestamp basicReadFrom:'1995-10-20 12:10:00.000-0200' readStream
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   581
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   582
     UtcTimestamp basicReadFrom:'1995-10-20 12:10:00.000' readStream
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   583
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   584
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   585
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   586
readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   587
    "common helper for read methods.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   588
     Return a new Timestamp, reading an iso8601 representation from aStream.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   589
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   590
     If the time ends with a 'Z' it is the UTC (or zulu) time,
16292
efa6c17501b7 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16192
diff changeset
   591
     otherwise it is local time.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   592
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   593
     Missing month/day values are replaced with 1; i.e. 1999T24:00
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   594
     is the same as 1999-01-01T24:00:00.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   595
     Missing minute, second and ms values are replaced with 0;
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   596
     i.e. 1999T12 is the same as 1999-01-01T12:00:00.000.
16292
efa6c17501b7 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16192
diff changeset
   597
     Partial hours, minutes, seconds are allowed at the end,
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   598
     decimal separators are both $. and $, .
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   599
     Of course, a 24 hour clock is used.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   600
     On error, raise an exception.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   601
     Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   602
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   603
    "/ changed to use the new reader
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   604
    ^ TimestampISO8601Builder
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   605
	read:aStringOrStream withClass:self
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   606
	yearAlreadyReadAs:yearOrNil
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   607
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   608
"/    |str day month dayInWeek week year hour min sec tmpDay millis fraction isUtcTime peekChar ch|
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   609
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   610
"/    str := aStringOrStream readStream.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   611
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   612
"/    month := day := 1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   613
"/    hour := millis := 0.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   614
"/    isUtcTime := false.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   615
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   616
"/    yearOrNil notNil ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   617
"/        year := yearOrNil
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   618
"/    ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   619
"/        year := Integer readFrom:str onError:nil.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   620
"/        year isNil ifTrue:[ TimeConversionError raiseErrorString:' - bad year' ]
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   621
"/    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   622
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   623
"/    str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   624
"/    (((ch := str peek) == $-) or:[ch == $W]) ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   625
"/        (ch == $-) ifTrue:[ str next ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   626
"/        str peek == $W ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   627
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   628
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   629
"/            "/ week follows
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   630
"/            week := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   631
"/            (week between:1 and:53) ifFalse:[ TimeConversionError raiseErrorString:' - bad week' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   632
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   633
"/            str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   634
"/            str peek == $- ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   635
"/                str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   636
"/                "/ day follows.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   637
"/                dayInWeek := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   638
"/                (dayInWeek between:1 and:7) ifFalse:[ TimeConversionError raiseErrorString:' - bad day in week' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   639
"/            ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   640
"/                dayInWeek := 1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   641
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   642
"/            tmpDay := Date newDayInWeek:dayInWeek week:week year:year.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   643
"/            day := tmpDay day.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   644
"/            month := tmpDay month.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   645
"/            year := tmpDay year.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   646
"/        ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   647
"/            "/ month follows.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   648
"/            month := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   649
"/            (month between:1 and:12) ifFalse:[ TimeConversionError raiseErrorString:' - bad month' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   650
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   651
"/            str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   652
"/            str peek == $- ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   653
"/                str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   654
"/                "/ day follows.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   655
"/                day := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   656
"/                (day between:1 and:31) ifFalse:[ TimeConversionError raiseErrorString:' - bad day' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   657
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   658
"/        ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   659
"/    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   660
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   661
"/    str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   662
"/    str atEnd ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   663
"/        "time follows"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   664
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   665
"/        str peek == $T ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   666
"/            "we treat the T as optional here"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   667
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   668
"/            str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   669
"/        ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   670
"/        hour := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   671
"/        (hour between:0 and:24) ifFalse:[ TimeConversionError raiseErrorString:' - bad hour' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   672
"/        str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   673
"/        str peekOrNil == $: ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   674
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   675
"/            "/ minutes follow.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   676
"/            min := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   677
"/            (min between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad minute' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   678
"/            str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   679
"/            str peekOrNil == $: ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   680
"/                str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   681
"/                "/ seconds follow.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   682
"/                sec := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   683
"/                (sec between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad seconds' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   684
"/                str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   685
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   686
"/        ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   687
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   688
"/        peekChar := str peekOrNil.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   689
"/        (peekChar == $. or:[peekChar == $,]) ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   690
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   691
"/            "/ decimals follow.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   692
"/            fraction := Number readMantissaFrom:str radix:10.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   693
"/            min isNil ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   694
"/                min := 60 * fraction.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   695
"/                fraction := min fractionPart.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   696
"/                min := min truncated.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   697
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   698
"/            (sec isNil and:[fraction ~= 0])ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   699
"/                sec := 60 * fraction.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   700
"/                fraction := sec fractionPart.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   701
"/                sec := sec truncated.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   702
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   703
"/            fraction ~= 0 ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   704
"/                millis := (1000 * fraction) rounded.  "/ mhmh - should it be truncated ?
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   705
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   706
"/        ].
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   707
"/
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   708
"/        peekChar := str peekOrNil.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   709
"/        peekChar notNil ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   710
"/            peekChar == $Z ifTrue:[
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   711
"/                str next.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   712
"/                isUtcTime := true.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   713
"/            ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   714
"/                ((peekChar == $+) or:[peekChar == $- ]) ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   715
"/                    str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   716
"/                    self halt.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   717
"/                    isUtcTime := true.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   718
"/                ]
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   719
"/            ]
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   720
"/        ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   721
"/    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   722
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   723
"/    min isNil ifTrue:[min := 0].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   724
"/    sec isNil ifTrue:[sec := 0].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   725
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   726
"/    "special check - only 24:00:00 is allowed;
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   727
"/     every time after that must wrap"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   728
"/    hour == 24 ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   729
"/        (min ~~ 0 or:[sec ~~ 0 or:[millis ~~ 0]]) ifTrue:[ TimeConversionError raiseErrorString:' - bad hour' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   730
"/    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   731
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   732
"/    isUtcTime ifTrue:[
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   733
"/        ^ self
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   734
"/            UTCYear:year month:month day:day
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   735
"/            hour:hour minute:min second:sec millisecond:millis.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   736
"/    ] ifFalse:[
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   737
"/        ^ self
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   738
"/            year:year month:month day:day
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   739
"/            hour:hour minute:min second:sec millisecond:millis.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   740
"/    ]
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   741
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   742
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   743
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06.123'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   744
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   745
     Timestamp readIso8601FormatFrom:'1995-02T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   746
     Timestamp readIso8601FormatFrom:'1995T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   747
     Timestamp readIso8601FormatFrom:'1995T13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   748
     Timestamp readIso8601FormatFrom:'1995T13:11.5'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   749
     Timestamp readIso8601FormatFrom:'1995T13:11,5'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   750
     Timestamp readIso8601FormatFrom:'1995T13'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   751
     Timestamp readIso8601FormatFrom:'1995T13.25'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   752
     Timestamp readIso8601FormatFrom:'1995T13.333333'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   753
     Timestamp readIso8601FormatFrom:'1995'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   754
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   755
     Timestamp readIso8601FormatFrom:'2014W40'   -> 29.sep.2014
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   756
     Timestamp readIso8601FormatFrom:'2014W44-4' -> 30.oct.2014
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   757
     Timestamp readIso8601FormatFrom:'2014W1'    -> 30.dec.2013      !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   758
     Timestamp readIso8601FormatFrom:'2014W1-1'  -> same 30.dec.2013 !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   759
     Timestamp readIso8601FormatFrom:'2014W1-2'  -> 31.dec.2013      !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   760
     Timestamp readIso8601FormatFrom:'2014W1-3'  -> 1.jan.2014       !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   761
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   762
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   763
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06Z'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   764
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   765
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   766
     Timestamp readIso8601FormatFrom:'1995-02-20 13'
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   767
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   768
   24 is allowed with ISO, and is 00:00 of the next day:
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   769
     Timestamp readIso8601FormatFrom:'1995-02-20 24:00:00'
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   770
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   771
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   772
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   773
readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil onError:exceptionValue
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   774
    "common helper for read methods."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   775
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   776
    |retVal|
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   777
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   778
    ConversionError handle:[:ex |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   779
	retVal := exceptionValue value
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   780
    ] do:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   781
	retVal := self readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   782
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   783
    ^ retVal
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   784
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   785
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   786
!Timestamp class methodsFor:'reading'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   787
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   788
readFrom:aStringOrStream format:formatString language:languageOrNil onError:exceptionalValue
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   789
    "return a new Timestamp, reading a printed representation from aStream using a formatString.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   790
     The formatString is similar to the one used when printing.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   791
     On error, exceptionalValue is returned.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   792
     If exceptionalValue is a one-arg block, an error message is passed as argument.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   793
     Format:
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   794
        %h      hours, 00..23 (i.e. european)  0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   795
        %u      hours, 00..12 (i.e. us)        0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   796
        %m      minutes, 00..59                0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   797
        %s      seconds, 00..59                0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   798
        %i      milliseconds, 000..999         0-padded to length 3
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   799
        %a      am/pm
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   800
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   801
        %d             - day
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   802
        %D             - day
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   803
        %(day)         - day
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   804
        %(dayOfYear)   - 1..365/366
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   805
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   806
        %(month)       - month
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   807
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   808
        %(monthName)   - monthName
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   809
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   810
        %(year)        - year, full 4 digits
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   811
        %Y             - year, last 2 digits only,
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   812
                         0..71 map to 2000..2071;
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   813
                         72..99 map to 1972..1999;
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   814
        %Y1900          - year, last 2 digits only, map to 1900..1999
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   815
        %Y2000          - year, last 2 digits only, map to 2000..2099
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   816
        %Y1950          - year, last 2 digits only, map to 1950..2049
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   817
        %Y1980          - year, last 2 digits only, map to 1980..2079
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   818
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   819
     an optional length after the % gives a field length;
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   820
        i.e. %2h%2m%2s parses '123557' as 12:35:37
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   821
        and '%4(year)%2(month)%2(day)' parses '20060620' as 2006-06-20 00:00:00
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   822
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   823
     Please consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   824
    "
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   825
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   826
    |day month year dayOfYear monthAndDay
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   827
     hour minute second millisecond
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   828
     utcOffset inStream formatStream error fChar format itemHandler
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   829
     len now s|
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   830
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   831
    error := [:msg |
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   832
                exceptionalValue isBlock ifTrue:[
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   833
                    ^ exceptionalValue valueWithOptionalArgument:'format error'
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   834
                ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   835
                    ^ exceptionalValue value
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   836
                ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   837
             ].
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   838
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   839
    itemHandler := [:format |
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   840
        |input|
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   841
        
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   842
        input := len isNil ifTrue:[ inStream ] ifFalse:[ inStream next: len ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   843
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   844
        ( #('d' 'D' 'day' ) includes:format ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   845
            day := Integer readFrom:input onError:[ error value:'invalid day' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   846
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   847
        ] ifFalse:[ ( format = 'month' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   848
            month := Integer readFrom:input onError:[ error value:'invalid month' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   849
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   850
        ] ifFalse:[ ( format = 'year' or:[ format = 'y' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   851
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   852
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   853
        ] ifFalse:[ ( format = 'Y' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   854
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   855
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
18449
48c31fe80359 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18447
diff changeset
   856
            (year < 70) ifTrue:[
48c31fe80359 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18447
diff changeset
   857
                year := year + 2000
48c31fe80359 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18447
diff changeset
   858
            ] ifFalse:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   859
                year := year + 1900
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   860
            ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   861
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   862
        ] ifFalse:[ (format = 'monthName') ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   863
            s := input nextMatching:[:c | c isLetter] thenMatching:[:c | c isLetter].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   864
            month := Date indexOfMonth:s asLowercase language:languageOrNil
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   865
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   866
        ] ifFalse:[ (format = 'dayOfYear') ifTrue:[
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   867
            dayOfYear := Integer readFrom:input onError:[ error value:'invalid day of year' ].
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   868
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   869
        ] ifFalse:[ ( format sameAs: 'Y1900' ) ifTrue:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   870
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   871
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   872
            year := year + 1900
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   873
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   874
        ] ifFalse:[ ( format sameAs:  'Y1950' ) ifTrue:[
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   875
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   876
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   877
            (year between:0 and: 49) ifTrue:[ 
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   878
                year := year + 2000
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   879
            ] ifFalse:[    
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   880
                year := year + 1900
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   881
            ]  
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   882
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   883
        ] ifFalse:[ ( format sameAs:  'Y1980' ) ifTrue:[
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   884
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   885
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   886
            (year between:0 and: 79) ifTrue:[ 
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   887
                year := year + 2000
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   888
            ] ifFalse:[    
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   889
                year := year + 1900
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   890
            ]  
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   891
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   892
        ] ifFalse:[ ( format sameAs:  'Y2000' ) ifTrue:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   893
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   894
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   895
            year := year + 2000
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   896
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   897
        ] ifFalse:[ ( format = 'h' or:[ format = 'H' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   898
            hour := Integer readFrom:input onError:[ error value:'invalid hour' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   899
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   900
        ] ifFalse:[ ( format = 'u'  or:[ format = 'U']) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   901
            hour := Integer readFrom:input onError:[ error value:'invalid hour' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   902
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   903
        ] ifFalse:[ ( format = 'm'  or:[ format = 'M' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   904
            minute := Integer readFrom:input onError:[ error value:'invalid minute' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   905
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   906
        ] ifFalse:[ ( format = 's'  or:[ format = 'S' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   907
            second := Integer readFrom:input onError:[ error value:'invalid second' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   908
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   909
        ] ifFalse:[ ( format = 'i'  or:[ format = 'I' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   910
            millisecond := Integer readFrom:input onError:[ error value:'invalid month' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   911
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   912
        ] ifFalse:[ ( format = 'tz' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   913
            utcOffset := self utcOffsetFrom:input.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   914
            utcOffset isNil ifTrue:[ error value:'invalid timezone' ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   915
        ] ifFalse:[ ( format = 'a' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   916
            s := (input next:2) asLowercase.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   917
            s = 'am' ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   918
                (hour between:0 and:12) ifFalse:[ error value:'invalid hour' ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   919
            ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   920
                s = 'pm' ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   921
                    (hour between:1 and:12) ifFalse:[ error value:'invalid hour' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   922
                    hour := hour + 12.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   923
                ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   924
                    error value:'invalid am/pm'
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   925
                ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   926
            ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   927
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   928
        ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   929
            error value:'unhandled format:',format
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   930
        ]]]]]]]]]]]]]]]]]
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   931
    ].
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   932
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   933
    hour := 0.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   934
    minute := 0.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   935
    second := 0.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   936
    millisecond := 0.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
   937
    utcOffset := 0.
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   938
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   939
    inStream := aStringOrStream readStream.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   940
    formatStream := formatString readStream.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   941
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   942
    [formatStream atEnd] whileFalse:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   943
        fChar := formatStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   944
        fChar = Character space ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   945
            inStream peek isSeparator ifFalse:[ error value: 'format error; space expcected' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   946
            inStream skipSeparators.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   947
        ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   948
            fChar == $% ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   949
                len := nil.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   950
                (formatStream peek isDigit) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   951
                    len := Integer readFrom:formatStream onError:[ error value: 'format error; invalid length' ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   952
                ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   953
                (formatStream peek == $() ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   954
                    formatStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   955
                    format := formatStream upTo:$).
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   956
                ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   957
                    (formatStream peek == ${) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   958
                        formatStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   959
                        format := formatStream upTo:$}.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   960
                    ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   961
                        (formatStream peek isLetter) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   962
                            format := formatStream nextAlphaNumericWord.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   963
                        ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   964
                            error value:'unhandled format:',formatStream peek
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   965
                        ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   966
                    ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   967
                ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   968
                itemHandler value:format.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   969
            ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   970
                inStream peek = fChar ifFalse:[^ error value: 'format error; ',fChar,' expcected'].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   971
                inStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   972
            ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   973
        ].
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   974
    ].
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   975
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   976
    year isNil ifTrue:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   977
        year := (now := Timestamp now) year
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   978
    ].
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   979
    
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   980
    dayOfYear notNil ifTrue:[
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   981
        monthAndDay := Date monthAndDayFromDayInYear:dayOfYear forYear:year.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   982
        month := (monthAndDay at:1).
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   983
        day := (monthAndDay at:2).  
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   984
    ].
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   985
    
18451
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
   986
    ^ (self 
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
   987
        year:year month:month day:day 
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
   988
        hour:(hour ? 0) minute:(minute ? 0) second:(second ? 0) millisecond:millisecond) 
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
   989
            + utcOffset
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   990
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   991
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   992
     Timestamp readFrom:'20-2-1995 13:11:06' format:'%day-%month-%year %h:%m:%s' language:nil onError:[self halt]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   993
     Timestamp readFrom:'20021995131106' format:'%2d%2month%4y%2h%2m%2s' language:nil onError:[self halt]
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   994
     Timestamp readFrom:'200295131106' format:'%2d%2month%2y%2h%2m%2s' language:nil onError:[self halt]
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   995
     Timestamp readFrom:'200260131106' format:'%2d%2month%2(y1900)%2h%2m%2s' language:nil onError:[self halt]
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   996
     Timestamp readFrom:'200260131106' format:'%2d%2month%2(y2000)%2h%2m%2s' language:nil onError:[self halt]
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   997
     Timestamp readFrom:'200260131106' format:'%2d%2month%2(y1950)%2h%2m%2s' language:nil onError:[self halt]
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   998
     Timestamp readFrom:'200260131106' format:'%2d%2month%2(y1980)%2h%2m%2s' language:nil onError:[self halt]
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   999
     Timestamp readFrom:'March 7 2009 7:30pm EST' format:'%monthName %day %year %u:%m%a %tz' language:#en onError:[self halt]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1000
     Timestamp readFrom:'March 7 2009 7:30pm UTC' format:'%monthName %day %year %u:%m%a %tz' language:#en onError:[self halt]
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1001
     Timestamp readFrom:'2015103' format:'%4y%3dayOfYear' onError:[self halt]
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1002
    "
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1003
!
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1004
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1005
readFrom:aStringOrStream onError:exceptionBlock
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1006
    "return a new Timestamp, reading a printed representation from aStream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1007
     The string is interpreted as 24 hour format, as printed.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1008
     Notice, that this is not the storeString format and
4898
a7a32af11523 oops - reading was wrong
Claus Gittinger <cg@exept.de>
parents: 4843
diff changeset
  1009
     is different from the format expected by readFrom:.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1010
     The format read here is either dd-mm-yyyy hh:mm:ss.iii
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1011
     or iso8601 (if the first integer is >31).
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1012
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1013
     Please consider using a standard format, such as iso8601."
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1014
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1015
    |stream newTime|
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1016
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1017
    stream := aStringOrStream readStream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1018
7092
630807cd320f Convert Object>>errorSignal -> Error
Stefan Vogel <sv@exept.de>
parents: 7058
diff changeset
  1019
    Error handle:[:ex |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1020
	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
  1021
    ] do:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1022
	newTime := self basicReadFrom:stream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1023
    ].
3995
777470826394 no need for another error-handler blcok in #readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 3510
diff changeset
  1024
    ^ newTime
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1025
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1026
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1027
     Timestamp readFrom:'20-2-1995 13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1028
     Timestamp readFrom:'20-2-1995 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1029
     Timestamp readFrom:'20-2-2001 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1030
     Timestamp readFrom:'20-2-1995 13:11:06.100'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1031
     Timestamp readFrom:'32-2-1995 13:11:06.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1032
     Timestamp readFrom:'32-foo-1995 13:11:06.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1033
     Timestamp readFrom:'20-2-1995 24:01:00.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1034
     Timestamp readFrom:'20-2-1995 24:00:01.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1035
     Timestamp readFrom:'2002-08-02 24:00:01.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1036
     Timestamp readFrom:'foo' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1037
     Timestamp readFrom:(Timestamp now storeString) onError:'wrong'
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1038
    "
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1039
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
  1040
    "Modified: / 8.10.1996 / 19:25:59 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
  1041
    "Modified: / 13.7.1999 / 12:31:14 / stefan"
2311
88b035dd471a New Method: #secondsSince1970.
Stefan Vogel <sv@exept.de>
parents: 1701
diff changeset
  1042
!
88b035dd471a New Method: #secondsSince1970.
Stefan Vogel <sv@exept.de>
parents: 1701
diff changeset
  1043
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1044
readGeneralizedFrom:aStringOrStream
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1045
    "return a new Timestamp, reading a printed representation from aStream.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1046
     The format read here is either
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1047
	yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1048
     or:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1049
	yyyy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1050
     The string is interpreted as 24 hour format, as printed.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1051
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1052
     This format is used for BER specification of the ASN.1 GeneralizedTime as defined in X.208 Sec. 33,
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1053
     so read this before changing anything here.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1054
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1055
     New applications should consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1056
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1057
     Notice, that this is not the storeString format and
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1058
     is different from the format expected by readFrom:.
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1059
    "
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1060
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1061
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1062
	readGeneralizedFrom:aStringOrStream
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1063
	short:false
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1064
	onError:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1065
	    self conversionErrorSignal raiseErrorString:'Timestamp format error'
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1066
	].
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1067
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1068
    "Created: / 22-08-2006 / 16:05:55 / cg"
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1069
!
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1070
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1071
readGeneralizedFrom:aStringOrStream onError:exceptionBlock
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1072
    "return a new Timestamp, reading a printed representation from aStream.
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1073
     The format read here is either
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1074
	yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1075
     or:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1076
	yyyy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1077
     The string is interpreted as 24 hour format, as printed.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1078
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1079
     This format is used for BER specification of the ASN.1 GeneralizedTime as defined in X.208 Sec. 33,
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1080
     so read this before changing anything here.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1081
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1082
     New applications should consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1083
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1084
     Notice, that this is not the storeString format and
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1085
     is different from the format expected by readFrom:.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1086
    "
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1087
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1088
    ^ self readGeneralizedFrom:aStringOrStream short:false onError:exceptionBlock
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1089
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1090
    "
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1091
     |s|
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1092
     s := '' writeStream.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1093
     Timestamp now printGeneralizedOn:s.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1094
     Timestamp readGeneralizedFrom:s contents onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1095
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1096
 Daylight saving time:
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1097
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1098
     Timestamp readGeneralizedFrom:'20000718120000Z' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1099
     Timestamp readGeneralizedFrom:'20000718120000+0200' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1100
     Timestamp readGeneralizedFrom:'20000718120000+0300' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1101
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1102
 No daylight saving time:
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1103
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1104
     Timestamp readGeneralizedFrom:'20000202120000Z' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1105
     Timestamp readGeneralizedFrom:'20000202120000+0100' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1106
     Timestamp readGeneralizedFrom:'20000202120000+0200' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1107
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1108
     Timestamp readGeneralizedFrom:'19950220131106' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1109
     Timestamp readGeneralizedFrom:'199502201311' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1110
     Timestamp readGeneralizedFrom:'19950220131106.100' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1111
     Timestamp readGeneralizedFrom:'19950232131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1112
     Timestamp readGeneralizedFrom:'19950fo2131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1113
     Timestamp readGeneralizedFrom:'foo' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1114
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1115
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00' onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1116
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1117
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100 +0100' onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1118
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 -0100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1119
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 +0000' onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1120
    "
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1121
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1122
    "Modified: / 13-07-1999 / 12:31:14 / stefan"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1123
    "Modified: / 22-08-2006 / 12:30:11 / cg"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1124
!
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1125
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1126
readGeneralizedFrom:aStringOrStream short:shortFormat onError:exceptionBlock
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1127
    "return a new Timestamp, reading a printed representation from aStream.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1128
     The long format read here is either
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1129
            yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1130
        or:
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1131
            yyyy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1132
     The (not recommended) short forms are:
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1133
            yymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1134
        or:
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1135
            yy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1136
     The string is interpreted as 24 hour format, as printed.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1137
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1138
     This format is used for BER specification of the ASN.1 GeneralizedTime and
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1139
     UTCTime as defined in X.208 Sec. 33, so read this before changing anything here.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1140
     The short form is no longer recommended.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1141
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1142
     New applications should consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1143
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1144
     Notice, that this is not the storeString format and
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1145
     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
  1146
    "
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1147
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1148
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
  1149
    ^ [
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1150
        |newTime str day month year hour min sec millis c|
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1151
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1152
        sec := millis := 0.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1153
        str := aStringOrStream readStream.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1154
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1155
        shortFormat ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1156
            year := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1157
            year < 50 ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1158
                year := year + 2000.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1159
            ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1160
                year := year + 1900.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1161
            ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1162
        ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1163
            year := Integer readFrom:(str next:4).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1164
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1165
        str peek == $- ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1166
        month := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1167
        (month between:1 and:12) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1168
        str peek == $- ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1169
        day := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1170
        (day between:1 and:31) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1171
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1172
        str skipSeparators.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1173
        hour:= Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1174
        (hour between:0 and:24) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1175
        str peek == $: ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1176
        min:= Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1177
        (min between:0 and:59) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1178
        str atEnd ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1179
            str peek == $: ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1180
            sec := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1181
            (sec between:0 and:59) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1182
            str atEnd ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1183
                str peek == $. ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1184
                    str next.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1185
                    millis := Integer readFrom:str.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1186
                ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1187
                str skipSeparators.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1188
            ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1189
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1190
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1191
        str atEnd ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1192
            "/ this is local time
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1193
            newTime := self year:year month:month day:day
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1194
                            hour:hour minute:min second:sec millisecond:millis.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1195
        ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1196
            c := str next.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1197
            c ~~ $Z ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1198
                |tzh tzmin|
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1199
                tzh := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1200
                tzmin := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1201
                c == $+ ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1202
                    "the timezone is ahead of UTC or EAST from Greenwich: subtract hours and minutes"
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1203
                    hour := hour - tzh.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1204
                    min := min - tzmin.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1205
                ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1206
                    c == $- ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1207
                        "the timezone is behind of UTC or WEST from Greenwich: add hours and minutes"
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1208
                        hour := hour + tzh.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1209
                        min := min + tzmin.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1210
                    ] ifFalse:exceptionBlock
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1211
                ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1212
            ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1213
            "this is UTC time"
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1214
            newTime := self UTCYear:year month:month day:day
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1215
                              hour:hour minute:min second:sec millisecond:millis.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1216
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1217
        newTime
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
  1218
    ] on:Error do:exceptionBlock.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1219
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1220
    "
5656
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
  1221
     |s|
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
  1222
     s := '' writeStream.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1223
     Timestamp now printGeneralizedOn:s.
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1224
     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
  1225
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1226
     Timestamp readGeneralizedFrom:'20080718120000+0300' short:false onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1227
     Timestamp readGeneralizedFrom:'080718120000+0300' short:true onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1228
     Timestamp readGeneralizedFrom:'990718120000+0300' short:true onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1229
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1230
 Daylight saving time:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1231
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1232
     Timestamp readGeneralizedFrom:'20000718120000Z' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1233
     Timestamp readGeneralizedFrom:'20000718120000+0200' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1234
     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
  1235
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1236
 No daylight saving time:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1237
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1238
     Timestamp readGeneralizedFrom:'20000202120000Z' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1239
     Timestamp readGeneralizedFrom:'20000202120000+0100' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1240
     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
  1241
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1242
     Timestamp readGeneralizedFrom:'19950220131106' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1243
     Timestamp readGeneralizedFrom:'199502201311' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1244
     Timestamp readGeneralizedFrom:'19950220131106.100' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1245
     Timestamp readGeneralizedFrom:'19950232131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1246
     Timestamp readGeneralizedFrom:'19950fo2131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1247
     Timestamp readGeneralizedFrom:'foo' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1248
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1249
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00' onError:[]
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1250
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1251
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100 +0100' onError:[]
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1252
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 -0100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1253
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 +0000' onError:[]
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1254
    "
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1255
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1256
    "Modified: / 13-07-1999 / 12:31:14 / stefan"
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1257
    "Modified: / 22-08-2006 / 12:30:11 / cg"
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1258
!
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1259
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1260
readISO8601From:aStringOrStream
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1261
    "Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1262
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1263
    "using the new reader"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1264
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1265
    ^ TimestampISO8601Builder read:aStringOrStream withClass:self
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1266
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1267
    "Created: / 16-06-2005 / 16:13:36 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1268
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1269
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1270
readISO8601From:aStringOrStream onError:exceptionValue
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1271
    "Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1272
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1273
    "using the new reader"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1274
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1275
    |retVal|
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1276
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1277
    ConversionError handle:[:ex |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1278
	retVal := exceptionValue value
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1279
    ] do:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1280
	retVal := TimestampISO8601Builder read:aStringOrStream withClass:self
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1281
    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1282
    ^ retVal
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1283
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1284
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1285
readIso8601FormatFrom:aStringOrStream
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1286
    "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
  1287
     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
  1288
     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
  1289
     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
  1290
     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
  1291
     Of course, a 24 hour clock is used.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1292
     On error, raise an exception.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1293
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1294
     Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1295
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1296
    "changed to use the new reader"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1297
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1298
    ^ TimestampISO8601Builder read:aStringOrStream withClass:self
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1299
"/    ^ self
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1300
"/        readIso8601FormatFrom:aStringOrStream yearAlreadyRead:nil
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1301
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1302
    "
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1303
     Timestamp readIso8601FormatFrom:'20141106T123843.299Z'
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1304
     Timestamp readIso8601FormatFrom:'20141106T123843.299'
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1305
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1306
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1307
     Timestamp readIso8601FormatFrom:'1995-02T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1308
     Timestamp readIso8601FormatFrom:'1995T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1309
     Timestamp readIso8601FormatFrom:'1995T13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1310
     Timestamp readIso8601FormatFrom:'1995T13'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1311
     Timestamp readIso8601FormatFrom:'1995'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1312
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1313
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1314
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1315
     Timestamp readIso8601FormatFrom:'1995-02-20 13'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1316
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1317
     Timestamp readIso8601FormatFrom:'20141106T122831.894Z'
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1318
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1319
   24 is allowed with ISO, and is 00:00 of the next day:
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1320
     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
  1321
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1322
    "
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1323
!
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1324
8432
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1325
readIso8601FormatFrom:aStringOrStream onError:exceptionValue
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1326
    "return a new Timestamp, reading an iso8601 UTC representation from aStream.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1327
     Missing month/day values are replaced with 1; i.e. 1999T24:00
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1328
     is the same as 1999-01-01T24:00:00.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1329
     Missing minute, second and ms values are replaced with 0;
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1330
     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
  1331
     Of course, a 24 hour clock is used.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1332
     On error, raise an exception.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1333
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1334
     Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1335
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1336
    "/ changed to use the new reader
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1337
    |retVal|
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1338
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1339
    ConversionError handle:[:ex |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1340
	retVal := exceptionValue value
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1341
    ] do:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1342
	retVal := TimestampISO8601Builder read:aStringOrStream withClass:self
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1343
    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1344
    ^ retVal
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1345
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1346
"/    ^ self
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1347
"/        readIso8601FormatFrom:aStringOrStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1348
"/        yearAlreadyRead:nil
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1349
"/        onError:exceptionValue
8432
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1350
!
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1351
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1352
readRFC1123FormatFrom:rfc1123String onError:exceptionBlock
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1353
    "please use this only for http-requests.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1354
     All other programs should use iso8601, which is the standard for times and dates.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1355
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1356
     All HTTP/1.0 date/time stamps must be represented in Universal Time (UT),
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1357
     also known as Greenwich Mean Time (GMT), without exception.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1358
     This is indicated in the first two formats by the inclusion of
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1359
     'GMT' as the three-letter abbreviation for time zone,
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1360
     and should be assumed when reading the asctime format.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1361
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1362
     HTTP-date      = rfc1123-date | rfc850-date | asctime-date
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1363
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1364
     rfc1123-date   = wkday ',' SP date1 SP time SP 'GMT'
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1365
     rfc850-date    = weekday ',' SP date2 SP time SP 'GMT'
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1366
     asctime-date   = wkday SP date3 SP time SP 4DIGIT
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1367
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1368
     date1          = 2DIGIT SP month SP 4DIGIT
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1369
                      ; day month year (e.g., 02 Jun 1982)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1370
     date2          = 2DIGIT '-' month '-' 2DIGIT
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1371
                      ; day-month-year (e.g., 02-Jun-82)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1372
     date3          = month SP ( 2DIGIT | ( SP 1DIGIT ))
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1373
                      ; month day (e.g., Jun  2)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1374
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1375
     time           = 2DIGIT ':' 2DIGIT ':' 2DIGIT
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1376
                      ; 00:00:00 - 23:59:59
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1377
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1378
     wkday          = 'Mon' | 'Tue' | 'Wed'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1379
                    | 'Thu' | 'Fri' | 'Sat' | 'Sun'
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1380
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1381
     weekday        = 'Monday' | 'Tuesday' | 'Wednesday'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1382
                    | 'Thursday' | 'Friday' | 'Saturday' | 'Sunday'
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1383
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1384
     month          = 'Jan' | 'Feb' | 'Mar' | 'Apr'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1385
                    | 'May' | 'Jun' | 'Jul' | 'Aug'
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1386
                    | 'Sep' | 'Oct' | 'Nov' | 'Dec'
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1387
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1388
     Mon, 17 Aug 2009 11:11:15 GMT
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1389
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1390
     however, occasionally, someone presents us with non-UTC strings which include a timezone;
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1391
     thus, this also supports:
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1392
         Mon, 17 Aug 2009 11:11:15 +xxxx
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1393
         Mon, 17 Aug 2009 11:11:15 -xxxx
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1394
     and:
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1395
         Mon, 17 Aug 2009 11:11:15 PST
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1396
    "
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1397
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1398
    |parts indexModifier utcOffsetString utcOffset day year time monthName month|
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1399
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1400
    rfc1123String isEmptyOrNil ifTrue:[^ exceptionBlock value].
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1401
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1402
    parts := rfc1123String asCollectionOfSubstringsSeparatedBy:Character space.
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1403
    parts size == 6 ifTrue:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1404
        indexModifier := 0.
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1405
    ] ifFalse:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1406
        parts size == 5 ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1407
            indexModifier := -1.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1408
        ] ifFalse:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1409
            ^ exceptionBlock value
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1410
        ].
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1411
    ].
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1412
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1413
    day := Integer readFrom:(parts at:2 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1414
    year := Integer readFrom:(parts at:4 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1415
    time := Time readFrom:(parts at:5 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1416
    monthName := parts at:3 + indexModifier.
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1417
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1418
    month := Date indexOfMonth:monthName language:#en.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1419
    month = 0 ifTrue:[^ exceptionBlock value].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1420
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1421
    utcOffsetString := parts at:6 + indexModifier ifAbsent:nil.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1422
    utcOffset := self utcOffsetFrom:utcOffsetString.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1423
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1424
    (utcOffset isNil or:[utcOffset = 0]) ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1425
        ^ UtcTimestamp year:year month:month day:day hour:time hour minute:time minute second:time second millisecond:0.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1426
    ].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1427
    ^ TZTimestamp new 
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1428
            setOSTimeFromUTCYear:year month:month day:day hour:time hour minute:time minute second:time second millisecond:0;
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1429
            utcOffset:utcOffset;
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1430
            addSeconds:utcOffset.
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1431
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1432
    "
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1433
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 GMT' onError:nil
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1434
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 UTC' onError:nil
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1435
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 PST' onError:nil
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1436
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 PDT' onError:nil
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1437
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 +0100' onError:nil
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1438
     self readRFC1123FormatFrom:'17 Aug 2009 11:11:15 +0100' onError:nil
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1439
    "
13085
ee5674e04bd6 changed: #readRFC1123FormatFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 12939
diff changeset
  1440
ee5674e04bd6 changed: #readRFC1123FormatFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 12939
diff changeset
  1441
    "Modified: / 05-10-2010 / 16:05:32 / cg"
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1442
!
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1443
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1444
timezoneInfo
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1445
    "return a table containing timezone information.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1446
     This may or may not be correct by the time you read this.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1447
     It is recommended to add explicit information in the form of +hh:mm to a printed
16990
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1448
     representation, instead of using names.
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1449
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1450
     As this is searched for when reverse converting from utcOffset to TZName,
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1451
     and we do not want to care for summer time, make sure that all summer times are at
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1452
     the end so they match last."
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1453
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1454
    ^ #(
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1455
            'Z'     0                 "/ zulu
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1456
            'UTC'   0
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1457
            'GMT'   0
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1458
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1459
            "/ US
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1460
            'HAST' -10                 "/ hawai standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1461
            'AKST'  -9                 "/ alaska standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1462
            'YST'   -9                 "/ yukon standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1463
            'PST'   -8                 "/ pacific standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1464
            'PT'    -8                 "/ pacific standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1465
            'MST'   -7                 "/ mountain standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1466
            'CST'   -6                 "/ central standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1467
            'EST'   -5                 "/ eastern standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1468
            'AST'   -4                 "/ atlantic standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1469
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1470
            'NST'   -3.5               "/ new foundland standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1471
            'PMST'  -3                 "/ pierre & miquelon
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1472
            'WGT'   -3                 "/ west greenland
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1473
            'EGT'   -1                 "/ east greenland
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1474
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1475
            "/ europe
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1476
            'CET'   1                  "/ central european
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1477
            'EET'   2                  "/ east european
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1478
            'WET'   0                  "/ west european
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1479
            "/ conflict with india!!
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1480
            "/ 'IST'   1               "/ irish standard time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1481
            "/ 'IST'   1               "/ israel standard time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1482
            'AZOT'   -1                "/ azores standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1483
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1484
            'MSK'   4                  "/ moscow european
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1485
            'MSD'   4
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1486
            'BT'    4                  "/ baghdad
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1487
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1488
            "/ pacific
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1489
            'NZST' 12                 "/ new zealand standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1490
            'FJT' 12                  "/ fiji
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1491
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1492
            "/ south america
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1493
            'ART'   -3                 "/ argentina
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1494
            'BOT'   -4                 "/ bolivia
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1495
            'BRT'   -3                 "/ brasilia
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1496
            'CLT'   -4                 "/ chile
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1497
            'ECT'   -5                 "/ equador
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1498
            'PET'   -5                 "/ peru
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1499
            'PYT'   -4                 "/ paraguay
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1500
            'UYT'   -3                 "/ uruguay
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1501
            'VET'   -4.5               "/ venezuela standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1502
            'VST'   -4.5               "/ venezuela standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1503
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1504
            "/ africa
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1505
            'CAT'   2                 "/ central africa
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1506
            'EAT'   3                 "/ east africa
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1507
            'SAST'  2                 "/ south africa standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1508
            'WAT'   1                 "/ west africa
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1509
            'WT'    0                 "/ west sahara standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1510
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1511
            'AST'   3                 "/ arabia
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1512
            'IRT'   3.5               "/ iran time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1513
            'AFT'   4.5               "/ afghanistan time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1514
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1515
            'HKT'   8                 "/ hongkong
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1516
            'IST'   5.5               "/ india standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1517
            'ICT'   7                 "/ indochina
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1518
            'CNST'  8                 "/ china standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1519
            'JST'   9                 "/ japan standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1520
            'KST'   9                 "/ korea standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1521
            'SGT'   8                 "/ singapore
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1522
            'MYT'   8                 "/ malaysia
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1523
            'AWST'  8                 "/ australian west standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1524
            'ACWST' 8.75              "/ australian central western standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1525
            'ACST'  9.5               "/ australian central standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1526
            'AEST'  10                "/ australian east standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1527
            'NFT'   11.5              "/ norfolk island, australia
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1528
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1529
            'CHAST' 12.75             "/ chatham island standard
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1530
            'WST'   13                "/ west samoa - yes thats 13!!
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1531
            'TOT'   13                "/ tonga - yes thats 13!!
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1532
            'TKT'   13                "/ tokelau - yes thats 13!!
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1533
            'LINT'  14               "/ line islands - yes thats 14!!
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1534
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1535
            "/ misc
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1536
            'IDLW' -12               "/ international date line west
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1537
            'IDLE'  12                "/ international date line east
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1538
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1539
            "/ military
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1540
            'A'     1                 "/ alpha
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1541
            'B'     2                 "/ bravo
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1542
            'C'     3                 "/ charlie
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1543
            'D'     4                 "/ delta
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1544
            'E'     5                 "/ echo
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1545
            'F'     6                 "/ foxtrot
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1546
            'G'     7                 "/ golf
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1547
            'H'     8                 "/ hotel
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1548
            'I'     9                 "/ also called india - how misleading
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1549
            'K'     10                "/ kilo
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1550
            'L'     11                "/ lima - but not there
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1551
            'M'     12                "/ mike
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1552
            'N'     -1                "/ november (but also in other months)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1553
            'O'     -2                "/ oscar
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1554
            'P'     -3                "/ papa (not mama)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1555
            'Q'     -4                "/ quebec - really?
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1556
            'R'     -5                "/ romeo and juliet
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1557
            'S'     -6                "/ sierra
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1558
            'T'     -7                "/ tango (&rumba)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1559
            'U'     -8                "/ uniform
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1560
            'V'     -9                "/ victor
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1561
            'W'     -10               "/ whiskey (scotch?)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1562
            'X'     -11               "/ xray
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1563
            'Y'     -12               "/ yankee
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1564
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1565
            'MEZ'   1                 "/ central european (german)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1566
            'MESZ'  2                 "/ central european summer (german)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1567
            'WESZ'  1                 "/ west european summer (german)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1568
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1569
            'WEZ'   0                 "/ west european (german)
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1570
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1571
            'HADT'  -9                "/ hawaii summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1572
            'ADT'   -3
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1573
            'AKDT'  -9                "/ alaska summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1574
            'YDT'   -8                "/ yukon summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1575
            'PDT'   -7                "/ pacific daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1576
            'MDT'   -6                "/ mountain daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1577
            'CDT'   -5                "/ central daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1578
            'EDT'   -4                "/ eastern daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1579
            'CLST'  -3                "/ chile summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1580
            'NDT'   -2.5
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1581
            'PMDT'  -2
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1582
            'BRST'  -2                "/ brasilia summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1583
            'WGST'  -2                "/ west greenland summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1584
            'EGST'   0                "/ east greenland summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1585
            'AZOST'  0                "/ azores summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1586
            'EEST'   3
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1587
            'CEST'   2
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1588
            'WAST'   2                "/ west africa summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1589
            "/ 'WST'   1                 "/ west sahara summer - conflict with west samoa
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1590
            'WEST'  1
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1591
            'BST'   1                 "/ british summer time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1592
            'IRST'  4.5               "/ iran summer time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1593
            'AWDT'  9                 "/ australian west daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1594
            'ACDT'  10.5              "/ australian central daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1595
            'AEDT'  11                "/ australian east daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1596
            'CHADT' 13.75             "/ chatham island daylight saving
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1597
            'FJST'  13                "/ fiji summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1598
            'NZDT'  13                "/ new zealand summer
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1599
        ).
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1600
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1601
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1602
utcOffsetFrom:aStringOrStream
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1603
    "return the utcOffset (in seconds) for a given time-zone name.
17172
86f49d251345 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17142
diff changeset
  1604
     Returns nil for invalid formats, 0 if no timezone offset is present.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1605
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1606
     Notice: this returns the negated value of what is read from a printed representation,
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1607
     which means that the sign is the same as what the utcOffset instance variable
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1608
     in timeStamp and OperatingSystem-timeInfo will be.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1609
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1610
     If utcOffset is negative, the local timezone is east of Greenwich.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1611
     If utcOffset is positive, the local timezone is west of Greenwich.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1612
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1613
     UtcOffset is what you have to ADD to correct the printed time to GMT.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1614
     I.e. for Germany, you'll get -3600 (+01h), for NewYork, you'll get +18000 (-05h)"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1615
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1616
    |ch offset stream|
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1617
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1618
    stream := aStringOrStream readStream.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1619
    stream skipSeparators.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1620
17079
76e263370574 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17071
diff changeset
  1621
    ch := stream peekOrNil.
76e263370574 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17071
diff changeset
  1622
    ch isNil ifTrue:[^ 0].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1623
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1624
    ch isLetter ifTrue:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1625
        |table tzName i|
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1626
        table := self timezoneInfo.
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1627
        tzName := stream upToElementForWhich:[:ch | ch isLetter not].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1628
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1629
        i := table indexOf:tzName.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1630
        i == 0 ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1631
            ^ nil
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1632
        ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1633
        offset := (table at:i+1) * 60 * 60
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1634
    ] ifFalse:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1635
        |sign|
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1636
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1637
        sign := 1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1638
        ch == $- ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1639
            sign := -1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1640
            stream next.
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1641
        ] ifFalse:[ch == $+ ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1642
            stream next.
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1643
        ] ifFalse:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1644
            stream skipSeparators
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1645
        ]].
17172
86f49d251345 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17142
diff changeset
  1646
        stream peekOrNil isDigit ifFalse:[^ nil].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1647
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1648
        offset := ((stream next:2) asNumber * 60 * 60).
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1649
        ch := stream peekOrNil.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1650
        ch notNil ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1651
            ch == $: ifTrue:[ stream next ].
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1652
            offset := offset + ((stream next:2) asNumber * 60).
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1653
        ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1654
        offset := offset * sign
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1655
    ].
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1656
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  1657
    "/ return what would be an utcOffset (not what is at the end of an iso string)
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  1658
    ^ offset negated
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1659
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1660
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1661
     self utcOffsetFrom:'UTC'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1662
     self utcOffsetFrom:'PST'
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1663
     self utcOffsetFrom:'EST'
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1664
     self utcOffsetFrom:'CET'
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1665
     self utcOffsetFrom:'+0130'
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1666
     self utcOffsetFrom:'+01:30'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1667
     self utcOffsetFrom:'+1:30'
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1668
     self utcOffsetFrom:'+01'
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1669
    "
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1670
!
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1671
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1672
utcOffsetFromString:aString
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1673
    <resource: #obsolete>
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1674
    "return the utcOffset (in seconds) for a given time-zone name.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1675
     Returns nil for invalid formats"
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1676
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1677
    ^ self utcOffsetFrom:aString
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1678
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1679
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1680
     self utcOffsetFromString:'UTC'
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1681
     self utcOffsetFromString:'+01'
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1682
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1683
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1684
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1685
!Timestamp methodsFor:'accessing'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1686
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1687
day
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1688
    "return the day-in-month of the receiver (1..31).
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1689
     For compatibility, use instances of Date for this."
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1690
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1691
    ^ self asDate day.
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  1692
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1693
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1694
     Timestamp now day
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1695
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1696
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1697
    "Modified: 1.7.1996 / 15:23:02 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1698
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1699
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1700
dayInWeek
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1701
    "return the week-day of the receiver - 1 for monday, 7 for sunday.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1702
     for pre-gregorian dates, it simply goes on assuming the current leapYear rules
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1703
     WARNING: different from ANSIs dayOfWeek (which returns 1 for sunday, ... 7 for saturday)."
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1704
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1705
    ^ self asDate dayInWeek
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1706
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1707
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1708
     Timestamp now dayInWeek
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1709
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1710
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1711
    "Modified: 2.7.1996 / 09:20:32 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1712
    "Created: 2.7.1996 / 09:35:48 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1713
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1714
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1715
dayInYear
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1716
    "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
  1717
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1718
    ^ self asDate dayInYear
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1719
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1720
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1721
     Timestamp now dayInYear
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1722
     (Timestamp newDay:184 year:1996) dayInYear
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1723
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1724
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1725
    "Modified: 2.7.1996 / 10:21:02 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1726
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1727
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1728
dayOfMonth
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1729
    "Answer the day of the month represented by me.
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1730
     Same as day; for ST-80 compatibility."
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1731
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1732
    ^ self asDate dayOfMonth
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1733
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1734
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1735
     Timestamp now dayOfMonth
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1736
     (Timestamp newDay:184 year:1996) dayOfMonth
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1737
    "
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1738
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1739
    "Created: / 20-01-2011 / 12:26:54 / cg"
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1740
!
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1741
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1742
dayOfWeek
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1743
    "return the week-day of the receiver - 1 is sunday, 7 for saturday.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1744
     WARNING: different from dayInWeek (which returns 1 for monday, ... 7 for sunday).
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1745
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1746
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1747
    ^ self asDate dayOfWeek
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1748
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1749
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1750
     Timestamp now dayOfWeek
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1751
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1752
!
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1753
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1754
dayOfWeekName
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1755
    "return the week-day of the receiver as a string.
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1756
     The returned string depends on the language setting.
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1757
     Expect things like 'monday', 'tuesday' ..."
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1758
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1759
    ^ self asDate dayOfWeekName
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1760
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1761
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1762
     Timestamp now dayOfWeekName
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1763
     (Timestamp newDay:184 year:1996) dayOfWeekName
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1764
    "
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1765
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1766
    "Created: / 20-01-2011 / 12:28:46 / cg"
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1767
!
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1768
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1769
hour
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1770
    "return the hour (0..23).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1771
     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
  1772
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1773
    ^ self hours
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1774
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1775
    "Created: 1.7.1996 / 15:14:50 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1776
    "Modified: 1.7.1996 / 15:15:32 / cg"
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1777
!
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1778
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1779
hours
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1780
    "return the hours (0..23)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1781
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1782
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1783
	^ self asTime hours.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1784
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1785
    ^ self timeInfo hours
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  1786
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1787
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1788
     Timestamp now hours
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1789
    "
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1790
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1791
    "Modified: 2.7.1996 / 09:20:32 / cg"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1792
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1793
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1794
millisecond
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1795
    "return the millisecond (0..999).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1796
     ST-80 Timestamp compatibility (I'd prefer the name #milliseconds)."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1797
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1798
    ^ self milliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1799
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1800
    "Created: 1.7.1996 / 15:14:50 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1801
    "Modified: 1.7.1996 / 15:15:24 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1802
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1803
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1804
milliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1805
    "return the milliseconds (0..999)"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1806
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1807
    ^ osTime \\ 1000.
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1808
"/    ^ self timeInfo milliseconds
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1809
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1810
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1811
     Timestamp now milliseconds
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1812
    "
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1813
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1814
    "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
  1815
    "Modified: 2.7.1996 / 09:21:41 / cg"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1816
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1817
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1818
minute
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1819
    "return the minute (0..59).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1820
     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
  1821
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1822
    ^ self minutes
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1823
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1824
    "Created: 1.7.1996 / 15:14:29 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1825
    "Modified: 1.7.1996 / 15:15:37 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1826
!
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1827
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1828
minutes
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1829
    "return the minutes (0..59)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1830
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1831
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1832
	^ self asTime minutes.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1833
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1834
    ^ self timeInfo minutes
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1835
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1836
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1837
     Timestamp now minutes
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1838
    "
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1839
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1840
    "Modified: 2.7.1996 / 09:20:49 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1841
!
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1842
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1843
month
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1844
    "return the month of the receiver (1..12).
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1845
     For compatibility, use instances of Date for this."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1846
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1847
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1848
	^ self asDate month.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1849
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1850
    ^ self timeInfo month
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1851
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1852
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1853
     Timestamp now month
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1854
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1855
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1856
    "Modified: 1.7.1996 / 15:23:05 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1857
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1858
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1859
monthIndex
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1860
    "return the month of the receiver (1..12).
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1861
     For compatibility"
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1862
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1863
    ^ self asDate monthIndex.
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1864
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1865
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1866
     Timestamp now monthIndex
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1867
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1868
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1869
8286
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1870
osTime
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1871
    "get the internal representation of the time.
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1872
     Warning: do not depend on the value (unix vs. win32 - differences)"
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1873
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1874
    ^ osTime
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1875
!
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1876
4807
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1877
osTime:aTime
5726
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  1878
    "set the internal representation of the time"
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  1879
4807
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1880
    osTime := aTime.
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1881
!
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1882
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1883
second
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1884
    "return the second (0..59).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1885
     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
  1886
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1887
    ^ self seconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1888
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1889
    "Created: 1.7.1996 / 15:14:19 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1890
    "Modified: 1.7.1996 / 15:15:49 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1891
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1892
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1893
seconds
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1894
    "return the seconds (0..59)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1895
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1896
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1897
	^ self asTime seconds.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1898
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1899
    ^ self timeInfo seconds
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1900
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1901
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1902
     Timestamp now seconds
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1903
    "
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1904
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1905
    "Modified: 2.7.1996 / 09:20:54 / cg"
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1906
!
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1907
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1908
timeZoneDeltaInMinutes
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1909
    "answer the number of minutes between local time and utc time.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1910
     Delta is positive if local time is ahead of utc, negative if behind utc."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1911
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1912
    ^ self utcOffset negated // 60
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1913
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1914
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1915
     Timestamp now timeZoneDeltaInMinutes
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1916
     (Timestamp day:1 month:7 year:1995 hour:12 minutes:0 seconds:0) timeZoneDeltaInMinutes
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1917
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1918
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1919
    "Modified: 20.12.1995 / 17:28:49 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1920
    "Modified: 1.7.1996 / 15:21:29 / cg"
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1921
!
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1922
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1923
timeZoneName
16990
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1924
    "find the first zone which is in this range.
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1925
     This is a bit naive, but should be sufficient in most cases
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1926
     (for a correct result, we'd have to care for start-end dates of summer time
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1927
      of that particular year...)"
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1928
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1929
    |best myUtcOffset|
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1930
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1931
    myUtcOffset := self utcOffset negated.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1932
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1933
    best := nil.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1934
    self class timezoneInfo pairWiseDo:[:name :offsetInHours |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1935
	|thisUtcOffset|
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1936
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1937
	thisUtcOffset := offsetInHours * 60 * 60.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1938
	thisUtcOffset == myUtcOffset ifTrue:[^ name ].
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1939
    ].
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1940
    ^ ((self utcOffset > 0) ifTrue:['+'] ifFalse:['-'])
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1941
      , ((myUtcOffset abs // 60) printStringLeftPaddedTo:2 with:$0)
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1942
      , ((myUtcOffset abs \\ 60) printStringLeftPaddedTo:2 with:$0)
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1943
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1944
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1945
     Timestamp now timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1946
     UtcTimestamp now timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1947
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1948
     (Timestamp now asTZTimestampInZone:'EST') timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1949
     (Timestamp now asTZTimestampInZone:'IDLE') timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1950
     (Timestamp now asTZTimestampInZone:'BRST') timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1951
     (Timestamp now asTZTimestampInZone:'MYT') timeZoneName
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1952
    "
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1953
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1954
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1955
utcOffset
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1956
    "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
  1957
     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
  1958
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1959
     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
  1960
     Subtract utcOffset to convert from UTC time to local time.
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1961
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1962
     If utcOffset is negative, the local timezone is east of Greenwich.
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  1963
     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
  1964
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  1965
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  1966
	"/ fake an info which the OS cannot give me
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  1967
	"/ we do not know about DST in the far future and in the long gone past.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  1968
	"/ Take the utcOffset without DST
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  1969
	^ self utcOffsetWithoutDst.
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  1970
    ].
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  1971
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  1972
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) utcOffset
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1973
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1974
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1975
     Timestamp now utcOffset
17031
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1976
     (Timestamp year:1995 month:7 day:1 hour:12 minute:0 second:0) utcOffset
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1977
     (Timestamp year:1995 month:1 day:1 hour:12 minute:0 second:0) utcOffset
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1978
     (Timestamp year:1689 month:7 day:1 hour:12 minute:0 second:0) utcOffset
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1979
     (Timestamp year:4096 month:7 day:1 hour:12 minute:0 second:0) utcOffset
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1980
    "
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1981
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1982
    "Modified: 20.12.1995 / 17:28:49 / stefan"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1983
    "Modified: 1.7.1996 / 15:21:29 / cg"
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1984
!
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  1985
17031
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1986
utcOffsetWithoutDst
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1987
    "return the difference between UTC (Greenwich Mean Time) and the local time in seconds.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1988
     If daylight saving time applies to ourself, do not take that into account.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1989
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1990
     Add utcOffset to convert from local time to UTC time.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1991
     Subtract utcOffset to convert from UTC time to local time.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1992
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1993
     If utcOffset is negative, the local timezone is east of Greenwich.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1994
     If utcOffset is positive, the local timezone is west of Greenwich."
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1995
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1996
    |offset epochInfo|
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1997
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1998
    offset := 0.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  1999
    [
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2000
	"DST may be in winter in the southern hemisphere. If we are in DST, add some days"
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2001
	epochInfo := OperatingSystem timeInfoFromSeconds:offset milliseconds:0 localTime:true.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2002
	offset := offset + (3600 * 24 * 90). "Add about 3 months"
17031
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2003
    ] doWhile:[epochInfo dst and:[offset < (3600 * 24 * 365) "avoid endless loop"]].
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2004
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2005
    ^ epochInfo utcOffset
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2006
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2007
    "
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2008
     Timestamp now utcOffsetWithoutDst
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2009
    "
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2010
!
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2011
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2012
weekInYear
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2013
    "return the week number of the receiver - 1 for Jan, 1st."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2014
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2015
    ^ Date weekInYearOf:self
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2016
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2017
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2018
     (Timestamp newDay:1 year:2000) weekInYear
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2019
     (Timestamp newDay:2 year:2000) weekInYear
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2020
     (Timestamp newDay:3 year:2000) weekInYear
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2021
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2022
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2023
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2024
weekday
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2025
    "return the week-day of the receiver as a string.
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2026
     The returned string depends on the current language setting.
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2027
     Expect things like 'monday', 'tuesday' ...
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2028
     For ST-80 compatibility"
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2029
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2030
    ^ self asDate weekday
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2031
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2032
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2033
     Timestamp now weekday
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2034
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2035
     but maybe a different day there, in the south pacific:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2036
     (Timestamp now asTZTimestampInZone:'LINT') weekday
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2037
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2038
     but maybe a different day there, in alaska:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2039
     (Timestamp now asTZTimestampInZone:'AKST') weekday
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2040
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2041
!
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2042
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2043
year
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2044
    "return the year of the receiver i.e. 1992.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2045
     For compatibility, use instances of Date for this."
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2046
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2047
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2048
	^ self asDate year.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2049
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2050
    ^ self timeInfo year
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2051
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2052
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2053
     Timestamp now year
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2054
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2055
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2056
    "Modified: 1.7.1996 / 15:23:08 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2057
! !
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2058
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2059
!Timestamp methodsFor:'arithmetic'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2060
13199
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2061
ceilingSecond
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2062
    "return a timestamp which represents the next full second"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2063
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2064
    |offs|
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2065
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2066
    offs := (self milliseconds / 1000) ceiling.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2067
    ^ self class basicNew setSeconds:(self getSeconds + offs).
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2068
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2069
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2070
     |t1 t2|
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2071
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2072
     t1 := Timestamp now.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2073
     t2 := t1 ceilingSecond.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2074
     self halt
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2075
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2076
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2077
    "Created: / 08-01-2011 / 16:23:03 / cg"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2078
!
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2079
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2080
floorSecond
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2081
    "return a timestamp truncated to the last full second"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2082
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2083
    ^ self class basicNew setSeconds:(self getSeconds).
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2084
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2085
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2086
     |t1 t2|
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2087
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2088
     t1 := Timestamp now.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2089
     t2 := t1 floorSecond.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2090
     self halt
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2091
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2092
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2093
    "Created: / 08-01-2011 / 16:20:55 / cg"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2094
!
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2095
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2096
millisecondDeltaFrom:aTimestamp
3510
75824285fe74 comment
Claus Gittinger <cg@exept.de>
parents: 3479
diff changeset
  2097
    "return the delta in milliseconds between 2 absolute times.
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2098
     The argument is supposed to be BEFORE the receiver,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2099
	computes self - aTimestamp"
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2100
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2101
    ^ self getMilliseconds - (aTimestamp getMilliseconds)
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2102
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2103
    "
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2104
     |t1 t2|
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2105
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2106
     t1 := Timestamp now.
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2107
     Delay waitForSeconds:0.5.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2108
     t2 := Timestamp now.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2109
     t2 millisecondDeltaFrom:t1
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2110
    "
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2111
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2112
    "Modified: / 10-07-2010 / 09:37:18 / cg"
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2113
!
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2114
13200
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2115
roundedToSecond
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2116
    "return a timestamp which represents the time rounded to the nearest full second"
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2117
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2118
    |offs|
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2119
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2120
    offs := (self milliseconds / 1000) rounded.
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2121
    ^ self class basicNew setSeconds:(self getSeconds + offs).
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2122
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2123
    "
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2124
     |t1 t2|
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2125
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2126
     t1 := Timestamp now.
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2127
     t2 := t1 roundedToSecond.
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2128
     self halt
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2129
    "
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2130
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2131
    "Created: / 08-01-2011 / 16:24:12 / cg"
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2132
!
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2133
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2134
secondDeltaFrom:aTimestamp
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2135
    "return the delta in seconds between 2 absolute times.
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2136
     The argument is supposed to be BEFORE the receiver,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2137
	computes self - aTimestamp"
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2138
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2139
    ^ self getSeconds - (aTimestamp getSeconds)
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2140
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2141
    "
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2142
     |t1 t2|
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2143
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2144
     t1 := Timestamp now.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2145
     Delay waitForSeconds:5.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2146
     t2 := Timestamp now.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2147
     t2 secondDeltaFrom:t1
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2148
    "
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2149
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2150
    "Modified: / 10-07-2010 / 09:37:24 / cg"
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2151
! !
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2152
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2153
!Timestamp methodsFor:'comparing'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2154
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2155
= aTimestamp
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2156
    "return true if the argument, aTime represents the same time.
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2157
     Notice: you can compare timestamps from different timezones for representing the
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2158
     same time, because they all store their milliseconds internally as utc time"
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2159
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2160
    aTimestamp isTimestamp ifFalse:[^ false].
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2161
    ^ (self getMilliseconds = aTimestamp getMilliseconds)
1520
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2162
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2163
    "Modified: 3.7.1996 / 13:10:24 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2164
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2165
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2166
hash
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2167
    "return an integer useful for hashing on times"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2168
1520
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2169
    ^ osTime // 1000
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2170
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2171
    "Modified: 3.7.1996 / 13:10:52 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2172
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2173
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2174
!Timestamp methodsFor:'converting'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2175
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2176
asDate
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2177
    "return a Date object from the receiver.
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2178
     The returned date will only represent the day - not the timeOfDay.
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2179
     Notice: if you convert a local timestamp, you will get the local date;
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2180
     otherwise if you convert an utcTimestamp, you'll get the utc date."
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2181
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2182
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2183
	|milliDelta dayDelta|
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2184
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2185
	"/ we do not know about DST in the far future and in the long gone past.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2186
	"/ Take the utcOffset without DST
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2187
	milliDelta := osTime - (1000 * self utcOffsetWithoutDst).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2188
	dayDelta := milliDelta // (24 * 3600 * 1000).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2189
	^ Epoch asDate addDays:dayDelta.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2190
    ].
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2191
    ^ self timeInfo asDate
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2192
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2193
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2194
     Timestamp now
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2195
     Timestamp now asDate
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2196
     (Timestamp now addTime:3600) asDate
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2197
     (Timestamp now addTime:3600) asTime
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2198
     Timestamp fromSeconds:(Timestamp now asSeconds + 3600)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2199
     (Timestamp fromSeconds:(Timestamp now asSeconds + 3600)) asDate
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2200
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2201
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2202
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2203
asLocalTimestamp
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2204
    "represent myself as a timestamp in the local timezone"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2205
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2206
    ^ self
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2207
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2208
    "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2209
     Timestamp now asUtcTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2210
     Timestamp now asUtcTimestamp asLocalTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2211
    "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2212
!
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2213
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2214
asTZTimestamp
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2215
    "return a timestamp which represents the very same time,
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2216
     but will represent itself as a timestamp with the local utcOffset.
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2217
     Use this to make sure that a local timestamp can be read back in another timezone"
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2218
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2219
    ^ self asTZTimestamp:self utcOffset
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2220
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2221
    "see the different printStrings of:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2222
	 Timestamp now
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2223
     and
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2224
	 Timestamp now asTZTimestamp
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2225
    "
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2226
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2227
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2228
asTZTimestamp:utcOffset
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2229
    "return a timestamp which represents the very same time,
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2230
     but will represent itself as a timestamp with the given utcOffset"
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2231
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2232
    ^ (TZTimestamp fromOSTime:osTime) utcOffset:utcOffset
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2233
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2234
    "what is the time now in NewYork?
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2235
     Timestamp now asTZTimestamp:(Timestamp utcOffsetFrom:'EST')
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2236
     Timestamp now asTZTimestampInZone:'EST'
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2237
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2238
     what is the time now in Stuttgart?
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2239
     Timestamp now asTZTimestamp:(Timestamp utcOffsetFrom:'MEZ')
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2240
     Timestamp now asTZTimestampInZone:'MEZ'
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2241
    "
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2242
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2243
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2244
asTZTimestampInZone:timeZoneName
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2245
    "return a timestamp which represents the very same time,
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2246
     but will represent itself as a timestamp in the given timezone.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2247
     timeZoneName must be one of the standard names as listed in Timestamp >> timezoneInfo"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2248
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2249
    |utcOffset|
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2250
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2251
    utcOffset := self class utcOffsetFrom:timeZoneName.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2252
    utcOffset isNil ifTrue:[
17132
01e2272e7912 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17131
diff changeset
  2253
        ^ TimeConversionError raiseRequestWith:self errorString:(' - Invalid/unknown timzone: %1' bindWith:timeZoneName)
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2254
    ].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2255
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2256
    ^ self asTZTimestamp:utcOffset
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2257
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2258
    "what is the time now in NewYork?
17133
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2259
       Timestamp now asTZTimestampInZone:'EST'
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2260
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2261
     what is the time now in Stuttgart?
17133
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2262
       Timestamp now asTZTimestampInZone:'MEZ'
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2263
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2264
     an error os raised for any unknown/invalid timezone:
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2265
       Timestamp now asTZTimestampInZone:'BlaBla'
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2266
    "
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2267
!
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2268
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2269
asTime
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2270
    "return a Time object from the receiver.
16936
cf59a3abe590 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16935
diff changeset
  2271
     The returned time will only represent the timeOfDay - not the day,
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2272
     and does not include the milliseconds."
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2273
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2274
    |secondDelta|
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2275
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2276
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2277
	secondDelta := osTime // 1000.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2278
	"/ we do not know about DST in the far future and in the long gone past.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2279
	"/ Take the utcOffset without DST
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2280
	secondDelta := (secondDelta - self utcOffsetWithoutDst) \\ (24*3600).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2281
	^ Epoch asTime addSeconds:secondDelta.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2282
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2283
    ^ self timeInfo asTime
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2284
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2285
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2286
     Timestamp now
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2287
     Timestamp now asTime
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2288
     UtcTimestamp now asTime
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2289
     (Timestamp now addTime:3600) asTime
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2290
     (Timestamp year:2014 month:7 day:1 hour:12 minute:0 second:0) asTime
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2291
     (UtcTimestamp year:2014 month:7 day:1 hour:12 minute:0 second:0) asTime
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2292
    "
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2293
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2294
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2295
asTimeWithMilliseconds
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2296
    "return a Time object from the receiver.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2297
     The returned time will only represent the timeOfDay - not the day,
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2298
     it will include the milliseconds."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2299
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2300
    |milliSecondDelta|
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2301
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2302
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2303
	milliSecondDelta := osTime - (self utcOffset * 1000).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2304
	^ self class epoch asTime addMilliseconds:milliSecondDelta.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2305
    ].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2306
    ^ self timeInfo asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2307
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2308
    "
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2309
     Timestamp now
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2310
     Timestamp now asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2311
     UtcTimestamp now asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2312
     (Timestamp now addTime:3600) asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2313
     (Timestamp year:2014 month:7 day:1 hour:12 minute:0 second:0) asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2314
     (UtcTimestamp year:2014 month:7 day:1 hour:12 minute:0 second:0) asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2315
    "
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2316
!
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2317
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2318
asTimestamp
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2319
    "return an Timestamp object from the receiver - that's the receiver."
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2320
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2321
    ^ self
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2322
!
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2323
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2324
asUTC
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2325
    ^ self asUtcTimestamp
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2326
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2327
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2328
     Timestamp now
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2329
     Timestamp now asUTC
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2330
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2331
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2332
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2333
asUtcTimestamp
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2334
    "return a timestamp which represents the very same timestamp,
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2335
     but will represent itself as a timestamp in the UTC timezone"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2336
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2337
    ^ UtcTimestamp fromOSTime:osTime
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2338
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2339
    "
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2340
     Timestamp now asUtcTimestamp
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2341
     Timestamp now asUtcTimestamp asLocalTimestamp
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2342
    "
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2343
!
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2344
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2345
literalArrayEncoding
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2346
    "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
  2347
     can be reconstructed with #decodeAsLiteralArray.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2348
     The encoding is:
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2349
        (#Timestamp YYYYMMDDhhmmss.iiiZ)
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2350
    "
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2351
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2352
    |s|
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2353
8223
56da5d8f8bc1 replaced '' writeStream by String writeStream
Claus Gittinger <cg@exept.de>
parents: 8111
diff changeset
  2354
    s := WriteStream on:(String new:18).
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2355
    self printGeneralizedOn:s isLocal:false.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2356
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2357
    ^ Array
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2358
        with:self class name
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2359
        with:s contents
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2360
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2361
    "
9416
f57d66ea3bae Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9402
diff changeset
  2362
      Timestamp now literalArrayEncoding
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2363
        decodeAsLiteralArray
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2364
      UtcTimestamp now literalArrayEncoding
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2365
        decodeAsLiteralArray
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2366
    "
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2367
!
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2368
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2369
utcOffset:anOffset
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2370
   "answer a DateTime equivalent to the receiver but offset from UTC by offset"
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2371
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2372
    ^ TZTimestamp new 
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2373
        osTime:osTime;
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2374
        utcOffset:(anOffset asTimeDuration)  
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2375
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2376
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2377
     Timestamp now  -- now as local time
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2378
     Timestamp now asTZTimestamp -- now in your local timezone
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2379
     Timestamp now asUtcTimestamp -- now in greenwich
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2380
     UtcTimestamp now -- now in greenwich
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2381
     Timestamp now utcOffset:(-2 hours)2015-11-09 17:29:35.803+02 -- now in East Europe
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2382
     Timestamp now utcOffset:(5 hours) -- now in Eastern time
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2383
     Timestamp now asTZTimestampInZone:'EST' -- now in Eastern time
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2384
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2385
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2386
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2387
utcSecondsSince1901
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2388
    "return the number of seconds elapsed since Jan, 1st 1901"
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2389
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2390
"
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2391
    secondsBetween1901and1970 :=
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2392
	((Date day:1 month:1 year:1970) subtractDate:(Date day:1 month:1 year:1901))
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2393
	*  (24 * 60 * 60)
9430
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  2394
"
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2395
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2396
    ^ self utcSecondsSince1970 + 2177452800.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2397
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2398
    "
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2399
     Timestamp now utcSecondsSince1901
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2400
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2401
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2402
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2403
!Timestamp methodsFor:'initialization'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2404
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2405
UTCyear:y month:m day:d hour:h minute:min second:s millisecond:millis
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2406
    "private: ask the operating system to compute the internal osTime (based on the epoch),
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2407
     given y,m,d and h,m,s in my time."
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2408
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2409
    self setOSTimeFromUTCYear:y month:m day:d hour:h minute:min second:s millisecond:millis
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2410
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2411
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2412
setOSTimeFromUTCYear:y month:m day:d hour:h minute:min second:s millisecond:millis
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2413
    "private: ask the operating system to compute the internal osTime (based on the epoch),
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2414
     given y,m,d and h,m,s in local time"
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2415
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2416
    Error handle:[:ex |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2417
	"handler for timestamps before the epoch or after the OS representable time (2038 on current Unices).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2418
	 Then, an out-of-os-range osTime is generated here manually."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2419
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2420
	|deltaDays|
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2421
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2422
	deltaDays := self class epoch asDate subtractDate:(Date newDay:d month:m year:y).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2423
	"/ deltadays will be negative for dates before the epoch and positive if after.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2424
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2425
	osTime := (h * 3600) + (min * 60) + s.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2426
	osTime := osTime - (deltaDays * 24 * 3600).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2427
	osTime := osTime * 1000.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2428
	osTime := osTime + millis.
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2429
    ] do:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2430
	osTime := OperatingSystem
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2431
		computeOSTimeFromUTCYear:y month:m day:d
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2432
		hour:h minute:min second:s
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2433
		millisecond:millis
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2434
    ]
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2435
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2436
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2437
setOSTimeFromYear:y month:m day:d hour:h minute:min second:s millisecond:millis
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2438
    "private: ask the operating system to compute the internal osTime (based on the epoch),
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2439
     given y,m,d and h,m,s in local time. If the OS cannot do it, do it here."
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2440
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2441
    TimeConversionError handle:[:ex |
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2442
	"handler for timestamps before the epoch or after the OS representable time (2038 on current Unices).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2443
	 Then, an out-of-os-range osTime is generated here manually."
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2444
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2445
	|deltaDays|
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2446
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2447
	deltaDays := self class epoch asDate subtractDate:(Date newDay:d month:m year:y).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2448
	"/ deltadays will be negative for dates before the epoch and positive if after.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2449
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2450
	osTime := (h * 3600) + (min * 60) + s.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2451
	osTime := osTime + self utcOffset.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2452
	osTime := osTime - (deltaDays * 24 * 3600).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2453
	osTime := osTime * 1000.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2454
	osTime := osTime + millis.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2455
    ] do:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2456
	osTime := OperatingSystem
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2457
		computeOSTimeFromYear:y month:m day:d
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2458
		hour:h minute:min second:s
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2459
		millisecond:millis
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2460
    ]
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2461
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2462
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2463
year:y month:m day:d hour:h minute:min second:s millisecond:millis
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2464
    "private: ask the operating system to compute the internal osTime (based on the epoch),
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2465
     given y,m,d and h,m,s in my time."
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2466
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2467
    self setOSTimeFromYear:y month:m day:d hour:h minute:min second:s millisecond:millis
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2468
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2469
13541
91828a57f378 added: #differenceFromTimestamp:
Claus Gittinger <cg@exept.de>
parents: 13236
diff changeset
  2470
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2471
!Timestamp methodsFor:'printing & storing'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2472
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  2473
addPrintBindingsTo:dict language:languageOrNil
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  2474
    "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
  2475
     languageOrNil can only be #en or nil for the current language."
5726
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  2476
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2477
    |date|
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2478
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2479
    date := self asDate.
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2480
    date addPrintBindingsTo:dict language:languageOrNil.
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2481
    super addPrintBindingsTo:dict language:languageOrNil.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2482
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2483
    date year == Date today year ifTrue:[
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2484
        dict at:#yearOrTime put:('%h:%m' expandPlaceholdersWith:dict).
6795
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  2485
    ].
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  2486
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2487
    "
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2488
     |d|
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2489
     d := Dictionary new.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2490
     Timestamp now addPrintBindingsTo:d language:nil.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2491
     d inspect.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2492
    "
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2493
    
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2494
    "used by:
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2495
        Timestamp now printStringFormat:'%y-%m-%d'
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2496
        Timestamp now printStringFormat:'%(dayOfYear)'
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2497
    "
4843
3a4484b834dd better printing
Claus Gittinger <cg@exept.de>
parents: 4839
diff changeset
  2498
!
3a4484b834dd better printing
Claus Gittinger <cg@exept.de>
parents: 4839
diff changeset
  2499
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2500
printGeneralizedOn:aStream
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2501
    "append a representation of the receiver to aStream in a general format,
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2502
     top-down, without separators: 'yyyymmddHHMMSS.mmmZ'
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2503
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2504
     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
  2505
     so read this before changing the output format."
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2506
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2507
    ^ self printGeneralizedOn:aStream isLocal:false short:false.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2508
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2509
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2510
printGeneralizedOn:aStream isLocal:isLocal
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2511
    "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
  2512
     top-down, without separators: 'yyyymmddHHMMSS.mmm+0100'
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2513
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2514
     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
  2515
     so read this before changing the output format.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2516
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2517
     If isLocal is true, represent as local time (Local 'yyyymmddHHMMSS.mmm+0100'), 
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2518
     otherwise as UTC time (UTC 'yyyymmddHHMMSS.mmmZ')."
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2519
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2520
    self printGeneralizedOn:aStream isLocal:isLocal short:false
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2521
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2522
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2523
    "Modified: / 1.7.1996 / 15:20:59 / cg"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2524
    "Modified: / 17.1.2000 / 15:53:02 / stefan"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2525
!
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2526
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2527
printGeneralizedOn:aStream isLocal:isLocal short:shortFormat
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2528
    "append a representation of the receiver to aStream in a general format,
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2529
     top-down, without separators;
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2530
        long format:  'yyyymmddHHMMSS.mmm+0100'
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2531
        short format: 'yymmddHHMMSS.mmm+0100'
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2532
     Using the short format is strictly discouraged!!
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2533
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2534
     This format is used for the ASN.1 GeneralizedTime and UTCTime
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2535
     as defined in X.208 Sec. 33, so read this before changing the output format.
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2536
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2537
     If isLocal is true, represent as local time (Local 'yyyymmddHHMMSS.mmm+0100'), 
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2538
     otherwise as UTC time (UTC 'yyyymmddHHMMSS.mmmZ')."
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2539
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2540
    |t off|
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2541
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2542
    isLocal ifTrue:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2543
        t := self timeInfo.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2544
        off := t utcOffset.
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2545
    ] ifFalse:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2546
        t := self asUtcTimestamp timeInfo.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2547
        off := 0.
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2548
    ].
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2549
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2550
    shortFormat ifTrue:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2551
        self assert:(t year between:1951 and:2049).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2552
        (t year \\ 100) printOn:aStream leftPaddedTo:2 with:$0.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2553
    ] ifFalse:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2554
        t year    printOn:aStream leftPaddedTo:4 with:$0.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2555
    ].
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  2556
    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
  2557
    t day     printOn:aStream leftPaddedTo:2 with:$0.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2558
    t hours   printOn:aStream leftPaddedTo:2 with:$0.
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  2559
    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
  2560
    t seconds printOn:aStream leftPaddedTo:2 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2561
    aStream nextPut:$..
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  2562
    t milliseconds printOn:aStream leftPaddedTo:3 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2563
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2564
    (self isUtcTimestamp or:[off == 0]) ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2565
        aStream nextPut:$Z.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2566
    ] ifFalse:[ |min|
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2567
        off < 0 ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2568
            aStream nextPut:$+.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2569
            off := off negated.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2570
        ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2571
            aStream nextPut:$-.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2572
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2573
        min := off // 60.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2574
        min // 60 printOn:aStream leftPaddedTo:2 with:$0.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2575
        min \\ 60 printOn:aStream leftPaddedTo:2 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2576
    ].
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2577
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2578
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2579
     Timestamp now printGeneralizedOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2580
     Timestamp now printGeneralizedOn:Transcript isLocal:true. Transcript cr.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2581
     (Timestamp fromSeconds:0) printGeneralizedOn:Transcript. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2582
     Time now printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2583
     Date today printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2584
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2585
     Timestamp now printGeneralizedOn:Transcript isLocal:false short:false. Transcript cr.
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2586
     Timestamp now printGeneralizedOn:Transcript isLocal:true short:false. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2587
     UtcTimestamp now printGeneralizedOn:Transcript isLocal:false short:false. Transcript cr.
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2588
     UtcTimestamp now printGeneralizedOn:Transcript isLocal:true short:false. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2589
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2590
     Date today asTimestamp printGeneralizedOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2591
     Date today printOn:Transcript. Transcript cr.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2592
    "
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2593
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2594
    "Modified: / 1.7.1996 / 15:20:59 / cg"
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2595
    "Modified: / 17.1.2000 / 15:53:02 / stefan"
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2596
!
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2597
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2598
printISO8601
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2599
    <resource: #obsolete>
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2600
    "print as UTC in a format like 2014-10-17T17:08:44Z"
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2601
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2602
    ^ self printStringIso8601
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2603
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2604
    "Created: / 16-06-2005 / 16:11:15 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2605
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2606
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2607
printISO8601Compressed
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2608
    <resource: #obsolete>
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2609
    "return a printString as UTC in a format like 20141017T170939Z"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2610
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2611
    ^ self printStringIso8601Compressed
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2612
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2613
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2614
     Timestamp now printISO8601Compressed
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2615
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2616
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2617
    "Created: / 16-06-2005 / 16:11:31 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2618
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2619
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2620
printISO8601CompressedOn: aStream
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2621
    <resource: #obsolete>
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2622
    "print as UTC in a format like 20141017T170939Z on aStream"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2623
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2624
    self printIso8601CompressedOn: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2625
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2626
    "Created: / 16-06-2005 / 16:11:50 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2627
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2628
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2629
printISO8601On: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2630
    <resource: #obsolete>
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2631
    "print as UTC in a format like 2014-10-17T17:08:44Z on aStream"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2632
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2633
    self printIso8601On: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2634
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2635
    "Created: / 16-06-2005 / 16:11:07 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2636
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2637
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2638
printIso8601CompressedOn: aStream
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2639
    "print as UTC in a format like 20141017T170939Z on aStream"
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2640
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2641
    TimestampISO8601Builder printCompressed: self on: aStream
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2642
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2643
    "Created: / 16-06-2005 / 16:11:50 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2644
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2645
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2646
printIso8601FormatOn:aStream
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2647
    "append the iso8601 representation of the receiver to aStream.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2648
     This format looks like:
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2649
	1999-01-01T24:00:00
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2650
     or, for zero hr:min:sec,
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2651
	1999-01-01
17049
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2652
     Of course, a 24 hour clock is used.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2653
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2654
     Timezone information (eg. Z or +0100) is added, so the reader will read as local time."
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2655
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2656
    self printIso8601FormatOn:aStream timeSeparator:$T
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2657
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2658
    "
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2659
     Timestamp now printIso8601FormatOn:Transcript. Transcript cr.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2660
     Timestamp readIso8601FormatFrom:(Timestamp now printStringIso8601Format).
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2661
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2662
     UtcTimestamp now printIso8601FormatOn:Transcript. Transcript cr.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2663
     UtcTimestamp readIso8601FormatFrom:(UtcTimestamp now printStringIso8601Format).
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2664
    "
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2665
!
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2666
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2667
printIso8601FormatOn:aStream timeSeparator:sepChar
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2668
    "append the iso8601 representation of the receiver to aStream.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2669
     This format looks like:
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2670
	1999-01-01T24:00:00
17049
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2671
     or, for zero hr:min:sec,
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2672
	1999-01-01
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2673
     Of course, a 24 hour clock is used.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2674
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2675
     Timezone information (eg. Z or +0100) is added, so the reader will read as local time."
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2676
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2677
    |asUTC asLocal|
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2678
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2679
    self isUtcTimestamp ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2680
	asUTC := true. asLocal := false.
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2681
    ] ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2682
	self isLocalTimestamp ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2683
	    asUTC := false. asLocal := false.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2684
	] ifFalse:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2685
	    asUTC := false. asLocal := false.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2686
	]
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2687
    ].
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2688
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2689
    Timestamp::TimestampISO8601Builder
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2690
	print:self compact:false
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2691
	asLocal:asLocal asUTC:asUTC withMilliseconds:true
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2692
	timeSeparator:sepChar
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2693
	on:aStream
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2694
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2695
"/
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2696
"/    |format|
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2697
"/
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2698
"/    format := '%(year)-%(month)-%(day)T%h:%m:%s.%i'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2699
"/    self milliseconds = 0 ifTrue:[
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2700
"/        format := '%(year)-%(month)-%(day)T%h:%m:%s'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2701
"/        self seconds = 0 ifTrue:[
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2702
"/            format := '%(year)-%(month)-%(day)T%h:%m'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2703
"/            ((self hours = 0) and:[self minutes = 0]) ifTrue:[
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2704
"/                format := '%(year)-%(month)-%(day)'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2705
"/            ]
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2706
"/        ]
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2707
"/    ].
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2708
"/    self printOn:aStream format:format
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2709
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2710
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2711
     Timestamp now printIso8601FormatOn:Transcript. Transcript cr.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2712
     Timestamp readIso8601FormatFrom:(Timestamp now printStringIso8601Format).
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2713
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2714
     UtcTimestamp now printIso8601FormatOn:Transcript. Transcript cr.
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2715
     UtcTimestamp readIso8601FormatFrom:(UtcTimestamp now printStringIso8601Format).
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2716
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2717
!
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2718
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2719
printIso8601On: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2720
    "print as UTC in a format like 2014-10-17T17:08:44Z on aStream"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2721
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2722
    TimestampISO8601Builder print: self on: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2723
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2724
    "Created: / 16-06-2005 / 16:11:07 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2725
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2726
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2727
printOn:aStream
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2728
    "append a user readable representation of the receiver to aStream.
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2729
     The format is compatible with readFromString:, but not with readFrom:."
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2730
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2731
    |asUTC asLocal|
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2732
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2733
    self isUtcTimestamp ifTrue:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2734
	asUTC := true. asLocal := false.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2735
    ] ifFalse:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2736
	self isLocalTimestamp ifTrue:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2737
	    asUTC := false. asLocal := true.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2738
	] ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2739
	    asUTC := false. asLocal := false.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2740
	]
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2741
    ].
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2742
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2743
    Timestamp::TimestampISO8601Builder
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2744
	print:self compact:false
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2745
	asLocal:asLocal asUTC:asUTC withMilliseconds:true
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2746
	timeSeparator:(Character space)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2747
	on:aStream
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2748
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  2749
"/    self printOn:aStream format:'%(year)-%(mon)-%(day) %h:%m:%s.%i'
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2750
"/    self printOn:aStream format:'%(Day)-%(mon)-%(year) %h:%m:%s.%i'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2751
"/    self printOn:aStream format:'%(mon)/%(Day)/%(year) %h:%m:%s.%i'
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  2752
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  2753
    "
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2754
     |tHere tNewYork|
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2755
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2756
     Timestamp now printOn:Transcript. Transcript cr.
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  2757
     Timestamp now asUtcTimestamp printOn:Transcript. Transcript cr.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2758
     (Timestamp now asTZTimestamp:(Timestamp utcOffsetFrom:'EST')) printOn:Transcript. Transcript cr.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2759
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2760
     tHere := Timestamp now.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2761
     tNewYork := tHere asTZTimestamp:(Timestamp utcOffsetFrom:'EST').
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2762
     tHere printOn:Transcript. Transcript cr.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2763
     tNewYork printOn:Transcript. Transcript cr.
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  2764
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2765
     (Timestamp fromSeconds:0) printOn:Transcript. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2766
     Time now printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2767
     Date today printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2768
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2769
     Time now asTimestamp printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2770
     Timestamp now printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2771
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2772
     Date today asTimestamp printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2773
     Date today printOn:Transcript. Transcript cr.
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  2774
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2775
5719
cf09067dbd1d can do millisecondDelta easier
Claus Gittinger <cg@exept.de>
parents: 5678
diff changeset
  2776
    "Modified: 1.7.1996 / 15:20:59 / cg"
cf09067dbd1d can do millisecondDelta easier
Claus Gittinger <cg@exept.de>
parents: 5678
diff changeset
  2777
!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2778
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2779
printRFC1123FormatOn:aStream
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2780
    "append the RFC1123 representation of the receiver to aStream.
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2781
     This format is used in HTTP requests and looks like:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2782
	'Fri, 04 Jul 2003 15:56:11 GMT'
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2783
     (always GMT and all names in english)"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2784
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2785
"/       HTTP-date      = rfc1123-date | rfc850-date | asctime-date
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2786
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2787
"/       rfc1123-date   = wkday "," SP date1 SP time SP "GMT"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2788
"/       rfc850-date    = weekday "," SP date2 SP time SP "GMT"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2789
"/       asctime-date   = wkday SP date3 SP time SP 4DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2790
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2791
"/       date1          = 2DIGIT SP month SP 4DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2792
"/                        ; day month year (e.g., 02 Jun 1982)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2793
"/       date2          = 2DIGIT "-" month "-" 2DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2794
"/                        ; day-month-year (e.g., 02-Jun-82)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2795
"/       date3          = month SP ( 2DIGIT | ( SP 1DIGIT ))
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2796
"/                        ; month day (e.g., Jun  2)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2797
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2798
"/       time           = 2DIGIT ":" 2DIGIT ":" 2DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2799
"/                        ; 00:00:00 - 23:59:59
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2800
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2801
"/       wkday          = "Mon" | "Tue" | "Wed"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2802
"/                      | "Thu" | "Fri" | "Sat" | "Sun"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2803
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2804
"/       weekday        = "Monday" | "Tuesday" | "Wednesday"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2805
"/                      | "Thursday" | "Friday" | "Saturday" | "Sunday"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2806
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2807
"/       month          = "Jan" | "Feb" | "Mar" | "Apr"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2808
"/                      | "May" | "Jun" | "Jul" | "Aug"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2809
"/                      | "Sep" | "Oct" | "Nov" | "Dec"
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2810
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2811
    |timeInfo|
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2812
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2813
    timeInfo := self asUtcTimestamp timeInfo.
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2814
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2815
    aStream nextPutAll:(#('Mon' 'Tue' 'Wed' 'Thu' 'Fri' 'Sat' 'Sun') at:timeInfo dayInWeek);
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2816
	    nextPutAll:', '.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2817
    timeInfo day printOn:aStream leftPaddedTo:2 with:$0.
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2818
    aStream space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2819
    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
  2820
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2821
    "/ the following is too slow for heavy use
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2822
    "/    timeInfo printOn:aStream format:'%(ShortDayName), %(day) %(ShortMonthName) %y %h:%m:%s GMT' language:#en.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2823
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2824
    aStream nextPut:Character space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2825
    timeInfo year printOn:aStream.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2826
    aStream nextPut:Character space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2827
    timeInfo hours printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2828
    aStream nextPut:$:.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2829
    timeInfo minutes printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2830
    aStream nextPut:$:.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2831
    timeInfo seconds printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2832
    aStream nextPutAll:' GMT'.
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2833
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2834
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2835
     String streamContents:[:s| Timestamp now printRFC1123FormatOn:s]
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2836
    "
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2837
!
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2838
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2839
printStringIso8601
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2840
    "return a printString as UTC in a format like 2014-10-17T17:08:44Z"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2841
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2842
    ^ TimestampISO8601Builder print: self
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2843
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2844
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2845
     Timestamp now printStringIso8601
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2846
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2847
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2848
    "Created: / 16-06-2005 / 16:11:15 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2849
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2850
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2851
printStringIso8601Compressed
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2852
    "return a printString as UTC in a format like 20141017T170939Z"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2853
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2854
    ^ TimestampISO8601Builder printCompressed: self
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2855
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2856
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2857
     Timestamp now printStringIso8601Compressed
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2858
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2859
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2860
    "Created: / 16-06-2005 / 16:11:31 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2861
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2862
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2863
printStringIso8601Format
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2864
    "return the Iso8601 representation of the receiver with local timezon information.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2865
     This format looks like:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2866
	1999-01-01T24:00:00
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2867
     or, for zero hr:min:sec,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2868
	1999-01-01
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2869
     Of course, a 24 hour clock is used."
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2870
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2871
    ^ String streamContents:[:s | self printIso8601FormatOn:s]
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2872
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2873
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2874
     Timestamp now printStringIso8601Format
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2875
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2876
!
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2877
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2878
printStringRFC1123Format
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2879
    "return the RFC1123 representation of the receiver.
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2880
     This format is used in HTTP requests and looks like:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2881
	'Fri, 04 Jul 2003 15:56:11 GMT'
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2882
     (always GMT)"
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2883
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2884
    ^ String streamContents:[:s | self printRFC1123FormatOn:s]
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2885
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2886
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2887
     Timestamp now printStringRFC1123Format
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2888
    "
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2889
!
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2890
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2891
storeOn:aStream
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2892
    "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
  2893
     receiver via readFrom:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2894
     Use a OS/architecture independent format"
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2895
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2896
    aStream nextPut:$(;
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2897
	    nextPutAll:self storeStringClass name;
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2898
	    nextPutAll:' readIso8601FormatFrom:'''.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2899
    self printIso8601FormatOn:aStream.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2900
    aStream nextPutAll:''')'.
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  2901
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2902
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2903
     Timestamp now storeString
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2904
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2905
     Object readFrom:(Timestamp now storeString) readStream
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2906
     Timestamp readFrom:(Timestamp now storeString) readStream
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2907
    "
17049
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2908
!
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2909
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2910
storeStringClass
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2911
    ^ self class
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2912
! !
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2913
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2914
!Timestamp methodsFor:'private'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2915
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2916
computeTimeInfo
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2917
    |d t info|
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2918
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2919
    "/ fake an info which the OS cannot give me
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2920
    d := self asDate.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2921
    t := self asTime.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2922
    info := OperatingSystem timeInfoClass new.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2923
    info year:d year month:d month day:d day
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2924
	 hours:t hours minutes:t minutes seconds:t seconds milliseconds:self milliseconds
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2925
	 utcOffset:(self utcOffset) dst:false dayInYear:d dayInYear dayInWeek:d dayInWeek.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2926
    ^ info
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2927
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2928
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2929
	(Timestamp year:1592 month:7 day:1 hour:12 minute:0 second:0 millisecond:555) computeTimeInfo
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2930
	(Timestamp year:4096 month:7 day:1 hour:12 minute:0 second:0 millisecond:555) computeTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2931
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2932
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2933
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2934
computeUtcTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2935
    |utcTimestamp d t info|
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2936
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2937
    "/ fake an info which the OS cannot give me
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2938
    utcTimestamp := self asUtcTimestamp.
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2939
    d := utcTimestamp asDate.
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2940
    t := utcTimestamp asTime.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2941
    info := OperatingSystem timeInfoClass new.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2942
    info year:d year month:d month day:d day
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2943
	 hours:t hours minutes:t minutes seconds:t seconds milliseconds:self milliseconds
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2944
	 utcOffset:0 dst:false dayInYear:d dayInYear dayInWeek:d dayInWeek.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2945
    ^ info
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2946
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2947
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2948
	(Timestamp year:1950 month:7 day:1 hour:12 minute:0 second:0) timeInfo
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2949
	(Timestamp year:1592 month:7 day:1 hour:12 minute:0 second:0) computeUtcTimeInfo
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2950
	(Timestamp year:4096 month:7 day:1 hour:12 minute:0 second:0) computeUtcTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2951
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2952
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2953
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2954
fromOSTime:anUninterpretedOSTime
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2955
    "strictly private: set the milliseconds from an OS time (since the epoch).
16943
b573bff7b937 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16942
diff changeset
  2956
     Notice: timestamps always have millisecond precision (in contrast to Time, where it is optional)"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2957
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2958
    osTime := anUninterpretedOSTime
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2959
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2960
    "Created: 1.7.1996 / 14:33:21 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2961
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2962
16942
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  2963
fromOSTimeWithMilliseconds:anUninterpretedOSTime
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2964
    "strictly private: set the milliseconds from an OS time (since the epoch)"
16942
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  2965
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  2966
    osTime := anUninterpretedOSTime
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  2967
!
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  2968
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2969
getMilliseconds
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2970
    "strictly private: return the milliseconds (since the epoch) in utc"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2971
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2972
    ^ osTime
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2973
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2974
    "Created: 1.7.1996 / 14:33:56 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2975
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2976
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2977
getSeconds
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2978
    "strictly private: return the seconds (since the epoch) in utc"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2979
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2980
    ^ osTime // 1000
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2981
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2982
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2983
setMilliseconds:millis
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2984
    "strictly private: set the milliseconds (since the epoch)"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2985
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2986
    osTime := millis.
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2987
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2988
    "Modified: 20.12.1995 / 11:46:36 / stefan"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2989
    "Created: 1.7.1996 / 14:34:24 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2990
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2991
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2992
setSeconds:secs
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2993
    "strictly private: set the seconds (since whatever)"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2994
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2995
    osTime := (secs * 1000).
795
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
  2996
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
  2997
    "Modified: 20.12.1995 / 11:46:36 / stefan"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2998
    "Modified: 1.7.1996 / 14:34:10 / cg"
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  2999
!
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3000
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3001
timeInfo
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3002
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3003
	"/ fake an info which the OS cannot give me
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3004
	^ self computeTimeInfo
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3005
    ].
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3006
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3007
    ^ OperatingSystem computeTimeAndDateFrom:osTime
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3008
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3009
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3010
	(Timestamp year:1950 month:7 day:1 hour:12 minute:0 second:0) timeInfo
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3011
	(UtcTimestamp year:1950 month:7 day:1 hour:12 minute:0 second:0) timeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3012
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3013
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3014
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3015
utcSecondsSince1970
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3016
    "return the UTC seconds since 1970"
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3017
9430
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  3018
    ^ self getSeconds
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3019
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3020
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  3021
     Timestamp now utcSecondsSince1970
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3022
    "
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3023
!
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3024
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3025
utcTimeInfo
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3026
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3027
	"/ fake an info which the OS cannot give me
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3028
	^ self computeUtcTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3029
    ].
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3030
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3031
    ^ OperatingSystem computeUTCTimeAndDateFrom:osTime
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3032
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3033
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3034
	(Timestamp year:1950 month:7 day:1 hour:12 minute:0 second:0) timeInfo
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3035
	(Timestamp year:1950 month:7 day:1 hour:12 minute:0 second:0) utcTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3036
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3037
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3038
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3039
!Timestamp methodsFor:'testing'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3040
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3041
isLocalTimestamp
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3042
    "return true, if I am a local timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3043
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3044
    ^ true
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3045
!
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3046
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3047
isTimestamp
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3048
    "return true, if I am a timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3049
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3050
    ^ true
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3051
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3052
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3053
isUtcTimestamp
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3054
    "return true, if I am a utc timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3055
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3056
    ^ false
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3057
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3058
8396
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3059
!Timestamp methodsFor:'visiting'!
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3060
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3061
acceptVisitor:aVisitor with:aParameter
16718
1af0186b3feb comment/format only
Claus Gittinger <cg@exept.de>
parents: 16610
diff changeset
  3062
    "dispatch for visitor pattern; send #visitTimestamp:with: to aVisitor."
1af0186b3feb comment/format only
Claus Gittinger <cg@exept.de>
parents: 16610
diff changeset
  3063
8396
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3064
    ^ aVisitor visitTimestamp:self with:aParameter
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3065
! !
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3066
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3067
!Timestamp::TimestampBuilderAbstract methodsFor:'error reporting'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3068
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3069
malformed:aString
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3070
    TimeConversionError raiseErrorString:(' - ', aString)
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3071
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3072
    "Created: / 15-06-2005 / 15:54:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3073
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3074
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3075
!Timestamp::TimestampBuilderAbstract methodsFor:'support'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3076
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3077
addHoursAndMinutes: arrayWithHoursAndMinutes
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3078
    "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
  3079
    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
  3080
    sign, the behavior may be strange. It's intended only for time zone corrections, where
16977
deb0f10f246a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16975
diff changeset
  3081
    not more than 14 (in fact, 23) hours is added or subtracted (ie. date can be modified only
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3082
    one day forward or backward)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3083
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3084
    | hours minutes |
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3085
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3086
    hours := arrayWithHoursAndMinutes first.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3087
    minutes := arrayWithHoursAndMinutes second.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3088
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3089
    utcOffset := (((hours * 60) + minutes) * 60).
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3090
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3091
    minutes isZero ifFalse: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3092
	minute := minute + minutes.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3093
	minute >= 60 ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3094
	    hours := hours + 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3095
	    minute := minute - 60.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3096
	].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3097
	minute < 0 ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3098
	    hours := hours - 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3099
	    minute := minute + 60.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3100
	]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3101
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3102
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3103
    "Hours may get zero by time zone specification or by minutes modifications above."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3104
    hours isZero ifTrue: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3105
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3106
    "Add or subtract the hour and make date corrections if necessary."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3107
    hour := hour + hours.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3108
    hour < 0 ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3109
	"Oops, got to previous day, must adjust even the date."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3110
	hour := 24 - ((hour negated) \\ 24).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3111
	day := day - 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3112
	day <= 0 ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3113
	    "Got to previous month..."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3114
	    month := month - 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3115
	    month <= 0 ifTrue: [year := year - 1. month := 12].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3116
	    day := self lastDayInMonth: month
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3117
	]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3118
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3119
    hour >= 24 ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3120
	hour := hour \\ 24.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3121
	day := day + 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3122
	day > (self lastDayInMonth: month) ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3123
	    month := month + 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3124
	    month > 12 ifTrue: [year := year + 1. month := 1].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3125
	    day := 1
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3126
	]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3127
    ]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3128
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3129
    "Created: / 15-06-2005 / 16:45:49 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3130
    "Modified: / 16-06-2005 / 15:04:45 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3131
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3132
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3133
dateFromDayNumber: dayInYear
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3134
    "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
  3135
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3136
    |monthAndDay|
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3137
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3138
    (dayInYear between: 1 and: 365) ifFalse: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3139
	(dayInYear = 366 and:[self leapYear: year])
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3140
	    ifFalse: [self malformed: 'Bad day number: ' , dayInYear printString]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3141
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3142
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3143
    monthAndDay := Date monthAndDayFromDayInYear:dayInYear forYear:year.
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3144
    month := monthAndDay at:1.
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3145
    day := monthAndDay at:2
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3146
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3147
    "Created: / 15-06-2005 / 11:27:35 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3148
    "Modified: / 16-06-2005 / 12:31:37 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3149
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3150
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3151
dateFromWeek: weekInteger andWeekday: dayInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3152
    "Compute the month and day. Find the first day (weekday) in the year, maybe even
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3153
    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
  3154
    with thursday (or the one containing 4.1.)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3155
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3156
    |tmpDate|
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3157
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3158
    "Check numbers. Year may be checked if it contains 53 weeks or 52 weeks only."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3159
    (dayInteger between: 1 and: 7) ifFalse: [self malformed: 'Bad weekday number: ' , dayInteger printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3160
    (weekInteger between: 1 and: 53) ifFalse: [self malformed: 'Bad week number: ' , weekInteger printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3161
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3162
    tmpDate := Date newDayInWeek:dayInteger week:weekInteger year:year.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3163
    day := tmpDate day.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3164
    month := tmpDate month.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3165
    year := tmpDate year.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3166
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3167
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3168
isAllowedDay: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3169
    "Answer whether the given day is allowed in the current month."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3170
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3171
    ^anInteger between: 1 and: (self lastDayInMonth: month)
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3172
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3173
    "Created: / 15-06-2005 / 16:22:51 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3174
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3175
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3176
lastDayInMonth: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3177
    "Answer the number of the last day of the given month in the current year."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3178
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3179
    ^ anInteger = 2
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3180
	ifTrue: [(self leapYear: year) ifTrue: [29] ifFalse: [28]]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3181
	ifFalse: [#(31 28 31 30 31 30 31 31 30 31 30 31) at: month]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3182
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3183
    "Created: / 15-06-2005 / 17:12:31 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3184
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3185
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3186
leapYear: anInteger
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3187
    ^ Date leapYear:anInteger.
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3188
!
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3189
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3190
timestampWithClass:timestampClass
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3191
    "Answer the timestamp as it has been parsed."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3192
    "Notes:
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3193
     - When reading, the time has either been adjusted to UTZ/zulu or explicit offset time,
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3194
       or is a local time stamp.
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3195
     Attention: an explicit utcOffset in the input string has already been added into the hh:mm values."
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3196
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3197
    (timestampClass == UtcTimestamp) ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3198
	^ UtcTimestamp
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3199
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3200
	    hour: hour minute: minute second: second millisecond: millisecond
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3201
    ].
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3202
    (timestampClass == TZTimestamp) ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3203
	"/ Attention: an explicit utcOffset in the input string has already been added into the hh:mm values."
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3204
	^ ((TZTimestamp
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3205
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3206
	    hour: hour minute: minute second: second millisecond: millisecond) utcOffset:utcOffset)
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3207
    ].
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3208
16989
de9bc5f12297 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16988
diff changeset
  3209
    (isUtcTime or:[hasTimezone and:[utcOffset == 0]]) ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3210
	^ ((timestampClass == Timestamp) ifTrue:UtcTimestamp ifFalse:timestampClass)
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3211
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3212
	    hour: hour minute: minute second: second millisecond: millisecond
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3213
    ].
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3214
    hasTimezone ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3215
	"/ Attention: an explicit utcOffset in the input string has already been added into the hh:mm values."
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3216
	^ (((timestampClass == Timestamp) ifTrue:TZTimestamp ifFalse:timestampClass)
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3217
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3218
	    hour: hour minute: minute second: second millisecond: millisecond) utcOffset:utcOffset
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3219
    ].
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3220
    "/ there was no timezone info, so make it a local timestamp again.
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3221
    ^ (timestampClass
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3222
	year: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3223
	hour: hour minute: minute second: second millisecond: millisecond)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3224
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3225
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3226
yearAlreadyReadAs:yearArg
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3227
    "support for readers which may have already preread the year"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3228
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3229
    year := yearArg.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3230
    yearAlreadyRead := true.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3231
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3232
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3233
!Timestamp::TimestampISO8601Builder class methodsFor:'documentation'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3234
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3235
documentation
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3236
"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3237
    TimestampISO8601Builder is designed to read any (almost) format of ISO 8601 encoded timestamp.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3238
    Also, class methods can be used to print but the main reading job is done in instance protocol.
16915
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3239
    It has been written because of insufficient abilities of Timestamp #readIso8601FormatFrom: method
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3240
    (which was now changed to call this as well).
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3241
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3242
    It produces timestamps, i.e. when the string (or stream) contains only a time, an error will result
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3243
    (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
  3244
    broken years, incomplete times and timezones. All times read with timezone difference are recomputed
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3245
    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
  3246
    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
  3247
    All data is checked for validity (including leap years, leap seconds,...) during reading and as soon as
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3248
    possible.
16915
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3249
    For an example of what the builder can read, see the examples method and ISO 8601 itself.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3250
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3251
    [author:]
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3252
	Martin Dvorak (masca@volny.cz)
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3253
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3254
    [instance variables:]
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3255
	stream          A stream the builder operates on. Assigned on each call to instance method #read:,
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3256
			so the builder instance can be reused (by at most one thread).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3257
	year            Current timestamp year. No default value, date must be present.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3258
	month           Current timestamp month. May change during parsing. Defaults to 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3259
	day             Current timestamp day. Defaults to 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3260
	hour            Current timestamp hour. Defaults to 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3261
	minute          Current timestamp minute. Defaults to 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3262
	second          Current timestamp second. Defaults to 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3263
	millisecond     Current timestamp millisecond. Defaults to 0.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3264
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3265
    [see also:]
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3266
	Timestamp
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3267
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3268
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3269
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3270
examples
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3271
"
16915
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3272
    See the unit tests in exept:regression >> RegressionTests::timeAndDateTest
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3273
    It covers the main features this builder has.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3274
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3275
    Just to introduce some coding examples, try:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3276
	Timestamp readISO8601From: (TimestampISO8601Builder print: Timestamp now)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3277
	UtcTimestamp readISO8601From: (TimestampISO8601Builder print: UtcTimestamp now)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3278
	Timestamp readISO8601From: (TimestampISO8601Builder print: UtcTimestamp now)
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3279
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3280
    Timestamp readISO8601From:'fooBar' onError:[ Timestamp now ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3281
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3282
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3283
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3284
history
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3285
    "Created: / 16-06-2005 / 16:28:38 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3286
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3287
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3288
!Timestamp::TimestampISO8601Builder class methodsFor:'printing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3289
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3290
print: aTimestamp
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3291
    "Returns the printString of the given timestamp in general ISO8601 format,
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3292
     such as '2014-11-06T11:48:09Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3293
     The time is printed as UTC time"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3294
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3295
    | stream |
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3296
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3297
    stream := '' writeStream.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3298
    self print: aTimestamp on: stream.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3299
    ^ stream contents
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3300
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3301
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3302
     self print:(Timestamp now)
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3303
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3304
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3305
    "Created: / 15-06-2005 / 17:52:29 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3306
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3307
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3308
print:aTimestamp asLocal:asLocal on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3309
    "Print the given timestamp in general ISO8601 format,
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3310
     such as '2014-11-06T11:48:09Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3311
     The time is always printed as UTC time"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3312
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3313
    self print:aTimestamp compact:false asLocal:asLocal asUTC:asLocal not withMilliseconds:true on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3314
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3315
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3316
     self print:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3317
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3318
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3319
    "Created: / 15-06-2005 / 17:56:51 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3320
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3321
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3322
print:aTimestamp on:aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3323
    "Print the given timestamp in general ISO8601 format,
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3324
     such as '2014-11-06T11:48:09Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3325
     The time is printed as UTC time"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3326
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3327
    self print:aTimestamp compact:false asLocal:false asUTC:true withMilliseconds:true on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3328
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3329
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3330
     self print:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3331
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3332
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3333
    "Created: / 15-06-2005 / 17:56:51 / masca"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3334
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3335
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3336
printAsLocalTime: aTimestamp on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3337
    "Print the given timestamp in general ISO8601 format,
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3338
     such as '2014-11-06T11:48:09+01'.
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3339
     The time is printed as local time"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3340
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3341
    self print:aTimestamp compact:false asLocal:true asUTC:false withMilliseconds:true on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3342
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3343
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3344
     self printAsLocalTime:(Timestamp now) on:Transcript
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3345
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3346
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3347
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3348
printCompressed: aTimestamp
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3349
    "Return a printString in compressed format such as '20141106T114636Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3350
     (for example, for timestamp interchange with mobile devices).
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3351
     The time is printed as UTC time"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3352
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3353
    | stream |
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3354
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3355
    stream := '' writeStream.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3356
    self printCompressed: aTimestamp on: stream.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3357
    ^ stream contents
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3358
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3359
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3360
     self printCompressed:(Timestamp now)
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3361
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3362
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3363
    "Created: / 15-06-2005 / 17:52:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3364
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3365
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3366
printCompressed:aTimestamp asLocal:asLocal on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3367
    "generates a compressed string representation, such as '20141106T114636Z'"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3368
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3369
    self print:aTimestamp compact:true asLocal:asLocal asUTC:asLocal not withMilliseconds:true on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3370
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3371
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3372
     self printCompressed:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3373
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3374
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3375
    "Created: / 15-06-2005 / 17:54:17 / masca"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3376
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3377
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3378
printCompressed: aTimestamp on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3379
    "generates a compressed string representation, such as '20141106T114636Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3380
     The time is printed as UTC time"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3381
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3382
    self print:aTimestamp compact:true asLocal:false asUTC:true withMilliseconds:true on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3383
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3384
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3385
     self printCompressed:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3386
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3387
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3388
    "Created: / 15-06-2005 / 17:54:17 / masca"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3389
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3390
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3391
printCompressedAsLocalTime: aTimestamp on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3392
    "generates a compressed string representation, such as '20141106T114636Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3393
     The time is printed as local time"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3394
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3395
    self print:aTimestamp compact:true asLocal:true asUTC:false withMilliseconds:true on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3396
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3397
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3398
     self printCompressed:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3399
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3400
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3401
    "Created: / 15-06-2005 / 17:54:17 / masca"
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3402
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3403
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3404
printTimeZone:tzOffsetArg on: aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3405
    "Print the timezone delta"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3406
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3407
    |tzOffset tzHours tzMinutes|
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3408
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3409
    tzOffset := tzOffsetArg.
17020
c995597a75c1 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17016
diff changeset
  3410
    tzOffset == 0 ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3411
	aStream nextPutAll:'+00'.
17020
c995597a75c1 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17016
diff changeset
  3412
    ] ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3413
	tzOffset := tzOffset // 60.     "/ convert from seconds to minutes
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3414
	tzOffset < 0 ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3415
	    tzOffset := tzOffset negated.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3416
	    aStream nextPut:$+
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3417
	] ifFalse:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3418
	    aStream nextPut:$-.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3419
	].
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3420
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3421
	tzHours := tzOffset // 60.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3422
	tzMinutes := tzOffset \\ 60.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3423
	(tzHours ~= 0 or:[tzMinutes ~= 0]) ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3424
	    aStream
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3425
		nextPutAll:(tzHours printStringRadix: 10 size: 2 fill: $0).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3426
	    tzMinutes ~= 0 ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3427
		aStream
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3428
		    nextPut: $:;
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3429
		    nextPutAll: (tzMinutes printStringRadix: 10 size: 2 fill: $0).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3430
	    ].
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3431
	].
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3432
    ].
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3433
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3434
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3435
     self print:(Timestamp now) asLocal:true on:Transcript.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3436
     Transcript cr.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3437
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3438
     self print:(Timestamp now) asLocal:false on:Transcript.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3439
     Transcript cr.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3440
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3441
     self printCompressed:(Timestamp now) asLocal:true on:Transcript.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3442
     Transcript cr.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3443
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3444
     self printCompressed:(Timestamp now) asLocal:false on:Transcript.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3445
     Transcript cr.
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3446
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3447
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3448
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3449
!Timestamp::TimestampISO8601Builder class methodsFor:'printing - basic'!
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3450
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3451
print: aTimestamp compact:compact asLocal:asLocal asUTC:asUTC withMilliseconds:withMillis on: aStream
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3452
    "Print the given timestamp in general ISO8601 format,
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3453
     such as '2014-11-06T11:48:09Z'.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3454
	compact: if true, the compact format (without separating dashes and colons is generated)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3455
	asLocal: if true, generates a localtime string (with the machine's current timezone setting)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3456
	asUTC: if true, generates a utc string
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3457
	    if both are false:
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3458
		generate a string depending on the type of timestamp:
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3459
		    if local: generate a local timezone string
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3460
		    if utc: generate a utc string
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3461
		    otherwise it is a timestamp from another timezone (TZTimestamp), then print in its timezone
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3462
	withMilliseconds: if false, no milliseconds are generated"
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3463
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3464
    self
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3465
	print:aTimestamp
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3466
	compact:compact asLocal:asLocal asUTC:asUTC
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3467
	withMilliseconds:withMillis
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3468
	timeSeparator:$T
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3469
	on:aStream
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3470
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3471
    "
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3472
     self print:(Timestamp now) on:Transcript
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3473
     self printAsLocalTime:(Timestamp now) on:Transcript
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3474
     self printAsLocalTime:(Timestamp now asTZTimestamp:-7200) on:Transcript
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3475
    "
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3476
!
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3477
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3478
print:aTimestamp compact:compact asLocal:asLocal asUTC:asUTC withMilliseconds:withMillis timeSeparator:tSep on:aStream
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3479
    "Print the given timestamp in general ISO8601 format,
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3480
     such as '2014-11-06T11:48:09Z'.
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3481
        compact: if true, the compact format (without separating dashes and colons is generated)
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3482
        asLocal: if true, generates a localtime string (without any timezone info)
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3483
        asUTC: if true, generates a utc string
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3484
            if both are false:
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3485
                generate a string depending on the type of timestamp:
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3486
                    if local: generate a local timezone string
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3487
                    if utc: generate a utc string
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3488
                    otherwise it is a timestamp from another timezone (TZTimestamp), then print in its timezone
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3489
        withMilliseconds: if false, no milliseconds are generated"
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3490
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3491
    |timeInfo millis |
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3492
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3493
    asLocal ifTrue:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3494
        "/ force local
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3495
        timeInfo := aTimestamp asLocalTimestamp timeInfo.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3496
    ] ifFalse:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3497
        asUTC ifTrue:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3498
            "/ force utc
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3499
            timeInfo := aTimestamp asUtcTimestamp timeInfo.
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3500
        ] ifFalse:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3501
            "/ in the timestamps own format
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3502
            timeInfo := aTimestamp timeInfo.
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3503
        ]
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3504
    ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3505
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3506
    timeInfo year printOn:aStream leftPaddedTo:4 with:$0.
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3507
    compact ifFalse:[ aStream nextPut: $- ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3508
    timeInfo month printOn:aStream leftPaddedTo:2 with:$0.
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3509
    compact ifFalse:[ aStream nextPut: $- ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3510
    timeInfo day printOn:aStream leftPaddedTo:2 with:$0.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3511
    aStream nextPut:tSep.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3512
    timeInfo hours printOn:aStream leftPaddedTo:2 with:$0.
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3513
    compact ifFalse:[ aStream nextPut: $:].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3514
    timeInfo minutes printOn:aStream leftPaddedTo:2 with:$0.
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3515
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3516
    "always print the seconds, even if 0. 
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3517
     According to http://www.w3.org/TR/xmlschema11-2/#dateTime  this is mandatory"
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3518
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3519
    compact ifFalse:[ aStream nextPut: $:].
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3520
    timeInfo seconds printOn:aStream leftPaddedTo:2 with:$0.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3521
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3522
    millis := withMillis ifTrue:[timeInfo milliseconds] ifFalse:[0].
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3523
    millis ~= 0 ifTrue:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3524
        aStream nextPut: $..
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3525
        millis printOn:aStream leftPaddedTo:3 with:$0.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3526
    ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3527
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3528
    asUTC ifTrue:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3529
        aStream nextPut: $Z
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3530
    ] ifFalse:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3531
        asLocal ifFalse:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3532
            self printTimeZone:aTimestamp utcOffset on:aStream.
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3533
        ].
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3534
    ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3535
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3536
    "
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3537
     self print:(Timestamp now) on:Transcript
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3538
     self printAsLocalTime:(Timestamp now) on:Transcript
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3539
     self printAsLocalTime:(Timestamp now asTZTimestamp:-7200) on:Transcript
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3540
    "
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3541
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3542
    "Created: / 15-06-2005 / 17:56:51 / masca"
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3543
! !
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3544
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3545
!Timestamp::TimestampISO8601Builder class methodsFor:'public parsing'!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3546
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3547
read: stringOrStream withClass:timestampClass
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3548
    ^ self new read:stringOrStream withClass:timestampClass
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3549
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3550
    "Created: / 15-06-2005 / 17:52:03 / masca"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3551
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3552
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3553
read: stringOrStream withClass:timestampClass yearAlreadyReadAs:yearArg
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3554
    "support for readers which may have already preread the year"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3555
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3556
    ^ self new
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3557
	yearAlreadyReadAs:yearArg;
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3558
	read:stringOrStream withClass:timestampClass
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3559
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3560
    "Created: / 15-06-2005 / 17:52:03 / masca"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3561
! !
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3562
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3563
!Timestamp::TimestampISO8601Builder methodsFor:'private-reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3564
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3565
nextDigit
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3566
    | char |
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3567
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3568
    char := stream peekOrNil.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3569
    char isNil ifTrue: [^-1].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3570
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3571
    char isDigit ifTrue: [
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3572
	stream next.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3573
	^ char codePoint - $0 codePoint
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3574
    ].
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3575
    ^ -1
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3576
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3577
    "Created: / 14-06-2005 / 11:48:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3578
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3579
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3580
nextDigitOrError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3581
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3582
    | digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3583
    digit := self nextDigit.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3584
    ^ digit < 0
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3585
	ifTrue: [self malformed: 'No digit found']
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3586
	ifFalse: [digit]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3587
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3588
    "Created: / 15-06-2005 / 10:57:00 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3589
    "Modified: / 15-06-2005 / 17:22:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3590
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3591
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3592
nextDigits: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3593
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3594
    | char number |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3595
    number := 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3596
    anInteger timesRepeat: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3597
	char := stream peekOrNil.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3598
	char ifNil: [self malformed: 'Stream does not contain all ' , anInteger printString , ' digits'].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3599
	char isDigit
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3600
	    ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3601
		stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3602
		number := number * 10 + char codePoint - $0 codePoint]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3603
	    ifFalse: [self malformed: 'Requested ' , anInteger printString , ' digits not found']
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3604
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3605
    ^ number
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3606
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3607
    "Created: / 14-06-2005 / 11:57:22 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3608
    "Modified: / 15-06-2005 / 15:54:29 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3609
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3610
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3611
!Timestamp::TimestampISO8601Builder methodsFor:'public processing'!
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3612
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3613
read:stringOrStream withClass:timestampClass
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3614
    | peek |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3615
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3616
    stream := stringOrStream readStream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3617
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3618
    month := day := 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3619
    hour := minute := second := millisecond := 0.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3620
    isUtcTime := hasTimezone := false.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3621
    utcOffset := 0.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3622
16936
cf59a3abe590 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16935
diff changeset
  3623
    yearAlreadyRead ~~ true ifTrue:[
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3624
        "Read the year. This will read and swallow up to four year digits."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3625
        self readYear.
16923
719c8a7b1cdd class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16922
diff changeset
  3626
    ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3627
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3628
    "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
  3629
    There is possible inconsistency - a dash may be read followed by T, which is not
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3630
    valid. But don't mind that, timestamps will be well-formatted in most cases."
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3631
    peek := stream peekOrNil.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3632
    peek ifNil: [
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3633
        "End of stream, only year has been read."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3634
        ^ self timestampWithClass:timestampClass].
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3635
    peek == $- ifTrue: [
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3636
        "Skip the dash after year, if present."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3637
        stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3638
        peek := stream peekOrNil].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3639
    peek := peek asUppercase.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3640
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3641
    (peek == $T or: [peek == Character space])
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3642
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3643
            "Got time signature. Skip the signature, read time and answer the timestamp."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3644
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3645
            peek == Character space ifTrue:[stream skipSeparators].
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3646
            self readTime.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3647
            self readTimezone.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3648
            ^ self timestampWithClass:timestampClass
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3649
        ]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3650
        ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3651
            "Date not read completely yet, expecting month/day or week/day or day"
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3652
            peek == $W
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3653
                ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3654
                    "Parse week number and (possibly) day number."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3655
                    stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3656
                    self readWeekNumber]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3657
                ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3658
                    "Got digit, read month number followed by day or day number."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3659
                    self readMonthOrDay]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3660
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3661
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3662
    peek := stream peekOrNil.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3663
    peek ifNil: [
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3664
        "End of stream, only year has been read."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3665
        ^ self timestampWithClass:timestampClass].
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3666
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3667
    (peek asUppercase == $T or: [peek == Character space])
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3668
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3669
            "Got time signature, expecting time follows. Otherwise only date was in the stream."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3670
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3671
            peek == Character space ifTrue:[stream skipSeparators].
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3672
            self readTime.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3673
            self readTimezone
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3674
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3675
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3676
    ^ self timestampWithClass:timestampClass
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3677
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3678
    "Created: / 14-06-2005 / 11:45:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3679
    "Modified: / 16-06-2005 / 10:15:35 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3680
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3681
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3682
!Timestamp::TimestampISO8601Builder methodsFor:'reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3683
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3684
readFraction
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3685
    "Read an arbitrary number of digits representing a fraction."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3686
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3687
    ^ Fraction readDecimalFractionFrom:stream onError:[self malformed: 'Missing digits after fraction separator'].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3688
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3689
"/    | anyDigit digit factor fraction |
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3690
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3691
"/    factor := (1 / 10).
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3692
"/    fraction := 0.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3693
"/    anyDigit := false.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3694
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3695
"/    [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3696
"/        digit := self nextDigit.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3697
"/        digit >= 0
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3698
"/    ] whileTrue: [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3699
"/        anyDigit := true.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3700
"/        fraction := digit * factor + fraction.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3701
"/        factor := (factor / 10)
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3702
"/    ].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3703
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3704
"/    anyDigit ifFalse: [self malformed: 'Missing digits after fraction separator'].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3705
"/    ^ fraction
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3706
"/
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3707
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3708
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3709
readMilliseconds
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3710
    "Read an arbitrary number of digits representing milliseconds. As the timestamp can
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3711
    hold only integer amounts of milliseconds, don't mind the rest of the digits."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3712
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3713
    millisecond := (self readFraction * 1000) asInteger
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3714
"/    | digit factor |
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3715
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3716
"/    factor := 100.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3717
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3718
"/    [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3719
"/        digit := self nextDigit.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3720
"/        digit >= 0
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3721
"/    ] whileTrue: [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3722
"/        factor > 0 ifTrue: [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3723
"/            "Factor still > 0, did not read all three digits of mantissa."
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3724
"/            millisecond := digit * factor + millisecond.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3725
"/            factor := (factor / 10) integerPart
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3726
"/        ]
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3727
"/    ].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3728
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3729
"/    factor = 100 ifTrue: [self malformed: 'No digits after millisecond separator']
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3730
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3731
    "Created: / 15-06-2005 / 15:25:45 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3732
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3733
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3734
readMonthOrDay
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3735
    "Read month number, optionally followed by day, or absolute day number (three digit)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3736
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3737
    | dayDigit1 dayDigit2 |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3738
    month := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3739
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3740
    stream peekOrNil = $-
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3741
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3742
	    "Got dash. Day number must follow."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3743
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3744
	    day := self nextDigits: 2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3745
	    (self isAllowedDay: day) ifFalse: [self malformed: 'Bad day: ' , day printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3746
	    ^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3747
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3748
    dayDigit1 := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3749
    dayDigit1 < 0 ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3750
	"No more digits than month, leave day unspecified."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3751
	(month between: 1 and: 12) ifFalse: [self malformed: 'Bad month: ' , month printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3752
	^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3753
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3754
    dayDigit2 := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3755
    dayDigit2 < 0
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3756
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3757
	    "Read only three digits, this is absolute day number in a year."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3758
	    self dateFromDayNumber: month * 10 + dayDigit1]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3759
	ifFalse: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3760
	    "Read four digits. So there's month and day."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3761
	    (month between: 1 and: 12) ifFalse: [self malformed: 'Bad month: ' , month printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3762
	    day := dayDigit1 * 10 + dayDigit2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3763
	    (self isAllowedDay: day) ifFalse: [self malformed: 'Bad day: ' , day printString]]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3764
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3765
    "Created: / 15-06-2005 / 11:12:02 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3766
    "Modified: / 16-06-2005 / 11:47:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3767
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3768
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3769
readTime
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3770
    "Date read, don't mind it. Read only the time value."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3771
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3772
    | peek f |
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3773
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3774
    hour := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3775
    (hour between: 0 and: 24) ifFalse: [self malformed: 'Bad hour: ' , hour printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3776
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3777
    peek := stream peekOrNil.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3778
    peek isNil ifTrue: [^self].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3779
    (peek == $:) ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3780
	"/ read minutes
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3781
	stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3782
	minute := self nextDigits: 2.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3783
    ] ifFalse: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3784
	peek isDigit ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3785
	    "/ read minutes
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3786
	    minute := self nextDigits: 2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3787
	] ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3788
	    (peek == $. or:[peek == $,]) ifTrue:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3789
		stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3790
		minute := self readFraction * 60.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3791
	    ] ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3792
		^ self.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3793
	    ].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3794
	]
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3795
    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3796
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3797
    minute isInteger ifFalse:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3798
	f := minute.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3799
	minute := f truncated.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3800
	second := (f - minute) * 60.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3801
	second isInteger ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3802
	    f := second.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3803
	    second := f truncated.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3804
	    millisecond := (f - second) * 1000.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3805
	    millisecond := millisecond rounded.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3806
	].
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3807
    ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3808
    (minute between: 0 and: 59) ifFalse: [self malformed: 'Bad minute: ' , minute printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3809
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3810
    peek := stream peekOrNil.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3811
    peek isNil ifTrue: [^self].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3812
    (peek == $:) ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3813
	"/ read seconds
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3814
	stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3815
	second := self nextDigits: 2.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3816
    ] ifFalse: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3817
	peek isDigit ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3818
	    "/ read seconds
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3819
	    second := self nextDigits: 2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3820
	] ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3821
	    (peek == $. or:[peek == $,]) ifTrue:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3822
		stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3823
		second := self readFraction * 60.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3824
	    ] ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3825
		^ self.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3826
	    ].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3827
	]
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3828
    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3829
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3830
    second isInteger ifFalse:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3831
	f := second.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3832
	second := f truncated.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3833
	millisecond := (f - second) * 1000.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3834
	millisecond := millisecond rounded.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3835
    ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3836
    (second between: 0 and: 59) ifFalse: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3837
	"Seconds are usually in this range, do a special check for leap seconds."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3838
	second <= 61
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3839
	    ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3840
		"Leap seconds can occur only on midnight on 31.12. or 30.6. Dont' check year
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3841
		as it's not deterministic."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3842
		(minute = 59 and: [hour = 23 and: [(month = 12 and: [day = 31]) or: [month = 6 and: [day = 30]]]])
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3843
		    ifFalse: [self malformed: 'Bad leap second']]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3844
	    ifFalse: [self malformed: 'Bad second: ' , second printString]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3845
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3846
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3847
    "Hour, minute and second read. Read appendices."
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3848
    ((peek := stream peekOrNil) == $. or:[peek == $,])
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3849
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3850
	    "Read dot. Skip it and read milliseconds."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3851
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3852
	    self readMilliseconds].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3853
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3854
    hour = 24 ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3855
	(minute = 0 and: [second = 0 and: [millisecond = 0]])
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3856
	    ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3857
		"On 24 hour, advance to the next day."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3858
		"hour := 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3859
		self addMinutes: 1440"]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3860
	    ifFalse: [self malformed: 'Bad 24 hour (minutes, seconds and millis not 0)']
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3861
    ]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3862
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3863
    "Created: / 14-06-2005 / 17:27:00 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3864
    "Modified: / 30-06-2005 / 11:34:38 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3865
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3866
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3867
readTimezone
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3868
    "Read time zone information. There are three possibilities of what can occur.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3869
    If there is nothing more to read, the offset is unknown - this is treated as
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3870
    Zulu time as this may not be true."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3871
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3872
    | peek |
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3873
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3874
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3875
    peek ifNil: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3876
    peek := peek asUppercase.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3877
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3878
    "If the time is in Zulu, don't modify the timestamp. This makes the machine
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3879
    run in Zulu time zone, maybe some corrections would be nice."
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3880
    peek == $Z
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3881
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3882
            "Time read, skip Zulu signature and exit."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3883
            isUtcTime := true.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3884
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3885
            ^ self].
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3886
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3887
    peek == $+
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3888
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3889
            "Read a plus, expect a negative time zone difference."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3890
            hasTimezone := true.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3891
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3892
            self addHoursAndMinutes: (self readTimezoneOffset collect: [:e | e negated]).
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3893
            ^ self].
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3894
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3895
    peek == $-
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3896
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3897
            "Read a minus, expect positive time zone difference or unknown offset."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3898
            hasTimezone := true.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3899
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3900
            self addHoursAndMinutes: self readTimezoneOffset.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3901
            ^ self].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3902
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3903
    "This is local time"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3904
    isUtcTime := false.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3905
    hasTimezone := false.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3906
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3907
    "Created: / 16-06-2005 / 09:54:21 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3908
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3909
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3910
readTimezoneOffset
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3911
    "Read time zone offset as a number minutes. Generally, there should be hours only
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3912
    but as the format introduces minutes in offsets, we must accept them."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3913
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3914
    | hours digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3915
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3916
    "Read hours."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3917
    hours := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3918
    (hours between: 0 and: 12) ifFalse: [self malformed: 'Bad offset hour: ' , hours printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3919
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3920
    stream peekOrNil = $:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3921
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3922
	    "Colon read, minutes must follow."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3923
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3924
	    digit := self nextDigits: 2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3925
	    (digit between: 0 and: 59) ifFalse: [self malformed: 'Bad offset minute: ' , digit printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3926
	    ^Array with: hours with: digit].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3927
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3928
    "Read next digit and check whether minutes follow. If not, return only with hours. If yes,
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3929
     check boundaries."
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3930
    digit := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3931
    digit < 0 ifTrue: [^Array with: hours with: 0].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3932
    digit >= 6 ifTrue: [self malformed: 'Bad offset minute: ' , (digit * 10) printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3933
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3934
    "Read the last digit of offset, it must be present."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3935
    ^Array with: hours with: digit * 10 + self nextDigitOrError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3936
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3937
    "Created: / 15-06-2005 / 15:35:41 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3938
    "Modified: / 15-06-2005 / 17:45:58 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3939
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3940
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3941
readWeekNumber
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3942
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3943
    | week dayInWeek digit |
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3944
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3945
    "Read week number. It is always two digits long."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3946
    week := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3947
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3948
    stream peekOrNil = $-
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3949
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3950
	    "Got dash, day number must follow."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3951
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3952
	    digit := self nextDigit.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3953
	    digit < 0 ifTrue: [self malformed: 'Bad weekday number'].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3954
	    digit > 7 ifTrue: [self malformed: 'Bad weekday number'].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3955
	    self dateFromWeek: week andWeekday: digit.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3956
	    ^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3957
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3958
    "Read day number that follows the week. If the number is not given, consider it monday."
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3959
    dayInWeek := self nextDigit.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3960
    dayInWeek <= 0 ifTrue: [dayInWeek := 1].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3961
    dayInWeek > 7 ifTrue: [self malformed: 'Bad weekday number'].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3962
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3963
    self dateFromWeek: week andWeekday: dayInWeek
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3964
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3965
    "Created: / 14-06-2005 / 12:06:47 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3966
    "Modified: / 15-06-2005 / 15:53:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3967
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3968
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3969
readYear
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3970
    "Read YYYY or :Y (broken decade) from the stream. Also handles correctly YY- and YYY-."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3971
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3972
    | read peek |
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3973
    stream peekOrNil = $:
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3974
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3975
            "Broken two digit year > 1999 follows."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3976
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3977
            year := self nextDigitOrError + 2000.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3978
            ^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3979
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3980
    "Expecting two-, three- or four-digit year"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3981
    "Read the first two digits. They must be there."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3982
    read := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3983
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3984
    "Check if there's a dash, this can help us deciding whether the year ends."
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3985
    peek := stream peekOrNil.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3986
    peek ifNil: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3987
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3988
    ((peek == $-) or:[peek == $W])
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3989
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3990
            "OK, got two digits. These are expected to be the year after 1970."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3991
            year := read < 70
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3992
                ifTrue: [read + 2000]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3993
                ifFalse: [read + 1900]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3994
        ] ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3995
            "Read the next digit for the case of three-digit year after 1900 (ie. year > 1999)."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3996
             read := read * 10 + self nextDigitOrError.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3997
             peek := stream peekOrNil.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3998
             (peek isNil or: [peek == $-])
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3999
                ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4000
                    "Read three digit year, return it."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4001
                    year :=  read + 1900
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4002
                ] ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4003
                    "Read the fourth digit of the year. These can be month digits but the
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4004
                    two-digit year format is deprecated anyway."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4005
                    read := read * 10 + self nextDigitOrError.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4006
                    year :=  read.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4007
                ]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4008
        ]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4009
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4010
    "Created: / 14-06-2005 / 12:01:11 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4011
    "Modified: / 15-06-2005 / 17:31:56 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4012
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4013
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  4014
!Timestamp class methodsFor:'documentation'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4015
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4016
version
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  4017
    ^ '$Header$'
12164
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  4018
!
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  4019
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  4020
version_CVS
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  4021
    ^ '$Header$'
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4022
! !
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  4023
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  4024
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  4025
Timestamp initialize!