Timestamp.st
author Claus Gittinger <cg@exept.de>
Thu, 15 Mar 2018 23:05:55 +0100
changeset 22613 875197e3bb08
parent 22337 9a707f3b74c2
child 22614 369da8fe40ea
permissions -rw-r--r--
#FEATURE by cg class: Timestamp preparation for more resolution (added picoSecond instvar) class definition added: #picoseconds class: Timestamp class comment/format in: #documentation
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
     1
"{ Encoding: utf8 }"
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
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
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    19
	instanceVariableNames:'osTime picoSeconds'
19923
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
    20
	classVariableNames:'Epoch MaxOSTime MinOSTime TimeZoneInfo'
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
"
21699
b8eea1f574cf #OTHER by mawalch
mawalch
parents: 21388
diff changeset
    58
    This class represents time values in milliseconds starting some time in the past.
16945
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
21699
b8eea1f574cf #OTHER by mawalch
mawalch
parents: 21388
diff changeset
    70
    how to convert these times. This has the advantage that timestamps on files
16945
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
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    80
    This class should not be confused with Time (which only represents the time within one day). 
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    81
    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
21699
b8eea1f574cf #OTHER by mawalch
mawalch
parents: 21388
diff changeset
    85
    about an absolute time is not a good idea (at least in our universe). So in 2004 the class
8264
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)
21699
b8eea1f574cf #OTHER by mawalch
mawalch
parents: 21388
diff changeset
    87
    AbsoluteTime was kept as an alias for backward compatibility and was finally removed in 2017.
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:
21699
b8eea1f574cf #OTHER by mawalch
mawalch
parents: 21388
diff changeset
    90
        On UNIX, osTime can only hold dates between 1970-01-01T00:00:00Z and 2038-01-19T03:14:07Z
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    91
        However, timestamp instances can hold negative osTime values (which are timestamps
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    92
        before 1.1.1970 and also osTimes greater than 4294967295 (2^32-1) for timestamps after 2038-01-19.
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
    93
21699
b8eea1f574cf #OTHER by mawalch
mawalch
parents: 21388
diff changeset
    94
        For dates before 1582 (when calendars were changed from Julian to Gregorian),
17131
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
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    98
        And, the additional instance variable picoSeconds can be used to add more
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
    99
        resolution. If non-nil, it holds additional picoseconds to be added to the millisecond osTime.
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
   100
        Although, not all OSs give us that detail when asking for the current time,
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
   101
        the picos can still be used in physical computations.
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
   102
1306
c0189edbd96c checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
   103
    [author:]
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
   104
        Claus Gittinger
1306
c0189edbd96c checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
   105
1282
3f5eda57c516 commentary
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
   106
    [See also:]
17131
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
   107
        UtcTimestamp Time Date
d950d092d386 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17081
diff changeset
   108
        Delay ProcessorScheduler
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   109
"
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   110
! !
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   111
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   112
!Timestamp class methodsFor:'initialization'!
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   113
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   114
initialize
17008
b3c0cf461687 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17006
diff changeset
   115
    MinOSTime := OperatingSystem epochStartOSTime.
b3c0cf461687 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17006
diff changeset
   116
    MaxOSTime := OperatingSystem epochEndOSTime.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   117
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   118
    Epoch := UtcTimestamp basicNew setSeconds:0.
21264
8a43f4a520e3 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 20817
diff changeset
   119
8a43f4a520e3 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 20817
diff changeset
   120
    "Modified: / 19-01-2017 / 17:01:59 / stefan"
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   121
! !
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   122
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   123
!Timestamp class methodsFor:'instance creation'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   124
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   125
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
   126
    "return an instance of the receiver, given individual components,
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   127
     interpreted in the UTC timezone."
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
   128
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   129
    ^ self basicNew
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   130
	    UTCyear:y month:m day:d hour:h minute:min second:s millisecond:millis
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
   131
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
   132
    "
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
   133
     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
   134
     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
   135
     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
   136
     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
   137
     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
   138
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   139
     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
   140
    "
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   141
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   142
    "Modified: / 1.7.1996 / 15:22:07 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   143
    "Created: / 13.7.1999 / 12:34:37 / stefan"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   144
    "Modified: / 13.7.1999 / 12:42:30 / stefan"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   145
!
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   146
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   147
decodeFromLiteralArray:anArray
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   148
    "decode a Timestamp literalArray.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   149
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   150
     anArray may be:
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   151
        #(Timestamp '200004182000.123')
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
     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
   154
     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
   155
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   156
        #(Timestamp #osTime: 12345678)
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   157
    "
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   158
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   159
    (anArray at:2) == #osTime: ifTrue:[
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   160
        ^ self new osTime:(anArray at:3).
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   161
    ].
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   162
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   163
    ^ self
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   164
        readGeneralizedFrom:(anArray at:2)
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   165
        onError:[ self conversionErrorSignal
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   166
                    raiseWith:anArray errorString:' - Timestamp literal array decoding' ]
8797
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   167
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   168
    "
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   169
     Timestamp
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   170
        decodeFromLiteralArray:#(Timestamp '20050323175226.014')
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   171
     Timestamp
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   172
        decodeFromLiteralArray:#(Timestamp '20050323175226.014-01')
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   173
     Timestamp
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
   174
        decodeFromLiteralArray:#(Timestamp '20050323175226.014Z')
8797
820ce611f762 comment
Claus Gittinger <cg@exept.de>
parents: 8479
diff changeset
   175
    "
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   176
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
   177
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   178
epoch
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   179
    "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
   180
     However, we allow negative values to represent timestamps before that"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   181
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   182
    ^ Epoch
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
   183
!
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
   184
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   185
fromDate:aDate
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   186
    "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
   187
     object.
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   188
     See also `Timestamp now' and other protocol inherited
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   189
     from my superclass."
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   190
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   191
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   192
	year:aDate year
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   193
	month:aDate month
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   194
	day:aDate day
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   195
	hour:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   196
	minute:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   197
	second:0
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   198
	millisecond:0
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
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   201
     Timestamp fromDate:(Date today) andTime:(Time now)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   202
     Timestamp fromDate:(Date today plusDays:1) andTime:(Time now)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   203
     Timestamp now
16932
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
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   206
    "Modified: / 8.9.1995 / 15:07:30 / claus"
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   207
    "Modified: / 19.4.1996 / 15:25:46 / cg"
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   208
    "Modified: / 13.7.1999 / 12:30:47 / stefan"
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   209
!
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   210
423
claus
parents: 392
diff changeset
   211
fromDate:aDate andTime:aTime
claus
parents: 392
diff changeset
   212
    "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
   213
     object.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   214
     See also `Timestamp now' and other protocol inherited
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   215
     from my superclass."
423
claus
parents: 392
diff changeset
   216
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   217
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   218
	year:aDate year
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   219
	month:aDate month
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   220
	day:aDate day
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   221
	hour:aTime hours
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   222
	minute:aTime minutes
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   223
	second:aTime seconds
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   224
	millisecond:aTime milliseconds
16946
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   225
423
claus
parents: 392
diff changeset
   226
    "
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   227
     Timestamp fromDate:(Date today) andTime:(Time now)
16946
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   228
     Timestamp fromDate:(Date today) andTime:(Time nowWithMilliseconds)
2380b5217f73 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16945
diff changeset
   229
16950
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   230
     Timestamp fromDate:(Date today plusDays:1) andTime:(Time now)
2cec0be544e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16946
diff changeset
   231
     Timestamp now
423
claus
parents: 392
diff changeset
   232
    "
claus
parents: 392
diff changeset
   233
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   234
    "Modified: / 8.9.1995 / 15:07:30 / claus"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   235
    "Modified: / 19.4.1996 / 15:25:46 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
   236
    "Modified: / 13.7.1999 / 12:30:47 / stefan"
423
claus
parents: 392
diff changeset
   237
!
claus
parents: 392
diff changeset
   238
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   239
newDay:dayInYear year:year
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   240
    "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
   241
     Date protocol compatibility"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   242
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
   243
    ^ self fromDate:(Date newDay:dayInYear year:year)
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   244
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   245
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
   246
     Timestamp newDay:183 year:1996
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   247
     Timestamp newDay:1 year:1996
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   248
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   249
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   250
    "Modified: 2.7.1996 / 09:39:30 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   251
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
   252
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   253
secondsSince1970:secs
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   254
    "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
   255
     This is the format used in the UNIX world"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   256
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   257
    ^ self basicNew setSeconds:secs.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   258
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   259
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   260
     Timestamp secondsSince1970:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   261
     Timestamp secondsSince1970:3600
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   262
     Timestamp secondsSince1970:3600*24
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   263
     (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
   264
       =
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   265
     (Timestamp secondsSince1970:1277935200)
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   266
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   267
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   268
    "Created: / 21-10-1996 / 17:48:30 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   269
    "Modified: / 13-07-1999 / 12:31:22 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   270
    "Modified: / 08-01-2011 / 16:06:28 / cg"
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
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   273
utcMillisecondsSince1970:secs
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   274
    "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
   275
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   276
    ^ self basicNew setMilliseconds:secs
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
    "Created: / 08-01-2011 / 16:09:32 / cg"
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
utcNow
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   282
    "return now as utc timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   283
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   284
    ^ UtcTimestamp now
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
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   287
     Timestamp now
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   288
     Timestamp utcNow
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   289
    "
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
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   292
utcSecondsSince1970:secs
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   293
    "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
   294
     This is the format used in the UNIX world"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   295
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   296
    ^ self secondsSince1970:secs
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   297
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   298
"/    |divMod|
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   299
"/
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   300
"/    divMod := secs divMod:3600.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   301
"/    ^ 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
   302
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   303
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   304
     Timestamp secondsSince1970:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   305
     Timestamp secondsSince1970:3600
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   306
     Timestamp secondsSince1970:3600*24
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   307
    "
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
    "Modified: / 13-07-1999 / 12:31:22 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   310
    "Created: / 08-01-2011 / 16:05:09 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   311
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   312
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   313
year:year month:month day:day  
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   314
    "return a new Timestamp, given the year, month and day (starting at 1).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   315
     Date protocol compatibility"
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   316
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   317
    ^ self
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   318
        year:year
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   319
        month:month
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   320
        day:day
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   321
        hour:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   322
        minute:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   323
        second:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   324
        millisecond:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   325
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   326
    "
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   327
     Timestamp year:1996 month:1 day:1 
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   328
    "
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   329
!
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   330
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   331
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
   332
    "return an instance of the receiver, given individual components.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   333
     See also `Timestamp now' and other protocol inherited
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   334
     from my superclass."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   335
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   336
    ^ 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
   337
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   338
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   339
     Timestamp year:1970 month:1 day:1 hour:1 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   340
     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
   341
     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
   342
     Timestamp year:2000 month:7 day:1 hour:1 minute:0 second:0
19771
405bdd780b99 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 19713
diff changeset
   343
     Timestamp year:2080 month:7 day:1 hour:1 minute:0 second:0
13236
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
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   346
    "Modified: / 1.7.1996 / 15:22:07 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   347
    "Created: / 13.7.1999 / 12:06:39 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   348
    "Modified: / 13.7.1999 / 12:27:47 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   349
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   350
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   351
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
   352
    "return an instance of the receiver, given individual components.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   353
     See also `Timestamp now' and other protocol inherited
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   354
     from my superclass."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   355
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   356
    ^ self basicNew
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   357
	    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
   358
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   359
     Timestamp year:1970 month:1 day:1 hour:0 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   360
     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
   361
     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
   362
     Timestamp year:2000 month:7 day:1 hour:1 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   363
     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
   364
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   365
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   366
    "Modified: / 1.7.1996 / 15:22:07 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   367
    "Created: / 13.7.1999 / 12:28:44 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   368
    "Modified: / 13.7.1999 / 12:37:57 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   369
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   370
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   371
!Timestamp class methodsFor:'Compatibility-Squeak'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   372
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   373
current
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   374
    ^ self now
13604
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   375
!
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   376
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   377
readFrom:aStringOrStream
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   378
    "Answer a new instance for the value given by aStringOrStream"
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   379
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   380
    ^ self
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   381
        readFrom:aStringOrStream
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   382
        onError:[ TimeConversionError raiseRequestWith:aStringOrStream errorString:' - timestamp']
13604
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
    "
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   385
     self readFrom:'23-jun-2000 15:00'
14969
13470ec6f8c8 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 14713
diff changeset
   386
     self fromString:'23-jun-2000 15:00'
13604
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   387
     self readFrom:'23-jun-2000 '
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   388
    "
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   389
3f708df3bf70 added: #readDateTimeFrom:
Claus Gittinger <cg@exept.de>
parents: 13542
diff changeset
   390
    "Modified (comment): / 20-08-2011 / 16:52:10 / cg"
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   391
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   392
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   393
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
   394
    ^ (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
   395
        utcOffset:timeDuration
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   396
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   397
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   398
     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
   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
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   402
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
   403
    ^ (UtcTimestamp year: year month: month day: day hour: hour minute: minute second: second)
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   404
        utcOffset:timeDuration
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   405
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   406
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
   407
     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
   408
    "
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   409
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   410
13700
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   411
!Timestamp class methodsFor:'format strings'!
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   412
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   413
defaultFormatString
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   414
    "a format string to present times in user interfaces.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   415
     Do not use this to store/retrieve times (use ISO8601 for that).
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
   416
     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
   417
     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
   418
13700
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   419
    ^ '%(year)-%(month)-%(day) %h:%m:%s.%i'
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   420
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   421
    "Created: / 16-01-2011 / 11:23:36 / cg"
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   422
! !
1f020ea6f607 added: #defaultFormatString
ca
parents: 13606
diff changeset
   423
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   424
!Timestamp class methodsFor:'obsolete'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   425
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   426
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
   427
    <resource: #obsolete>
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   428
    "This is obsolete. User #year:month:day:hour:minute:second:"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   429
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   430
    ^ self
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   431
	year:y month:m day:d hour:h
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   432
	minute:min second:s millisecond:0
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   433
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   434
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   435
    "Modified: / 1.7.1996 / 15:22:26 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   436
    "Modified: / 13.7.1999 / 12:29:56 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   437
!
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
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
   440
    <resource: #obsolete>
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   441
    "This is obsolete. User #year:month:day:hour:minute:second:millisecond:"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   442
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   443
    ^ 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
   444
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   445
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   446
     Timestamp day:1 month:1 year:1970 hour:1 minute:0 second:0
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   447
     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
   448
     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
   449
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   450
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   451
    "Created: / 1.7.1996 / 14:46:09 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   452
    "Modified: / 1.7.1996 / 15:22:07 / cg"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   453
    "Modified: / 13.7.1999 / 12:30:26 / stefan"
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   454
!
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   455
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   456
newDay:day month:month year:year
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   457
    <resource: #obsolete>
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   458
    "return a new Timestamp, given the year, month and day (starting at 1).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   459
     Date protocol compatibility"
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   460
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   461
    ^ self
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   462
	year:year
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   463
	month:month
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   464
	day:day
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   465
	hour:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   466
	minute:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   467
	second:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   468
	millisecond:0
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   469
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   470
    "
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   471
     Timestamp newDay:1 month:1 year:1996
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
   472
    "
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   473
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   474
22337
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
   475
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   476
!Timestamp class methodsFor:'private'!
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
basicReadFrom:aStream
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   479
    "return a new Timestamp, reading a printed representation from aStream.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   480
     The string is interpreted as 24 hour format, as printed.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   481
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   482
     Notice, that this is NOT the storeString format, which is iso8601
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   483
     This is more or less a heuristic attempt to read any reasonable format.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   484
     If the input starts with an integer > 31,
16935
14fe31ad5f88 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16932
diff changeset
   485
     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
   486
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   487
     KLUDGE:
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   488
        us and non-us format have different ordering of day and month;
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   489
        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
   490
        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
   491
     On error, raise an exception"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   492
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   493
    |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
   494
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   495
    count := 0.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   496
    monthOrYear := aStream throughAnyForWhich:[:ch | count := count+1. ch isDigit and:[count <= 4]].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   497
    firstNumber := Integer readFrom:monthOrYear onError:[TimeConversionError raiseErrorString:' - integer expected'].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   498
    firstNumber > 31 ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   499
        "/ assume iso8601 format;
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   500
        ^ self readIso8601FormatFrom:aStream yearAlreadyRead:firstNumber.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   501
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   502
    aStream skipSeparators.
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
    "/ consider this a kludge
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   505
    usFormat := (aStream peek == $/ ).
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   506
22337
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
   507
    [(ch := aStream peekOrNil) notNil and:[ch isLetterOrDigit not]] whileTrue:[aStream next].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   508
    (ch notNil and:[ch isDigit]) ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   509
        secondNumber := Integer readFrom:aStream onError:-1.
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
        usFormat ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   512
            month := firstNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   513
            day := secondNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   514
        ] ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   515
            month := secondNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   516
            day := firstNumber.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   517
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   518
    ] ifFalse:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   519
        possibeMonthName := aStream throughAnyForWhich:[:ch | ch isLetter].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   520
        month := Date indexOfMonth:possibeMonthName asLowercase.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   521
        day := firstNumber.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   522
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   523
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   524
    (day between:1 and:31) ifFalse:[ TimeConversionError raiseErrorString:' - bad day' ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   525
    (month between:1 and:12) ifFalse:[ TimeConversionError raiseErrorString:' - bad month' ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   526
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   527
    [(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
   528
    year := Integer readFrom:aStream onError:[ TimeConversionError raiseErrorString:' - bad year' ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   529
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   530
    aStream atEnd ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   531
        hour := min := sec := millis := 0.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   532
    ] ifFalse:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   533
        [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   534
        hour := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   535
        (hour between:0 and:24) ifFalse:[ TimeConversionError raiseErrorString:' - bad hour' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   536
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   537
        [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   538
        min := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   539
        (min between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad minute' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   540
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   541
        aStream atEnd ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   542
            sec := millis := 0.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   543
        ] ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   544
            [(ch := aStream peekOrNil) notNil and:[ch isDigit not]] whileTrue:[aStream next].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   545
            sec := Integer readFrom:aStream onError:-1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   546
            (sec between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad second' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   547
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   548
            aStream peek == $. ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   549
                aStream next.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   550
                millis := Integer readFrom:aStream onError:0.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   551
                millis >= 1000 ifTrue:[ TimeConversionError raiseErrorString:' - bad millisecond' ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   552
            ] ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   553
                millis := 0.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   554
            ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   555
            aStream atEnd ifFalse:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   556
                utcOffsetOrNil := self utcOffsetFrom:aStream
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   557
            ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   558
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   559
    ].
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   560
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   561
    "special check - only 24:00:00 is allowed;
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   562
     every time after that must wrap"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   563
    hour == 24 ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   564
        (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
   565
    ].
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   566
    utcOffsetOrNil notNil ifTrue:[
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   567
        utcOffsetOrNil = 0 ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   568
            "/ utc timestamp
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
   569
            ^ 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
   570
        ].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   571
        ^ TZTimestamp new 
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   572
                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
   573
                utcOffset:utcOffsetOrNil;
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   574
                addSeconds:utcOffsetOrNil.
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   575
    ].
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
   576
    "/ a local timestamp
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   577
    ^ 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
   578
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   579
    "some ad hoc formats:
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   580
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   581
     Timestamp basicReadFrom:'20-2-1995 13:11:06' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   582
     Timestamp basicReadFrom:'20-2-1995 13:11:06.' readStream
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   583
     Timestamp basicReadFrom:'20-feb-1995 13:11:06' readStream
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   584
     Timestamp basicReadFrom:'20-foo-1995 13:11:06' readStream
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   585
     (Timestamp basicReadFrom:'10-9-1995 13:11:06' readStream) month    - european
16935
14fe31ad5f88 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16932
diff changeset
   586
     (Timestamp basicReadFrom:'10/9/1995 13:11:06' readStream) month    - us
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   587
     Timestamp basicReadFrom:'20-2-1995 13:11' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   588
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100' readStream
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   589
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100 MESZ' readStream
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   590
     Timestamp basicReadFrom:'20-2-1995 13:11:06.100+0200' readStream
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   591
     Timestamp basicReadFrom:'32-2-1995 13:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   592
     Timestamp basicReadFrom:'32-foo-1995 13:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   593
     Timestamp basicReadFrom:'20-13-1995 13:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   594
     Timestamp basicReadFrom:'20-12-1995 25:11:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   595
     Timestamp basicReadFrom:'20-12-1995 23:61:06.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   596
     Timestamp basicReadFrom:'20-12-1995 23:10:66.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   597
     Timestamp basicReadFrom:'20-12-1995 23:10:00.1000' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   598
     Timestamp basicReadFrom:'20-2-1995 24:01:00.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   599
     Timestamp basicReadFrom:'20-2-1995 24:00:01.100' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   600
     Timestamp basicReadFrom:'foo' readStream
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   601
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   602
     any iso8601 format:.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   603
     Timestamp basicReadFrom:(Timestamp now printString readStream)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   604
     Timestamp basicReadFrom:'1995-10-20 24:00:00.000' readStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   605
     Timestamp basicReadFrom:'1995-10-20 12:10:00.000' readStream
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
   606
     Timestamp basicReadFrom:'1995-10-20 12:10:00.000-0200' readStream
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   607
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   608
     UtcTimestamp basicReadFrom:'1995-10-20 12:10:00.000' readStream
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   609
    "
22337
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
   610
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
   611
    "Modified: / 09-11-2017 / 10:10:07 / cg"
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   612
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   613
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   614
readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   615
    "common helper for read methods.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   616
     Return a new Timestamp, reading an iso8601 representation from aStream.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   617
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   618
     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
   619
     otherwise it is local time.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   620
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   621
     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
   622
     is the same as 1999-01-01T24:00:00.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   623
     Missing minute, second and ms values are replaced with 0;
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   624
     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
   625
     Partial hours, minutes, seconds are allowed at the end,
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   626
     decimal separators are both $. and $, .
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   627
     Of course, a 24 hour clock is used.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   628
     On error, raise an exception.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   629
     Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   630
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   631
    "/ changed to use the new reader
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   632
    ^ TimestampISO8601Builder
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   633
	read:aStringOrStream withClass:self
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
   634
	yearAlreadyReadAs:yearOrNil
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   635
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   636
"/    |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
   637
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   638
"/    str := aStringOrStream readStream.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   639
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   640
"/    month := day := 1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   641
"/    hour := millis := 0.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   642
"/    isUtcTime := false.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   643
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   644
"/    yearOrNil notNil ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   645
"/        year := yearOrNil
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
"/        year := Integer readFrom:str onError:nil.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   648
"/        year isNil ifTrue:[ TimeConversionError raiseErrorString:' - bad year' ]
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   649
"/    ].
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
"/    (((ch := str peek) == $-) or:[ch == $W]) ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   653
"/        (ch == $-) ifTrue:[ str next ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   654
"/        str peek == $W ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   655
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   656
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   657
"/            "/ week follows
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   658
"/            week := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   659
"/            (week between:1 and:53) ifFalse:[ TimeConversionError raiseErrorString:' - bad week' ].
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 peek == $- ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   663
"/                str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   664
"/                "/ day follows.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   665
"/                dayInWeek := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   666
"/                (dayInWeek between:1 and:7) ifFalse:[ TimeConversionError raiseErrorString:' - bad day in week' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   667
"/            ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   668
"/                dayInWeek := 1.
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
"/            tmpDay := Date newDayInWeek:dayInWeek week:week year:year.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   671
"/            day := tmpDay day.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   672
"/            month := tmpDay month.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   673
"/            year := tmpDay year.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   674
"/        ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   675
"/            "/ month follows.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   676
"/            month := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   677
"/            (month between:1 and:12) ifFalse:[ TimeConversionError raiseErrorString:' - bad month' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   678
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   679
"/            str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   680
"/            str peek == $- ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   681
"/                str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   682
"/                "/ day follows.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   683
"/                day := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   684
"/                (day between:1 and:31) ifFalse:[ TimeConversionError raiseErrorString:' - bad day' ].
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
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   689
"/    str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   690
"/    str atEnd ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   691
"/        "time follows"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   692
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   693
"/        str peek == $T ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   694
"/            "we treat the T as optional here"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   695
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   696
"/            str skipSeparators.
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
"/        hour := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   699
"/        (hour between:0 and:24) ifFalse:[ TimeConversionError raiseErrorString:' - bad hour' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   700
"/        str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   701
"/        str peekOrNil == $: ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   702
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   703
"/            "/ minutes follow.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   704
"/            min := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   705
"/            (min between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad minute' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   706
"/            str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   707
"/            str peekOrNil == $: ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   708
"/                str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   709
"/                "/ seconds follow.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   710
"/                sec := Integer readFrom:str onError:-1.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   711
"/                (sec between:0 and:59) ifFalse:[ TimeConversionError raiseErrorString:' - bad seconds' ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   712
"/                str skipSeparators.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   713
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   714
"/        ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   715
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   716
"/        peekChar := str peekOrNil.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   717
"/        (peekChar == $. or:[peekChar == $,]) ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   718
"/            str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   719
"/            "/ decimals follow.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   720
"/            fraction := Number readMantissaFrom:str radix:10.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   721
"/            min isNil ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   722
"/                min := 60 * fraction.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   723
"/                fraction := min fractionPart.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   724
"/                min := min truncated.
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
"/            (sec isNil and:[fraction ~= 0])ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   727
"/                sec := 60 * fraction.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   728
"/                fraction := sec fractionPart.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   729
"/                sec := sec truncated.
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
"/            fraction ~= 0 ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   732
"/                millis := (1000 * fraction) rounded.  "/ mhmh - should it be truncated ?
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   733
"/            ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   734
"/        ].
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   735
"/
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   736
"/        peekChar := str peekOrNil.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   737
"/        peekChar notNil ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   738
"/            peekChar == $Z ifTrue:[
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   739
"/                str next.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   740
"/                isUtcTime := true.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   741
"/            ] ifFalse:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   742
"/                ((peekChar == $+) or:[peekChar == $- ]) ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   743
"/                    str next.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   744
"/                    self halt.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   745
"/                    isUtcTime := true.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   746
"/                ]
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   747
"/            ]
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   748
"/        ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   749
"/    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   750
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   751
"/    min isNil ifTrue:[min := 0].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   752
"/    sec isNil ifTrue:[sec := 0].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   753
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   754
"/    "special check - only 24:00:00 is allowed;
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   755
"/     every time after that must wrap"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   756
"/    hour == 24 ifTrue:[
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   757
"/        (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
   758
"/    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   759
"/
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   760
"/    isUtcTime ifTrue:[
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   761
"/        ^ self
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   762
"/            UTCYear:year month:month day:day
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   763
"/            hour:hour minute:min second:sec millisecond:millis.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   764
"/    ] ifFalse:[
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   765
"/        ^ self
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   766
"/            year:year month:month day:day
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   767
"/            hour:hour minute:min second:sec millisecond:millis.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   768
"/    ]
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   769
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   770
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   771
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06.123'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   772
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   773
     Timestamp readIso8601FormatFrom:'1995-02T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   774
     Timestamp readIso8601FormatFrom:'1995T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   775
     Timestamp readIso8601FormatFrom:'1995T13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   776
     Timestamp readIso8601FormatFrom:'1995T13:11.5'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   777
     Timestamp readIso8601FormatFrom:'1995T13:11,5'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   778
     Timestamp readIso8601FormatFrom:'1995T13'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   779
     Timestamp readIso8601FormatFrom:'1995T13.25'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   780
     Timestamp readIso8601FormatFrom:'1995T13.333333'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   781
     Timestamp readIso8601FormatFrom:'1995'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   782
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   783
     Timestamp readIso8601FormatFrom:'2014W40'   -> 29.sep.2014
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   784
     Timestamp readIso8601FormatFrom:'2014W44-4' -> 30.oct.2014
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   785
     Timestamp readIso8601FormatFrom:'2014W1'    -> 30.dec.2013      !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   786
     Timestamp readIso8601FormatFrom:'2014W1-1'  -> same 30.dec.2013 !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   787
     Timestamp readIso8601FormatFrom:'2014W1-2'  -> 31.dec.2013      !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   788
     Timestamp readIso8601FormatFrom:'2014W1-3'  -> 1.jan.2014       !!!!!! (this week starts in the previous year)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   789
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   790
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   791
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06Z'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   792
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   793
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   794
     Timestamp readIso8601FormatFrom:'1995-02-20 13'
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   795
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   796
   24 is allowed with ISO, and is 00:00 of the next day:
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   797
     Timestamp readIso8601FormatFrom:'1995-02-20 24:00:00'
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   798
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   799
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   800
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   801
readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil onError:exceptionValue
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   802
    "common helper for read methods."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   803
21388
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
   804
    ^ [
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
   805
        self readIso8601FormatFrom:aStringOrStream yearAlreadyRead:yearOrNil
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
   806
    ] on:ConversionError do:exceptionValue.
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
   807
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
   808
    "Modified: / 09-02-2017 / 10:01:27 / stefan"
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   809
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   810
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   811
!Timestamp class methodsFor:'reading'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
   812
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   813
readFrom:aStringOrStream format:formatString language:languageOrNil onError:exceptionalValue
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   814
    "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
   815
     The formatString is similar to the one used when printing.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   816
     On error, exceptionalValue is returned.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   817
     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
   818
     Format:
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   819
        %h      hours, 00..23 (i.e. european)  0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   820
        %u      hours, 00..12 (i.e. us)        0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   821
        %m      minutes, 00..59                0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   822
        %s      seconds, 00..59                0-padded to length 2
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   823
        %i      milliseconds, 000..999         0-padded to length 3
19923
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   824
        %f      fractional seconds             any length, but only milliseconds kept
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   825
        %a      am/pm
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   826
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   827
        %d             - day
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   828
        %D             - day
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   829
        %(day)         - day
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   830
        %(dayOfYear)   - 1..365/366
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   831
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   832
        %(month)       - month
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   833
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   834
        %(monthName)   - monthName
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   835
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   836
        %(year)        - year, full 4 digits
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   837
        %Y             - year, last 2 digits only,
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   838
                         0..71 map to 2000..2071;
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   839
                         72..99 map to 1972..1999;
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   840
        %Y1900          - year, last 2 digits only, map to 1900..1999
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   841
        %Y2000          - year, last 2 digits only, map to 2000..2099
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   842
        %Y1950          - year, last 2 digits only, map to 1950..2049
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   843
        %Y1980          - year, last 2 digits only, map to 1980..2079
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   844
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   845
     an optional length after the % gives a field length;
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   846
        i.e. %2h%2m%2s parses '123557' as 12:35:37
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   847
        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
   848
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   849
     Please consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
   850
    "
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   851
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   852
    |day month year dayOfYear monthAndDay
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   853
     hour minute second millisecond
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   854
     utcOffset inStream formatStream error fChar format itemHandler
19923
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   855
     len now s fractionString fraction|
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   856
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
   857
    error := [:msg |
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   858
                exceptionalValue isBlock ifTrue:[
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   859
                    ^ exceptionalValue valueWithOptionalArgument:'format error'
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   860
                ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   861
                    ^ exceptionalValue value
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   862
                ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   863
             ].
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   864
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   865
    itemHandler := [:format |
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   866
        |input|
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   867
        
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   868
        input := len isNil ifTrue:[ inStream ] ifFalse:[ inStream next: len ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   869
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   870
        ( #('d' 'D' 'day' ) includes:format ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   871
            day := Integer readFrom:input onError:[ error value:'invalid day' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   872
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   873
        ] ifFalse:[ ( format = 'month' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   874
            month := Integer readFrom:input onError:[ error value:'invalid month' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   875
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   876
        ] ifFalse:[ ( format = 'year' or:[ format = 'y' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   877
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   878
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   879
        ] ifFalse:[ ( format = 'Y' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   880
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   881
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
18449
48c31fe80359 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18447
diff changeset
   882
            (year < 70) ifTrue:[
48c31fe80359 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18447
diff changeset
   883
                year := year + 2000
48c31fe80359 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18447
diff changeset
   884
            ] ifFalse:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   885
                year := year + 1900
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   886
            ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   887
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   888
        ] ifFalse:[ (format = 'monthName') ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   889
            s := input nextMatching:[:c | c isLetter] thenMatching:[:c | c isLetter].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   890
            month := Date indexOfMonth:s asLowercase language:languageOrNil
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   891
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   892
        ] ifFalse:[ (format = 'dayOfYear') ifTrue:[
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   893
            dayOfYear := Integer readFrom:input onError:[ error value:'invalid day of year' ].
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
   894
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   895
        ] ifFalse:[ ( format sameAs: 'Y1900' ) ifTrue:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   896
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   897
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   898
            year := year + 1900
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   899
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   900
        ] ifFalse:[ ( format sameAs:  'Y1950' ) ifTrue:[
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   901
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   902
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   903
            (year between:0 and: 49) ifTrue:[ 
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   904
                year := year + 2000
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   905
            ] ifFalse:[    
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   906
                year := year + 1900
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   907
            ]  
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   908
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   909
        ] ifFalse:[ ( format sameAs:  'Y1980' ) ifTrue:[
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   910
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   911
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   912
            (year between:0 and: 79) ifTrue:[ 
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   913
                year := year + 2000
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   914
            ] ifFalse:[    
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   915
                year := year + 1900
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   916
            ]  
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   917
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   918
        ] ifFalse:[ ( format sameAs:  'Y2000' ) ifTrue:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   919
            year := Integer readFrom:input onError:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   920
            (year between:0 and: 99) ifFalse:[ error value:'invalid year' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   921
            year := year + 2000
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   922
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   923
        ] ifFalse:[ ( format = 'h' or:[ format = 'H' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   924
            hour := Integer readFrom:input onError:[ error value:'invalid hour' ].
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
        ] ifFalse:[ ( format = 'u'  or:[ format = 'U']) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   927
            hour := Integer readFrom:input onError:[ error value:'invalid hour' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   928
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   929
        ] ifFalse:[ ( format = 'm'  or:[ format = 'M' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   930
            minute := Integer readFrom:input onError:[ error value:'invalid minute' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   931
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   932
        ] ifFalse:[ ( format = 's'  or:[ format = 'S' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   933
            second := Integer readFrom:input onError:[ error value:'invalid second' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   934
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   935
        ] ifFalse:[ ( format = 'i'  or:[ format = 'I' ]) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   936
            millisecond := Integer readFrom:input onError:[ error value:'invalid month' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   937
19923
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   938
        ] ifFalse:[ ( format = 'f'  or:[ format = 'F' ]) ifTrue:[
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   939
            fractionString := input upToMatching:[:ch | ch isDigit not].
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   940
            fraction := FixedPoint readFrom:'0.',fractionString.
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   941
            millisecond := (fraction * 1000) truncated.
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   942
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   943
        ] ifFalse:[ ( format = 'tz' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   944
            utcOffset := self utcOffsetFrom:input.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   945
            utcOffset isNil ifTrue:[ error value:'invalid timezone' ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   946
        ] ifFalse:[ ( format = 'a' ) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   947
            s := (input next:2) asLowercase.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   948
            s = 'am' ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   949
                (hour between:0 and:12) ifFalse:[ error value:'invalid hour' ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   950
            ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   951
                s = 'pm' ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   952
                    (hour between:1 and:12) ifFalse:[ error value:'invalid hour' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   953
                    hour := hour + 12.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   954
                ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   955
                    error value:'invalid am/pm'
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   956
                ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   957
            ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   958
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   959
        ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   960
            error value:'unhandled format:',format
19923
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
   961
        ]]]]]]]]]]]]]]]]]]
18445
6184d4210c89 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18441
diff changeset
   962
    ].
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   963
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   964
    hour := 0.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   965
    minute := 0.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   966
    second := 0.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   967
    millisecond := 0.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
   968
    utcOffset := 0.
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   969
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   970
    inStream := aStringOrStream readStream.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   971
    formatStream := formatString readStream.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   972
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
   973
    [formatStream atEnd] whileFalse:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   974
        fChar := formatStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   975
        fChar = Character space ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   976
            inStream peek isSeparator ifFalse:[ error value: 'format error; space expcected' ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   977
            inStream skipSeparators.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   978
        ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   979
            fChar == $% ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   980
                len := nil.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   981
                (formatStream peek isDigit) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   982
                    len := Integer readFrom:formatStream onError:[ error value: 'format error; invalid length' ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   983
                ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   984
                (formatStream peek == $() ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   985
                    formatStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   986
                    format := formatStream upTo:$).
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   987
                ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   988
                    (formatStream peek == ${) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   989
                        formatStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   990
                        format := formatStream upTo:$}.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   991
                    ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   992
                        (formatStream peek isLetter) ifTrue:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   993
                            format := formatStream nextAlphaNumericWord.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   994
                        ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   995
                            error value:'unhandled format:',formatStream peek
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   996
                        ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   997
                    ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   998
                ].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
   999
                itemHandler value:format.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
  1000
            ] ifFalse:[
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
  1001
                inStream peek = fChar ifFalse:[^ error value: 'format error; ',fChar,' expcected'].
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
  1002
                inStream next.
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
  1003
            ]
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
  1004
        ].
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1005
    ].
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1006
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1007
    year isNil ifTrue:[
18441
dc7abfccf547 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17465
diff changeset
  1008
        year := (now := Timestamp now) year
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1009
    ].
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1010
    
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1011
    dayOfYear notNil ifTrue:[
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1012
        monthAndDay := Date monthAndDayFromDayInYear:dayOfYear forYear:year.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1013
        month := (monthAndDay at:1).
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1014
        day := (monthAndDay at:2).  
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1015
    ].
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  1016
    
18451
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
  1017
    ^ (self 
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
  1018
        year:year month:month day:day 
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
  1019
        hour:(hour ? 0) minute:(minute ? 0) second:(second ? 0) millisecond:millisecond) 
b5c5d8653dc8 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18449
diff changeset
  1020
            + utcOffset
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1021
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1022
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1023
     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
  1024
     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
  1025
     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
  1026
     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
  1027
     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
  1028
     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
  1029
     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
  1030
     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
  1031
     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
  1032
     Timestamp readFrom:'2015103' format:'%4y%3dayOfYear' onError:[self halt]
19923
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1033
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1034
     Timestamp readFrom:'20-2-1995 13:11:06.999' format:'%day-%month-%year %h:%m:%s.%i' language:nil onError:[self halt]
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1035
     Timestamp readFrom:'20-2-1995 13:11:06.100' format:'%day-%month-%year %h:%m:%s.%i' language:nil onError:[self halt]
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1036
     Timestamp readFrom:'20-2-1995 13:11:06.010' format:'%day-%month-%year %h:%m:%s.%i' language:nil onError:[self halt]
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1037
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1038
     Timestamp readFrom:'20-2-1995 13:11:06.1' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self halt]
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1039
     Timestamp readFrom:'20-2-1995 13:11:06.01' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self halt]
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1040
     Timestamp readFrom:'20-2-1995 13:11:06.001' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self halt]
93c1e5c6461d #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19917
diff changeset
  1041
     Timestamp readFrom:'20-2-1995 13:11:06.12345' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self halt]
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1042
    "
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1043
!
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1044
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1045
readFrom:aStringOrStream onError:exceptionBlock
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1046
    "return a new Timestamp, reading a printed representation from aStream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1047
     The string is interpreted as 24 hour format, as printed.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1048
     Notice, that this is not the storeString format and
4898
a7a32af11523 oops - reading was wrong
Claus Gittinger <cg@exept.de>
parents: 4843
diff changeset
  1049
     is different from the format expected by readFrom:.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1050
     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
  1051
     or iso8601 (if the first integer is >31).
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1052
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1053
     Please consider using a standard format, such as iso8601."
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1054
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1055
    |stream newTime|
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1056
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1057
    stream := aStringOrStream readStream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1058
7092
630807cd320f Convert Object>>errorSignal -> Error
Stefan Vogel <sv@exept.de>
parents: 7058
diff changeset
  1059
    Error handle:[:ex |
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1060
	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
  1061
    ] do:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1062
	newTime := self basicReadFrom:stream.
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1063
    ].
3995
777470826394 no need for another error-handler blcok in #readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 3510
diff changeset
  1064
    ^ newTime
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1065
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1066
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1067
     Timestamp readFrom:'20-2-1995 13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1068
     Timestamp readFrom:'20-2-1995 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1069
     Timestamp readFrom:'20-2-2001 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1070
     Timestamp readFrom:'20-2-1995 13:11:06.100'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1071
     Timestamp readFrom:'32-2-1995 13:11:06.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1072
     Timestamp readFrom:'32-foo-1995 13:11:06.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1073
     Timestamp readFrom:'20-2-1995 24:01:00.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1074
     Timestamp readFrom:'20-2-1995 24:00:01.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1075
     Timestamp readFrom:'2002-08-02 24:00:01.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1076
     Timestamp readFrom:'foo' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1077
     Timestamp readFrom:(Timestamp now storeString) onError:'wrong'
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1078
    "
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1079
4378
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
  1080
    "Modified: / 8.10.1996 / 19:25:59 / cg"
8b93493f8d56 New method to set UTC time.
Stefan Vogel <sv@exept.de>
parents: 3995
diff changeset
  1081
    "Modified: / 13.7.1999 / 12:31:14 / stefan"
2311
88b035dd471a New Method: #secondsSince1970.
Stefan Vogel <sv@exept.de>
parents: 1701
diff changeset
  1082
!
88b035dd471a New Method: #secondsSince1970.
Stefan Vogel <sv@exept.de>
parents: 1701
diff changeset
  1083
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1084
readGeneralizedFrom:aStringOrStream
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1085
    "return a new Timestamp, reading a printed representation from aStream.
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1086
     The format read here is either
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1087
        yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1088
     or:
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1089
        yyyy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1090
     The string is interpreted as 24 hour format, as printed.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1091
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1092
     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
  1093
     so read this before changing anything here.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1094
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1095
     New applications should consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1096
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1097
     Notice, that this is not the storeString format and
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1098
     is different from the format expected by readFrom:.
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1099
    "
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1100
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1101
    ^ self
19897
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1102
        readGeneralizedFrom:aStringOrStream
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1103
        short:false
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1104
        onError:[
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1105
            self conversionErrorSignal raiseWith:aStringOrStream errorString:' - Timestamp GeneralizedTime format error'
cb8cea59de5c #QUALITY by stefan
Stefan Vogel <sv@exept.de>
parents: 19771
diff changeset
  1106
        ].
9620
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1107
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1108
    "Created: / 22-08-2006 / 16:05:55 / cg"
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1109
!
85969e75395d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9619
diff changeset
  1110
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1111
readGeneralizedFrom:aStringOrStream onError:exceptionBlock
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1112
    "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
  1113
     The format read here is either
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1114
	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
  1115
     or:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1116
	yyyy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1117
     The string is interpreted as 24 hour format, as printed.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1118
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1119
     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
  1120
     so read this before changing anything here.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1121
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1122
     New applications should consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1123
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1124
     Notice, that this is not the storeString format and
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1125
     is different from the format expected by readFrom:.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1126
    "
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1127
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1128
    ^ self readGeneralizedFrom:aStringOrStream short:false onError:exceptionBlock
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1129
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1130
    "
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1131
     |s|
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1132
     s := '' writeStream.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1133
     Timestamp now printGeneralizedOn:s.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1134
     Timestamp readGeneralizedFrom:s contents onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1135
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1136
 Daylight saving time:
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
     Timestamp readGeneralizedFrom:'20000718120000Z' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1139
     Timestamp readGeneralizedFrom:'20000718120000+0200' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1140
     Timestamp readGeneralizedFrom:'20000718120000+0300' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1141
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1142
 No daylight saving time:
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1143
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1144
     Timestamp readGeneralizedFrom:'20000202120000Z' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1145
     Timestamp readGeneralizedFrom:'20000202120000+0100' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1146
     Timestamp readGeneralizedFrom:'20000202120000+0200' onError:[]
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1147
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1148
     Timestamp readGeneralizedFrom:'19950220131106' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1149
     Timestamp readGeneralizedFrom:'199502201311' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1150
     Timestamp readGeneralizedFrom:'19950220131106.100' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1151
     Timestamp readGeneralizedFrom:'19950232131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1152
     Timestamp readGeneralizedFrom:'19950fo2131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1153
     Timestamp readGeneralizedFrom:'foo' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1154
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1155
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00' onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1156
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1157
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100 +0100' onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1158
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 -0100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1159
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 +0000' onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1160
    "
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1161
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1162
    "Modified: / 13-07-1999 / 12:31:14 / stefan"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1163
    "Modified: / 22-08-2006 / 12:30:11 / cg"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1164
!
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1165
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1166
readGeneralizedFrom:aStringOrStream short:shortFormat onError:exceptionBlock
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1167
    "return a new Timestamp, reading a printed representation from aStream.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1168
     The long format read here is either
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1169
            yyyymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1170
        or:
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1171
            yyyy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1172
     The (not recommended) short forms are:
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1173
            yymmddHHMMSS.iii+uuuu, which is the ASN1 GeneralizedTime format.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1174
        or:
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1175
            yy-mm-dd HH:MM:SS.iii +uuuu.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1176
     The string is interpreted as 24 hour format, as printed.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1177
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1178
     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
  1179
     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
  1180
     The short form is no longer recommended.
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1181
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1182
     New applications should consider using a standard format, such as iso8601.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1183
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1184
     Notice, that this is not the storeString format and
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1185
     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
  1186
    "
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1187
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1188
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
  1189
    ^ [
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1190
        |newTime str day month year hour min sec millis c|
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1191
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1192
        sec := millis := 0.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1193
        str := aStringOrStream readStream.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1194
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1195
        shortFormat ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1196
            year := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1197
            year < 50 ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1198
                year := year + 2000.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1199
            ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1200
                year := year + 1900.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1201
            ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1202
        ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1203
            year := Integer readFrom:(str next:4).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1204
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1205
        str peek == $- ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1206
        month := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1207
        (month between:1 and:12) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1208
        str peek == $- ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1209
        day := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1210
        (day between:1 and:31) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1211
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1212
        str skipSeparators.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1213
        hour:= Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1214
        (hour between:0 and:24) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1215
        str peek == $: ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1216
        min:= Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1217
        (min between:0 and:59) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1218
        str atEnd ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1219
            str peek == $: ifTrue:[ str next].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1220
            sec := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1221
            (sec between:0 and:59) ifFalse:[^ exceptionBlock value].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1222
            str atEnd ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1223
                str peek == $. ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1224
                    str next.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1225
                    millis := Integer readFrom:str.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1226
                ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1227
                str skipSeparators.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1228
            ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1229
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1230
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1231
        str atEnd ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1232
            "/ this is local time
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1233
            newTime := self year:year month:month day:day
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1234
                            hour:hour minute:min second:sec millisecond:millis.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1235
        ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1236
            c := str next.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1237
            c ~~ $Z ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1238
                |tzh tzmin|
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1239
                tzh := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1240
                tzmin := Integer readFrom:(str next:2).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1241
                c == $+ ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1242
                    "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
  1243
                    hour := hour - tzh.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1244
                    min := min - tzmin.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1245
                ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1246
                    c == $- ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1247
                        "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
  1248
                        hour := hour + tzh.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1249
                        min := min + tzmin.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1250
                    ] ifFalse:exceptionBlock
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1251
                ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1252
            ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1253
            "this is UTC time"
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1254
            newTime := self UTCYear:year month:month day:day
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1255
                              hour:hour minute:min second:sec millisecond:millis.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1256
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  1257
        newTime
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6047
diff changeset
  1258
    ] on:Error do:exceptionBlock.
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1259
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1260
    "
5656
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
  1261
     |s|
dbc52ea02716 Fix UTC Time w.r.t. Daylight saving time.
Stefan Vogel <sv@exept.de>
parents: 5572
diff changeset
  1262
     s := '' writeStream.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1263
     Timestamp now printGeneralizedOn:s.
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1264
     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
  1265
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1266
     Timestamp readGeneralizedFrom:'20080718120000+0300' short:false onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1267
     Timestamp readGeneralizedFrom:'080718120000+0300' short:true onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1268
     Timestamp readGeneralizedFrom:'990718120000+0300' short:true onError:[]
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  1269
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1270
 Daylight saving time:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1271
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1272
     Timestamp readGeneralizedFrom:'20000718120000Z' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1273
     Timestamp readGeneralizedFrom:'20000718120000+0200' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1274
     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
  1275
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1276
 No daylight saving time:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1277
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1278
     Timestamp readGeneralizedFrom:'20000202120000Z' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1279
     Timestamp readGeneralizedFrom:'20000202120000+0100' onError:[]
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  1280
     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
  1281
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1282
     Timestamp readGeneralizedFrom:'19950220131106' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1283
     Timestamp readGeneralizedFrom:'199502201311' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1284
     Timestamp readGeneralizedFrom:'19950220131106.100' onError:[]
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1285
     Timestamp readGeneralizedFrom:'19950232131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1286
     Timestamp readGeneralizedFrom:'19950fo2131106.100' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1287
     Timestamp readGeneralizedFrom:'foo' onError:'wrong'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1288
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1289
     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
  1290
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00.100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1291
     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
  1292
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 -0100' onError:[]
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1293
     Timestamp readGeneralizedFrom:'2000-02-02 12:00:00 +0000' onError:[]
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1294
    "
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1295
9619
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1296
    "Modified: / 13-07-1999 / 12:31:14 / stefan"
6f1fc553757f skip dashes and colons in readGeneralizedFrom
Claus Gittinger <cg@exept.de>
parents: 9449
diff changeset
  1297
    "Modified: / 22-08-2006 / 12:30:11 / cg"
5292
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1298
!
a3936f79327b Fix #readGeneralizedFrom:onError:
Stefan Vogel <sv@exept.de>
parents: 5291
diff changeset
  1299
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1300
readISO8601From:aStringOrStream
21388
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1301
    <resource: #obsolete>
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1302
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1303
    ^ self readIso8601FormatFrom:aStringOrStream
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1304
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1305
    "Created: / 16-06-2005 / 16:13:36 / masca"
21388
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1306
    "Modified: / 09-02-2017 / 10:04:53 / stefan"
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1307
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1308
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1309
readISO8601From:aStringOrStream onError:exceptionValue
21388
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1310
    <resource: #obsolete>
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1311
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1312
    ^ self readIso8601FormatFrom:aStringOrStream onError:exceptionValue
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1313
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1314
    "Modified: / 09-02-2017 / 10:05:56 / stefan"
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1315
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1316
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1317
readIso8601FormatFrom:aStringOrStream
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1318
    "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
  1319
     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
  1320
     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
  1321
     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
  1322
     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
  1323
     Of course, a 24 hour clock is used.
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1324
     On error, raise an exception.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1325
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1326
     Please use this format for all external representations - it's the standard."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1327
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1328
    "changed to use the new reader"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1329
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1330
    ^ TimestampISO8601Builder read:aStringOrStream withClass:self
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1331
"/    ^ self
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1332
"/        readIso8601FormatFrom:aStringOrStream yearAlreadyRead:nil
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1333
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1334
    "
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1335
     Timestamp readIso8601FormatFrom:'20141106T123843.299Z'
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1336
     Timestamp readIso8601FormatFrom:'20141106T123843.299'
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1337
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1338
     Timestamp readIso8601FormatFrom:'1995-02-20T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1339
     Timestamp readIso8601FormatFrom:'1995-02T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1340
     Timestamp readIso8601FormatFrom:'1995T13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1341
     Timestamp readIso8601FormatFrom:'1995T13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1342
     Timestamp readIso8601FormatFrom:'1995T13'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1343
     Timestamp readIso8601FormatFrom:'1995'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1344
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1345
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11:06'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1346
     Timestamp readIso8601FormatFrom:'1995-02-20 13:11'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1347
     Timestamp readIso8601FormatFrom:'1995-02-20 13'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1348
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1349
     Timestamp readIso8601FormatFrom:'20141106T122831.894Z'
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  1350
6684
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1351
   24 is allowed with ISO, and is 00:00 of the next day:
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1352
     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
  1353
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1354
    "
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1355
!
1f4d15ab7c4c default printString is now iso format.
Claus Gittinger <cg@exept.de>
parents: 6634
diff changeset
  1356
8432
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1357
readIso8601FormatFrom:aStringOrStream onError:exceptionValue
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1358
    "return a new Timestamp, reading an iso8601 UTC representation from aStream.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1359
     Missing month/day values are replaced with 1; i.e. 1999T24:00
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1360
     is the same as 1999-01-01T24:00:00.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1361
     Missing minute, second and ms values are replaced with 0;
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1362
     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
  1363
     Of course, a 24 hour clock is used.
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1364
     On error, raise an exception.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1365
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1366
     Please use this format for all external representations - it's the standard."
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
    "/ changed to use the new reader
21388
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1369
    ^ [
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1370
        TimestampISO8601Builder read:aStringOrStream withClass:self
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1371
    ] on:ConversionError do:exceptionValue.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1372
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1373
"/    ^ self
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1374
"/        readIso8601FormatFrom:aStringOrStream
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1375
"/        yearAlreadyRead:nil
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1376
"/        onError:exceptionValue
21388
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1377
c2cb27ae6231 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 21264
diff changeset
  1378
    "Modified: / 09-02-2017 / 10:02:03 / stefan"
8432
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1379
!
c6919af01ed6 + readFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 8414
diff changeset
  1380
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1381
readRFC1123FormatFrom:rfc1123String onError:exceptionBlock
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1382
    "please use this only for http-requests.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1383
     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
  1384
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1385
     All HTTP/1.0 date/time stamps must be represented in Universal Time (UT),
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1386
     also known as Greenwich Mean Time (GMT), without exception.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1387
     This is indicated in the first two formats by the inclusion of
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1388
     'GMT' as the three-letter abbreviation for time zone,
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1389
     and should be assumed when reading the asctime format.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1390
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1391
     HTTP-date      = rfc1123-date | rfc850-date | asctime-date
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1392
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1393
     rfc1123-date   = wkday ',' SP date1 SP time SP 'GMT'
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1394
     rfc850-date    = weekday ',' SP date2 SP time SP 'GMT'
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1395
     asctime-date   = wkday SP date3 SP time SP 4DIGIT
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1396
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1397
     date1          = 2DIGIT SP month SP 4DIGIT
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1398
                      ; day month year (e.g., 02 Jun 1982)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1399
     date2          = 2DIGIT '-' month '-' 2DIGIT
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1400
                      ; day-month-year (e.g., 02-Jun-82)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1401
     date3          = month SP ( 2DIGIT | ( SP 1DIGIT ))
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1402
                      ; month day (e.g., Jun  2)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1403
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1404
     time           = 2DIGIT ':' 2DIGIT ':' 2DIGIT
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1405
                      ; 00:00:00 - 23:59:59
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1406
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1407
     wkday          = 'Mon' | 'Tue' | 'Wed'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1408
                    | 'Thu' | 'Fri' | 'Sat' | 'Sun'
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1409
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1410
     weekday        = 'Monday' | 'Tuesday' | 'Wednesday'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1411
                    | 'Thursday' | 'Friday' | 'Saturday' | 'Sunday'
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1412
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1413
     month          = 'Jan' | 'Feb' | 'Mar' | 'Apr'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1414
                    | 'May' | 'Jun' | 'Jul' | 'Aug'
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1415
                    | 'Sep' | 'Oct' | 'Nov' | 'Dec'
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1416
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1417
     Mon, 17 Aug 2009 11:11:15 GMT
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1418
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1419
     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
  1420
     thus, this also supports:
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1421
         Mon, 17 Aug 2009 11:11:15 +xxxx
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1422
         Mon, 17 Aug 2009 11:11:15 -xxxx
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1423
     and:
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1424
         Mon, 17 Aug 2009 11:11:15 PST
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  1425
    "
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1426
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1427
    |parts indexModifier utcOffsetString utcOffset day year time monthName month|
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1428
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1429
    rfc1123String isEmptyOrNil ifTrue:[^ exceptionBlock value].
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1430
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1431
    parts := rfc1123String asCollectionOfSubstringsSeparatedBy:Character space.
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1432
    parts size == 6 ifTrue:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1433
        indexModifier := 0.
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1434
    ] ifFalse:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1435
        parts size == 5 ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1436
            indexModifier := -1.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1437
        ] ifFalse:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1438
            ^ exceptionBlock value
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1439
        ].
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1440
    ].
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1441
11862
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1442
    day := Integer readFrom:(parts at:2 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1443
    year := Integer readFrom:(parts at:4 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1444
    time := Time readFrom:(parts at:5 + indexModifier) onError:[^ exceptionBlock].
9c314f3a40df *** empty log message ***
sr
parents: 11857
diff changeset
  1445
    monthName := parts at:3 + indexModifier.
11847
5c7ecb05e744 *** empty log message ***
sr
parents: 11177
diff changeset
  1446
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1447
    month := Date indexOfMonth:monthName language:#en.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1448
    month = 0 ifTrue:[^ exceptionBlock value].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1449
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1450
    utcOffsetString := parts at:6 + indexModifier ifAbsent:nil.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1451
    utcOffset := self utcOffsetFrom:utcOffsetString.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1452
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1453
    (utcOffset isNil or:[utcOffset = 0]) ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1454
        ^ 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
  1455
    ].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1456
    ^ TZTimestamp new 
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1457
            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
  1458
            utcOffset:utcOffset;
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1459
            addSeconds:utcOffset.
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1460
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1461
    "
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1462
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 GMT' onError:nil
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1463
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 UTC' onError:nil
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1464
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 PST' onError:nil
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1465
     self readRFC1123FormatFrom:'Mon, 17 Aug 2009 11:11:15 PDT' onError:nil
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1466
     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
  1467
     self readRFC1123FormatFrom:'17 Aug 2009 11:11:15 +0100' onError:nil
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1468
    "
13085
ee5674e04bd6 changed: #readRFC1123FormatFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 12939
diff changeset
  1469
ee5674e04bd6 changed: #readRFC1123FormatFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 12939
diff changeset
  1470
    "Modified: / 05-10-2010 / 16:05:32 / cg"
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1471
!
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1472
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1473
timezoneInfo
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1474
    "return a table containing timezone information.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1475
     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
  1476
     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
  1477
     representation, instead of using names.
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1478
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1479
     As this is searched for when reverse converting from utcOffset to TZName"
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1480
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1481
    "/ the table below can be customized via a setter,
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1482
    "/ if an application knows better 
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1483
    "/ (reading a system timeZone table, or limiting the table to military/non-military names only, for example)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1484
    
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1485
    TimeZoneInfo notNil ifTrue:[^ TimeZoneInfo].
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1486
    
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1487
    "/ table is name, utcOffset(minutes), DST-flag, startDay, endDay
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1488
    ^ #(
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1489
            'Z'     0   false          "/ zulu
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1490
            'UTC'   0   false    
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1491
            'GMT'   0   false    
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1492
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1493
            "/ US
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1494
            'HAST' -600 false          "/ hawai standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1495
            'AKST' -540 false          "/ alaska standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1496
            'YST'  -540 false          "/ yukon standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1497
            'PST'  -480 false          "/ pacific standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1498
            'PT'   -480 false          "/ pacific standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1499
            'MST'  -420 false          "/ mountain standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1500
            'CST'  -360 false          "/ central standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1501
            'EST'  -300 false          "/ eastern standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1502
            'AST'  -240 false          "/ atlantic standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1503
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1504
            'NST'  -210 false          "/ new foundland standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1505
            'PMST' -180 false          "/ pierre & miquelon
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1506
            'WGT'  -180 false          "/ west greenland
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1507
            'EGT'  -60  false          "/ east greenland
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1508
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1509
            "/ europe
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1510
            'CET'   60  false          "/ central european
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1511
            'EET'   120 false          "/ east european
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1512
            'WET'   0   false          "/ west european
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1513
            "/ conflict with india!!
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1514
            "/ 'IST'   1               "/ irish standard time
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1515
            "/ 'IST'   1               "/ israel standard time
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1516
            'AZOT'   -60 false         "/ azores standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1517
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1518
            'MSK'   240 false          "/ moscow european
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1519
            'MSD'   240 false
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1520
            'BT'    240 false          "/ baghdad
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1521
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1522
            "/ pacific
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1523
            'NZST'  720 false          "/ new zealand standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1524
            'FJT'   720 false          "/ fiji
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1525
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1526
            "/ south america
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1527
            'ART'   -180 false         "/ argentina
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1528
            'BOT'   -240 false         "/ bolivia
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1529
            'BRT'   -180 false         "/ brasilia
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1530
            'CLT'   -240 false         "/ chile
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1531
            'ECT'   -300 false         "/ equador
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1532
            'PET'   -300 false         "/ peru
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1533
            'PYT'   -240 false         "/ paraguay
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1534
            'UYT'   -180 false         "/ uruguay
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1535
            'VET'   -270 false         "/ venezuela standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1536
            'VST'   -270 false         "/ venezuela standard
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1537
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1538
            "/ africa
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1539
            'CAT'   120 false          "/ central africa
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1540
            'EAT'   180 false          "/ east africa
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1541
            'SAST'  120 false          "/ south africa standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1542
            'WAT'   60 false           "/ west africa
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1543
            'WT'    0 false            "/ west sahara standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1544
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1545
            'AST'   180 false          "/ arabia
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1546
            'IRT'   210 false          "/ iran time
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1547
            'AFT'   270 false          "/ afghanistan time
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1548
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1549
            'HKT'   480 false          "/ hongkong
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1550
            'IST'   330 false          "/ india standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1551
            'ICT'   420 false          "/ indochina
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1552
            'CNST'  480 false          "/ china standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1553
            'JST'   540 false          "/ japan standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1554
            'KST'   540 false          "/ korea standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1555
            'SGT'   480 false          "/ singapore
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1556
            'MYT'   480 false          "/ malaysia
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1557
            'AWST'  480 false          "/ australian west standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1558
            'ACWST' 525 false          "/ australian central western standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1559
            'ACST'  570 false          "/ australian central standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1560
            'AEST'  600 false          "/ australian east standard
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1561
            'NFT'   690 false          "/ norfolk island, australia
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1562
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1563
            'CHAST' 765 false          "/ chatham island standard
20429
59f334459ad9 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19923
diff changeset
  1564
            'WST'   780 false          "/ west samoa - yes that's 13!!
59f334459ad9 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19923
diff changeset
  1565
            'TOT'   780 false          "/ tonga - yes that's 13!!
59f334459ad9 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19923
diff changeset
  1566
            'TKT'   780 false          "/ tokelau - yes that's 13!!
59f334459ad9 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19923
diff changeset
  1567
            'LINT'  840 false          "/ line islands - yes that's 14!!
17081
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
            "/ misc
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1570
            'IDLW' -720 false          "/ international date line west
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1571
            'IDLE'  720 false          "/ international date line east
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1572
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1573
            'MEZ'   60  false           "/ mittel europäische Zeit /  central european (german)
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1574
            'MESZ'  120 true            "/ central european summer (german)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1575
            'WESZ'  60  true            "/ west european summer (german)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1576
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1577
            'WEZ'   0   false           "/ west european (german)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1578
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1579
            'HADT'  -540 true           "/ hawaii summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1580
            'ADT'   -180 true
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1581
            'AKDT'  -540 true         "/ alaska summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1582
            'YDT'   -480 true         "/ yukon summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1583
            'PDT'   -420 true         "/ pacific daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1584
            'MDT'   -360 true         "/ mountain daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1585
            'CDT'   -300 true         "/ central daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1586
            'EDT'   -240 true         "/ eastern daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1587
            'CLST'  -180 true         "/ chile summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1588
            'NDT'   -150 true
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1589
            'PMDT'  -120 true
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1590
            'BRST'  -120 true         "/ brasilia summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1591
            'WGST'  -120 true         "/ west greenland summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1592
            'EGST'   0 true           "/ east greenland summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1593
            'AZOST'  0 true           "/ azores summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1594
            'EEST'   180 true
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1595
            'CEST'   120 true
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1596
            'WAST'   120 true         "/ west africa summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1597
            "/ 'WST'   60 true        "/ west sahara summer - conflict with west samoa
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1598
            'WEST'  60 true
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1599
            'BST'   60 true           "/ british summer time
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1600
            'IRST'  270 true          "/ iran summer time
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1601
            'AWDT'  540 true          "/ australian west daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1602
            'ACDT'  630 true          "/ australian central daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1603
            'AEDT'  660 true          "/ australian east daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1604
            'CHADT' 825 true          "/ chatham island daylight saving
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1605
            'FJST'  780 true          "/ fiji summer
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1606
            'NZDT'  780 true          "/ new zealand summer
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1607
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1608
            "/ military
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1609
            'A'     60  false          "/ alpha
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1610
            'B'     120 false          "/ bravo
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1611
            'C'     180 false          "/ charlie
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1612
            'D'     240 false          "/ delta
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1613
            'E'     300 false          "/ echo
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1614
            'F'     360 false          "/ foxtrot
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1615
            'G'     420 false          "/ golf
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1616
            'H'     480 false          "/ hotel
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1617
            'I'     540 false          "/ also called india - how misleading
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1618
            'K'     600 false          "/ kilo
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1619
            'L'     660 false          "/ lima - but not there
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1620
            'M'     720 false          "/ mike
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1621
            'N'     -60  false         "/ november (but also in other months)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1622
            'O'     -120 false         "/ oscar
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1623
            'P'     -180 false         "/ papa (not mama)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1624
            'Q'     -240 false         "/ quebec - really?
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1625
            'R'     -300 false         "/ romeo and juliet
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1626
            'S'     -360 false         "/ sierra
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1627
            'T'     -420 false         "/ tango (& not rumba)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1628
            'U'     -480 false         "/ uniform
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1629
            'V'     -540 false         "/ victor
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1630
            'W'     -600 false         "/ whiskey (scotch?)
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1631
            'X'     -660 false         "/ xray
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1632
            'Y'     -720 false         "/ yankee
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1633
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1634
        ).
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1635
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1636
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1637
utcOffsetFrom:aStringOrStream
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1638
    "return the utcOffset (in seconds) for a given time-zone name.
17172
86f49d251345 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17142
diff changeset
  1639
     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
  1640
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1641
     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
  1642
     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
  1643
     in timeStamp and OperatingSystem-timeInfo will be.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1644
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1645
     If utcOffset is negative, the local timezone is east of Greenwich.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1646
     If utcOffset is positive, the local timezone is west of Greenwich.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1647
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1648
     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
  1649
     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
  1650
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1651
    |ch offset stream|
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1652
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1653
    stream := aStringOrStream readStream.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1654
    stream skipSeparators.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1655
17079
76e263370574 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17071
diff changeset
  1656
    ch := stream peekOrNil.
76e263370574 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17071
diff changeset
  1657
    ch isNil ifTrue:[^ 0].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1658
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1659
    ch isLetter ifTrue:[
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1660
        |table tzName i minuteOffset|
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1661
        
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1662
        table := self timezoneInfo.
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1663
        tzName := stream upToElementForWhich:[:ch | ch isLetter not].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1664
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1665
        i := table indexOf:tzName.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1666
        i == 0 ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1667
            ^ nil
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1668
        ].
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1669
        minuteOffset := (table at:i+1).
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1670
        offset := minuteOffset * 60
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1671
    ] ifFalse:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1672
        |sign|
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1673
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1674
        sign := 1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1675
        ch == $- ifTrue:[
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1676
            sign := -1.
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1677
            stream next.
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1678
        ] ifFalse:[ch == $+ ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1679
            stream next.
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1680
        ] ifFalse:[
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1681
            stream skipSeparators
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1682
        ]].
17172
86f49d251345 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17142
diff changeset
  1683
        stream peekOrNil isDigit ifFalse:[^ nil].
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1684
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1685
        offset := ((stream next:2) asNumber * 60 * 60).
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1686
        ch := stream peekOrNil.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1687
        ch notNil ifTrue:[
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1688
            ch == $: ifTrue:[ stream next ].
17071
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1689
            offset := offset + ((stream next:2) asNumber * 60).
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1690
        ].
3d4803aa1b4f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17067
diff changeset
  1691
        offset := offset * sign
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1692
    ].
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1693
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  1694
    "/ 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
  1695
    ^ offset negated
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1696
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1697
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1698
     self utcOffsetFrom:'UTC'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1699
     self utcOffsetFrom:'PST'
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1700
     self utcOffsetFrom:'EST'
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1701
     self utcOffsetFrom:'CET'
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1702
     self utcOffsetFrom:'+0130'
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1703
     self utcOffsetFrom:'+01:30'
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  1704
     self utcOffsetFrom:'+1:30'
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1705
     self utcOffsetFrom:'+01'
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1706
    "
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1707
!
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1708
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1709
utcOffsetFromString:aString
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1710
    <resource: #obsolete>
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1711
    "return the utcOffset (in seconds) for a given time-zone name.
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1712
     Returns nil for invalid formats"
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1713
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  1714
    ^ self utcOffsetFrom:aString
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1715
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1716
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1717
     self utcOffsetFromString:'UTC'
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1718
     self utcOffsetFromString:'+01'
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  1719
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1720
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  1721
22337
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
  1722
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1723
!Timestamp methodsFor:'accessing'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1724
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1725
day
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1726
    "return the day-in-month of the receiver (1..31).
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  1727
     For compatibility, use instances of Date for this."
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1728
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1729
    ^ self asDate day.
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  1730
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1731
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1732
     Timestamp now day
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1733
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1734
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1735
    "Modified: 1.7.1996 / 15:23:02 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1736
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1737
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1738
dayInWeek
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1739
    "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
  1740
     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
  1741
     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
  1742
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1743
    ^ self asDate dayInWeek
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1744
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1745
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1746
     Timestamp now dayInWeek
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1747
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1748
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1749
    "Modified: 2.7.1996 / 09:20:32 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1750
    "Created: 2.7.1996 / 09:35:48 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1751
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1752
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1753
dayInYear
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1754
    "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
  1755
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1756
    ^ self asDate dayInYear
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1757
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1758
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1759
     Timestamp now dayInYear
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1760
     (Timestamp newDay:184 year:1996) dayInYear
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1761
    "
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1762
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1763
    "Modified: 2.7.1996 / 10:21:02 / cg"
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1764
!
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1765
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1766
dayOfMonth
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1767
    "Answer the day of the month represented by me.
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1768
     Same as day; for ST-80 compatibility."
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1769
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1770
    ^ self asDate dayOfMonth
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1771
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1772
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1773
     Timestamp now dayOfMonth
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1774
     (Timestamp newDay:184 year:1996) dayOfMonth
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1775
    "
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1776
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1777
    "Created: / 20-01-2011 / 12:26:54 / cg"
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1778
!
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1779
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1780
dayOfWeek
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1781
    "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
  1782
     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
  1783
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1784
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1785
    ^ self asDate dayOfWeek
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1786
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1787
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1788
     Timestamp now dayOfWeek
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1789
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1790
!
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  1791
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1792
dayOfWeekName
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1793
    "return the week-day of the receiver as a string.
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1794
     The returned string depends on the language setting.
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1795
     Expect things like 'monday', 'tuesday' ..."
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1796
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1797
    ^ self asDate dayOfWeekName
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1798
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1799
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1800
     Timestamp now dayOfWeekName
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1801
     (Timestamp newDay:184 year:1996) dayOfWeekName
13225
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1802
    "
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1803
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1804
    "Created: / 20-01-2011 / 12:28:46 / cg"
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1805
!
Claus Gittinger <cg@exept.de>
parents: 13200
diff changeset
  1806
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1807
hour
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1808
    "return the hour (0..23).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1809
     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
  1810
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1811
    ^ self hours
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
    "Created: 1.7.1996 / 15:14:50 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1814
    "Modified: 1.7.1996 / 15:15:32 / cg"
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1815
!
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  1816
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1817
hours
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1818
    "return the hours (0..23)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1819
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1820
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1821
	^ self asTime hours.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1822
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1823
    ^ self timeInfo hours
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  1824
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1825
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1826
     Timestamp now hours
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1827
    "
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1828
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1829
    "Modified: 2.7.1996 / 09:20:32 / cg"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1830
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1831
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1832
millisecond
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1833
    "return the millisecond (0..999).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1834
     ST-80 Timestamp compatibility (I'd prefer the name #milliseconds)."
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1835
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1836
    ^ self milliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1837
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1838
    "Created: 1.7.1996 / 15:14:50 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1839
    "Modified: 1.7.1996 / 15:15:24 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1840
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1841
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1842
milliseconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1843
    "return the milliseconds (0..999)"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1844
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1845
    ^ osTime \\ 1000.
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1846
"/    ^ self timeInfo milliseconds
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1847
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1848
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1849
     Timestamp now milliseconds
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1850
    "
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1851
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1852
    "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
  1853
    "Modified: 2.7.1996 / 09:21:41 / cg"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1854
!
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
minute
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1857
    "return the minute (0..59).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1858
     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
  1859
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1860
    ^ self minutes
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1861
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1862
    "Created: 1.7.1996 / 15:14:29 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1863
    "Modified: 1.7.1996 / 15:15:37 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1864
!
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1865
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1866
minutes
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1867
    "return the minutes (0..59)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1868
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1869
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1870
	^ self asTime minutes.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1871
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1872
    ^ self timeInfo minutes
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1873
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1874
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1875
     Timestamp now minutes
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1876
    "
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1877
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1878
    "Modified: 2.7.1996 / 09:20:49 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1879
!
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1880
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1881
month
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1882
    "return the month of the receiver (1..12).
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1883
     For compatibility, use instances of Date for this."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1884
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1885
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1886
	^ self asDate month.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1887
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1888
    ^ self timeInfo month
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1889
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1890
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  1891
     Timestamp now month
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1892
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1893
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1894
    "Modified: 1.7.1996 / 15:23:05 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1895
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1896
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1897
monthIndex
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1898
    "return the month of the receiver (1..12).
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1899
     For compatibility"
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1900
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1901
    ^ self asDate monthIndex.
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1902
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1903
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1904
     Timestamp now monthIndex
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1905
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1906
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  1907
8286
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1908
osTime
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1909
    "get the internal representation of the time.
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1910
     Warning: do not depend on the value (unix vs. win32 - differences)"
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1911
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1912
    ^ osTime
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1913
!
d4c7d4d34b8b osTime getter
werner
parents: 8271
diff changeset
  1914
4807
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1915
osTime:aTime
5726
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  1916
    "set the internal representation of the time"
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  1917
4807
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1918
    osTime := aTime.
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1919
!
Claus Gittinger <cg@exept.de>
parents: 4679
diff changeset
  1920
22613
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1921
picoseconds
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1922
    "return the picoseconds (0..1000*1000*1000)"
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1923
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1924
    ^ picoSeconds ? 0.
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1925
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1926
    "
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1927
     Timestamp now picoseconds
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1928
    "
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1929
!
875197e3bb08 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22337
diff changeset
  1930
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1931
second
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1932
    "return the second (0..59).
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1933
     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
  1934
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1935
    ^ self seconds
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1936
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1937
    "Created: 1.7.1996 / 15:14:19 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  1938
    "Modified: 1.7.1996 / 15:15:49 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1939
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1940
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1941
seconds
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1942
    "return the seconds (0..59)"
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1943
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1944
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  1945
	^ self asTime seconds.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  1946
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1947
    ^ self timeInfo seconds
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1948
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1949
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1950
     Timestamp now seconds
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1951
    "
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  1952
1513
a4b4c4ce039c added dayInYear & dayInWeek for Date compatibility
Claus Gittinger <cg@exept.de>
parents: 1501
diff changeset
  1953
    "Modified: 2.7.1996 / 09:20:54 / cg"
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1954
!
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  1955
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1956
timeZoneDeltaInMinutes
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1957
    "answer the number of minutes between local time and utc time.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1958
     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
  1959
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1960
    ^ self utcOffset negated // 60
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1961
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1962
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  1963
     Timestamp now timeZoneDeltaInMinutes
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1964
     (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
  1965
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1966
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1967
    "Modified: 20.12.1995 / 17:28:49 / stefan"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  1968
    "Modified: 1.7.1996 / 15:21:29 / cg"
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1969
!
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  1970
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1971
timeZoneName
16990
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1972
    "find the first zone which is in this range.
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1973
     This is a bit naive, but should be sufficient in most cases
749d20608f8d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16989
diff changeset
  1974
     (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
  1975
      of that particular year...)"
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1976
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1977
    |myUtcOffset iAmDST bestNonDST|
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1978
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1979
    myUtcOffset := self utcOffset negated.
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1980
    iAmDST := self timeInfo dst ? false.
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1981
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1982
    bestNonDST := nil.
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1983
    self class timezoneInfo inGroupsOf:3 do:[:name :offsetInMinutes :isDST|
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1984
        |thisUtcOffset|
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1985
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1986
        thisUtcOffset := offsetInMinutes * 60.
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1987
        thisUtcOffset = myUtcOffset ifTrue:[
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1988
            isDST == iAmDST ifTrue:[^ name ].
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1989
        ].    
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1990
        bestNonDST := name.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1991
    ].
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1992
    bestNonDST notNil ifTrue:[^ bestNonDST].
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1993
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  1994
    "/ nothing found - construct a standard offset string
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1995
    ^ ((self utcOffset > 0) ifTrue:['+'] ifFalse:['-'])
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1996
      , ((myUtcOffset abs // 60) printStringLeftPaddedTo:2 with:$0)
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1997
      , ((myUtcOffset abs \\ 60) printStringLeftPaddedTo:2 with:$0)
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1998
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  1999
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2000
     Timestamp now timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2001
     UtcTimestamp now timeZoneName
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2002
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  2003
     (Timestamp now asTZTimestampInZone:'MEZ') timeZoneName - will find international name
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2004
     (Timestamp now asTZTimestampInZone:'EST') timeZoneName
19624
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  2005
     (Timestamp now asTZTimestampInZone:'IDLE') timeZoneName - sorry - will find 'NZST'
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  2006
     (Timestamp now asTZTimestampInZone:'BRST') timeZoneName - sorry: will find military 'O'
608491d45d05 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 18886
diff changeset
  2007
     (Timestamp now asTZTimestampInZone:'MYT') timeZoneName - will find hongkong; same timezone
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2008
    "
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2009
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2010
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2011
utcOffset
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  2012
    "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
  2013
     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
  2014
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  2015
     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
  2016
     Subtract utcOffset to convert from UTC time to local time.
8886
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  2017
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  2018
     If utcOffset is negative, the local timezone is east of Greenwich.
89cb1f2de1c7 Comment for #utcOffset
Stefan Vogel <sv@exept.de>
parents: 8822
diff changeset
  2019
     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
  2020
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2021
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2022
	"/ fake an info which the OS cannot give me
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2023
	"/ 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
  2024
	"/ Take the utcOffset without DST
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2025
	^ self utcOffsetWithoutDst.
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2026
    ].
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2027
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2028
    ^ (OperatingSystem computeTimeAndDateFrom:osTime) utcOffset
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2029
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2030
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2031
     Timestamp now utcOffset
17031
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2032
     (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
  2033
     (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
  2034
     (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
  2035
     (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
  2036
    "
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2037
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2038
    "Modified: 20.12.1995 / 17:28:49 / stefan"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2039
    "Modified: 1.7.1996 / 15:21:29 / cg"
799
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2040
!
33cf42458eee New Method utcOffset
Stefan Vogel <sv@exept.de>
parents: 795
diff changeset
  2041
17031
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2042
utcOffsetWithoutDst
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2043
    "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
  2044
     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
  2045
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2046
     Add utcOffset to convert from local time to UTC time.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2047
     Subtract utcOffset to convert from UTC time to local time.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2048
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2049
     If utcOffset is negative, the local timezone is east of Greenwich.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2050
     If utcOffset is positive, the local timezone is west of Greenwich."
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2051
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2052
    |offset epochInfo|
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2053
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2054
    offset := 0.
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2055
    [
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2056
	"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
  2057
	epochInfo := OperatingSystem timeInfoFromSeconds:offset milliseconds:0 localTime:true.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2058
	offset := offset + (3600 * 24 * 90). "Add about 3 months"
17031
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2059
    ] doWhile:[epochInfo dst and:[offset < (3600 * 24 * 365) "avoid endless loop"]].
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2060
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2061
    ^ epochInfo utcOffset
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2062
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2063
    "
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2064
     Timestamp now utcOffsetWithoutDst
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2065
    "
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2066
!
d443175f7558 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17026
diff changeset
  2067
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2068
weekInYear
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2069
    "return the week number of the receiver - 1 for Jan, 1st."
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2070
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2071
    ^ Date weekInYearOf:self
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2072
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2073
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2074
     (Timestamp newDay:1 year:2000) weekInYear
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2075
     (Timestamp newDay:2 year:2000) weekInYear
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2076
     (Timestamp newDay:3 year:2000) weekInYear
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2077
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2078
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2079
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2080
weekday
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2081
    "return the week-day of the receiver as a string.
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2082
     The returned string depends on the current language setting.
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2083
     Expect things like 'monday', 'tuesday' ...
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2084
     For ST-80 compatibility"
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2085
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2086
    ^ self asDate weekday
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2087
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2088
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2089
     Timestamp now weekday
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2090
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2091
     but maybe a different day there, in the south pacific:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2092
     (Timestamp now asTZTimestampInZone:'LINT') weekday
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2093
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2094
     but maybe a different day there, in alaska:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2095
     (Timestamp now asTZTimestampInZone:'AKST') weekday
16993
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2096
    "
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2097
!
ff9bcbfea867 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16992
diff changeset
  2098
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2099
year
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2100
    "return the year of the receiver i.e. 1992.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2101
     For compatibility, use instances of Date for this."
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2102
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2103
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2104
	^ self asDate year.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2105
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2106
    ^ self timeInfo year
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2107
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2108
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2109
     Timestamp now year
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2110
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2111
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2112
    "Modified: 1.7.1996 / 15:23:08 / cg"
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2113
! !
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2114
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2115
!Timestamp methodsFor:'arithmetic'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2116
13199
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2117
ceilingSecond
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2118
    "return a timestamp which represents the next full second"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2119
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2120
    |offs|
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2121
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2122
    offs := (self milliseconds / 1000) ceiling.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2123
    ^ self class basicNew setSeconds:(self getSeconds + offs).
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2124
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2125
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2126
     |t1 t2|
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2127
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2128
     t1 := Timestamp now.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2129
     t2 := t1 ceilingSecond.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2130
     self halt
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2131
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2132
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2133
    "Created: / 08-01-2011 / 16:23:03 / cg"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2134
!
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2135
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2136
floorSecond
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2137
    "return a timestamp truncated to the last full second"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2138
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2139
    ^ self class basicNew setSeconds:(self getSeconds).
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2140
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2141
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2142
     |t1 t2|
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2143
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2144
     t1 := Timestamp now.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2145
     t2 := t1 floorSecond.
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2146
     self halt
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2147
    "
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2148
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2149
    "Created: / 08-01-2011 / 16:20:55 / cg"
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2150
!
Claus Gittinger <cg@exept.de>
parents: 13198
diff changeset
  2151
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2152
millisecondDeltaFrom:aTimestamp
3510
75824285fe74 comment
Claus Gittinger <cg@exept.de>
parents: 3479
diff changeset
  2153
    "return the delta in milliseconds between 2 absolute times.
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2154
     The argument is supposed to be BEFORE the receiver,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2155
	computes self - aTimestamp"
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2156
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2157
    ^ self getMilliseconds - (aTimestamp getMilliseconds)
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2158
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2159
    "
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2160
     |t1 t2|
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2161
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2162
     t1 := Timestamp now.
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2163
     Delay waitForSeconds:0.5.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2164
     t2 := Timestamp now.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2165
     t2 millisecondDeltaFrom:t1
2623
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2166
    "
593ab389efd1 added #millisecondDeltaFrom:
Claus Gittinger <cg@exept.de>
parents: 2311
diff changeset
  2167
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2168
    "Modified: / 10-07-2010 / 09:37:18 / cg"
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2169
!
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2170
13200
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2171
roundedToSecond
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2172
    "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
  2173
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2174
    |offs|
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2175
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2176
    offs := (self milliseconds / 1000) rounded.
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2177
    ^ self class basicNew setSeconds:(self getSeconds + offs).
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2178
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2179
    "
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2180
     |t1 t2|
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2181
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2182
     t1 := Timestamp now.
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2183
     t2 := t1 roundedToSecond.
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2184
     self halt
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2185
    "
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2186
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2187
    "Created: / 08-01-2011 / 16:24:12 / cg"
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2188
!
744f5c0783f7 added: #roundedToSecond
Claus Gittinger <cg@exept.de>
parents: 13199
diff changeset
  2189
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2190
secondDeltaFrom:aTimestamp
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2191
    "return the delta in seconds between 2 absolute times.
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2192
     The argument is supposed to be BEFORE the receiver,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2193
	computes self - aTimestamp"
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2194
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2195
    ^ self getSeconds - (aTimestamp getSeconds)
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2196
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2197
    "
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2198
     |t1 t2|
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2199
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2200
     t1 := Timestamp now.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2201
     Delay waitForSeconds:5.
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2202
     t2 := Timestamp now.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2203
     t2 secondDeltaFrom:t1
9056
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2204
    "
d284a6514312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8888
diff changeset
  2205
12939
aa4983b38cbf comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12830
diff changeset
  2206
    "Modified: / 10-07-2010 / 09:37:24 / cg"
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2207
! !
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2208
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2209
!Timestamp methodsFor:'comparing'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2210
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2211
= aTimestamp
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2212
    "return true if the argument, aTime represents the same time.
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2213
     Notice: you can compare timestamps from different timezones for representing the
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2214
     same time, because they all store their milliseconds internally as utc time"
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2215
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2216
    aTimestamp isTimestamp ifFalse:[^ false].
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2217
    ^ (self getMilliseconds = aTimestamp getMilliseconds)
1520
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2218
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2219
    "Modified: 3.7.1996 / 13:10:24 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2220
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2221
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2222
hash
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2223
    "return an integer useful for hashing on times"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2224
1520
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2225
    ^ osTime // 1000
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2226
da08f8e49e87 fixed comparing absoluteTimes
Claus Gittinger <cg@exept.de>
parents: 1513
diff changeset
  2227
    "Modified: 3.7.1996 / 13:10:52 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2228
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2229
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2230
!Timestamp methodsFor:'converting'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2231
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2232
asDate
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2233
    "return a Date object from the receiver.
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2234
     The returned date will only represent the day - not the timeOfDay.
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2235
     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
  2236
     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
  2237
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2238
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2239
	|milliDelta dayDelta|
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2240
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2241
	"/ 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
  2242
	"/ Take the utcOffset without DST
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2243
	milliDelta := osTime - (1000 * self utcOffsetWithoutDst).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2244
	dayDelta := milliDelta // (24 * 3600 * 1000).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2245
	^ Epoch asDate addDays:dayDelta.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2246
    ].
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2247
    ^ self timeInfo asDate
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2248
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2249
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2250
     Timestamp now
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2251
     Timestamp now asDate
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2252
     (Timestamp now addTime:3600) asDate
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2253
     (Timestamp now addTime:3600) asTime
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2254
     Timestamp fromSeconds:(Timestamp now asSeconds + 3600)
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2255
     (Timestamp fromSeconds:(Timestamp now asSeconds + 3600)) asDate
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2256
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2257
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2258
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2259
asLocalTimestamp
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2260
    "represent myself as a timestamp in the local timezone"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2261
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2262
    ^ self
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2263
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2264
    "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2265
     Timestamp now asUtcTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2266
     Timestamp now asUtcTimestamp asLocalTimestamp
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2267
    "
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2268
!
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2269
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2270
asTZTimestamp
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2271
    "return a timestamp which represents the very same time,
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2272
     but will represent itself as a timestamp with the local utcOffset.
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2273
     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
  2274
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2275
    ^ self asTZTimestamp:self utcOffset
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2276
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2277
    "see the different printStrings of:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2278
	 Timestamp now
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2279
     and
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2280
	 Timestamp now asTZTimestamp
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2281
    "
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2282
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2283
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2284
asTZTimestamp:utcOffset
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2285
    "return a timestamp which represents the very same time,
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2286
     but will represent itself as a timestamp with the given utcOffset"
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2287
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2288
    ^ (TZTimestamp fromOSTime:osTime) utcOffset:utcOffset
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2289
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2290
    "what is the time now in NewYork?
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2291
     Timestamp now asTZTimestamp:(Timestamp utcOffsetFrom:'EST')
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2292
     Timestamp now asTZTimestampInZone:'EST'
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2293
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2294
     what is the time now in Stuttgart?
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2295
     Timestamp now asTZTimestamp:(Timestamp utcOffsetFrom:'MEZ')
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2296
     Timestamp now asTZTimestampInZone:'MEZ'
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2297
    "
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2298
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2299
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2300
asTZTimestampInZone:timeZoneName
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2301
    "return a timestamp which represents the very same time,
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2302
     but will represent itself as a timestamp in the given timezone.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2303
     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
  2304
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2305
    |utcOffset|
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2306
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2307
    utcOffset := self class utcOffsetFrom:timeZoneName.
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2308
    utcOffset isNil ifTrue:[
17132
01e2272e7912 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17131
diff changeset
  2309
        ^ TimeConversionError raiseRequestWith:self errorString:(' - Invalid/unknown timzone: %1' bindWith:timeZoneName)
17081
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2310
    ].
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2311
410da5291dea class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17079
diff changeset
  2312
    ^ self asTZTimestamp:utcOffset
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2313
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2314
    "what is the time now in NewYork?
17133
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2315
       Timestamp now asTZTimestampInZone:'EST'
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2316
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2317
     what is the time now in Stuttgart?
17133
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2318
       Timestamp now asTZTimestampInZone:'MEZ'
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2319
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2320
     an error os raised for any unknown/invalid timezone:
397cf32b70f2 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17132
diff changeset
  2321
       Timestamp now asTZTimestampInZone:'BlaBla'
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2322
    "
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2323
!
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2324
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2325
asTime
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2326
    "return a Time object from the receiver.
16936
cf59a3abe590 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16935
diff changeset
  2327
     The returned time will only represent the timeOfDay - not the day,
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2328
     and does not include the milliseconds."
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2329
16932
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2330
    |secondDelta|
320e471e5dbc class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16930
diff changeset
  2331
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2332
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2333
	secondDelta := osTime // 1000.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2334
	"/ 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
  2335
	"/ Take the utcOffset without DST
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2336
	secondDelta := (secondDelta - self utcOffsetWithoutDst) \\ (24*3600).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2337
	^ Epoch asTime addSeconds:secondDelta.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2338
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2339
    ^ self timeInfo asTime
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2340
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2341
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2342
     Timestamp now
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2343
     Timestamp now asTime
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2344
     UtcTimestamp now asTime
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2345
     (Timestamp now addTime:3600) asTime
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2346
     (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
  2347
     (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
  2348
    "
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2349
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2350
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2351
asTimeWithMilliseconds
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2352
    "return a Time object from the receiver.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2353
     The returned time will only represent the timeOfDay - not the day,
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2354
     it will include the milliseconds."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2355
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2356
    |milliSecondDelta|
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2357
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2358
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2359
	milliSecondDelta := osTime - (self utcOffset * 1000).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2360
	^ self class epoch asTime addMilliseconds:milliSecondDelta.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2361
    ].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2362
    ^ self timeInfo asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2363
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2364
    "
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2365
     Timestamp now
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2366
     Timestamp now asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2367
     UtcTimestamp now asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2368
     (Timestamp now addTime:3600) asTime
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2369
     (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
  2370
     (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
  2371
    "
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2372
!
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2373
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2374
asTimestamp
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2375
    "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
  2376
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2377
    ^ self
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2378
!
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2379
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2380
asUTC
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2381
    ^ self asUtcTimestamp
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2382
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2383
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2384
     Timestamp now
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2385
     Timestamp now asUTC
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2386
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2387
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2388
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2389
asUtcTimestamp
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2390
    "return a timestamp which represents the very same timestamp,
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2391
     but will represent itself as a timestamp in the UTC timezone"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2392
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2393
    ^ UtcTimestamp fromOSTime:osTime
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2394
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2395
    "
11003
ffb8be9eb6ac +asLocalTimestamp
Claus Gittinger <cg@exept.de>
parents: 10736
diff changeset
  2396
     Timestamp now asUtcTimestamp
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2397
     Timestamp now asUtcTimestamp asLocalTimestamp
9402
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2398
    "
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2399
!
39ea6523196d new: #asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 9385
diff changeset
  2400
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2401
literalArrayEncoding
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2402
    "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
  2403
     can be reconstructed with #decodeAsLiteralArray.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2404
     The encoding is:
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2405
        (#Timestamp YYYYMMDDhhmmss.iiiZ)
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2406
    "
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2407
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2408
    |s|
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2409
8223
56da5d8f8bc1 replaced '' writeStream by String writeStream
Claus Gittinger <cg@exept.de>
parents: 8111
diff changeset
  2410
    s := WriteStream on:(String new:18).
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2411
    self printGeneralizedOn:s isLocal:false.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2412
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2413
    ^ Array
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2414
        with:self class name
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2415
        with:s contents
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2416
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2417
    "
9416
f57d66ea3bae Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9402
diff changeset
  2418
      Timestamp now literalArrayEncoding
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2419
        decodeAsLiteralArray
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2420
      UtcTimestamp now literalArrayEncoding
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2421
        decodeAsLiteralArray
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2422
    "
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2423
!
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2424
18886
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2425
utcOffset:anOffset
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2426
   "answer a DateTime equivalent to the receiver but offset from UTC by offset"
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2427
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2428
    ^ TZTimestamp new 
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2429
        osTime:osTime;
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2430
        utcOffset:(anOffset asTimeDuration)  
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2431
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2432
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2433
     Timestamp now  -- now as local time
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2434
     Timestamp now asTZTimestamp -- now in your local timezone
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2435
     Timestamp now asUtcTimestamp -- now in greenwich
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2436
     UtcTimestamp now -- now in greenwich
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2437
     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
  2438
     Timestamp now utcOffset:(5 hours) -- now in Eastern time
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2439
     Timestamp now asTZTimestampInZone:'EST' -- now in Eastern time
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2440
    "
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2441
!
abf121c38718 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18761
diff changeset
  2442
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2443
utcSecondsSince1901
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2444
    "return the number of seconds elapsed since Jan, 1st 1901"
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2445
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2446
"
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2447
    secondsBetween1901and1970 :=
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2448
	((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
  2449
	*  (24 * 60 * 60)
9430
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  2450
"
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2451
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2452
    ^ self utcSecondsSince1970 + 2177452800.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2453
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2454
    "
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2455
     Timestamp now utcSecondsSince1901
7006
8813a36f7645 checkin from browser
penk
parents: 7004
diff changeset
  2456
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2457
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2458
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2459
!Timestamp methodsFor:'initialization'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2460
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2461
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
  2462
    "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
  2463
     given y,m,d and h,m,s in my time."
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2464
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2465
    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
  2466
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2467
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2468
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
  2469
    "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
  2470
     given y,m,d and h,m,s in local time"
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2471
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2472
    Error handle:[:ex |
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2473
        "handler for timestamps before the epoch or after the OS representable time (2038 on current Unices).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2474
         Then, an out-of-os-range osTime is generated here manually."
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2475
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2476
        |deltaDays|
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2477
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2478
        deltaDays := self class epoch asDate subtractDate:(Date year:y month:m day:d).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2479
        "/ deltadays will be negative for dates before the epoch and positive if after.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2480
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2481
        osTime := (h * 3600) + (min * 60) + s.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2482
        osTime := osTime - (deltaDays * 24 * 3600).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2483
        osTime := osTime * 1000.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2484
        osTime := osTime + millis.
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2485
    ] do:[
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2486
        osTime := OperatingSystem
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2487
                computeOSTimeFromUTCYear:y month:m day:d
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2488
                hour:h minute:min second:s
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2489
                millisecond:millis
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2490
    ]
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2491
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2492
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2493
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
  2494
    "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
  2495
     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
  2496
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2497
    TimeConversionError handle:[:ex |
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2498
        "handler for timestamps before the epoch or after the OS representable time (2038 on current Unices).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2499
         Then, an out-of-os-range osTime is generated here manually."
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2500
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2501
        |deltaDays|
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2502
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2503
        deltaDays := self class epoch asDate subtractDate:(Date year:y month:m day:d).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2504
        "/ deltadays will be negative for dates before the epoch and positive if after.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2505
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2506
        osTime := (h * 3600) + (min * 60) + s.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2507
        osTime := osTime + self utcOffset.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2508
        osTime := osTime - (deltaDays * 24 * 3600).
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2509
        osTime := osTime * 1000.
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2510
        osTime := osTime + millis.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2511
    ] do:[
19713
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2512
        osTime := OperatingSystem
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2513
                computeOSTimeFromYear:y month:m day:d
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2514
                hour:h minute:min second:s
856279e7e3e5 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19652
diff changeset
  2515
                millisecond:millis
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2516
    ]
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2517
!
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2518
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2519
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
  2520
    "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
  2521
     given y,m,d and h,m,s in my time."
16996
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2522
28bdfa0a3f2f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16995
diff changeset
  2523
    self setOSTimeFromYear:y month:m day:d hour:h minute:min second:s millisecond:millis
19652
d61c80d72507 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19624
diff changeset
  2524
d61c80d72507 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19624
diff changeset
  2525
    "
d61c80d72507 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19624
diff changeset
  2526
     self basicNew
d61c80d72507 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19624
diff changeset
  2527
         year:2016 month:4 day:16 hour:17 minute:21 second:13 millisecond:726
d61c80d72507 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19624
diff changeset
  2528
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2529
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  2530
13541
91828a57f378 added: #differenceFromTimestamp:
Claus Gittinger <cg@exept.de>
parents: 13236
diff changeset
  2531
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2532
!Timestamp methodsFor:'printing & storing'!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2533
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  2534
addPrintBindingsTo:dict language:languageOrNil
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
  2535
    "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
  2536
     languageOrNil can only be #en or nil for the current language."
5726
be29c70156c1 comments added
Claus Gittinger <cg@exept.de>
parents: 5719
diff changeset
  2537
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2538
    |date|
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2539
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2540
    date := self asDate.
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2541
    date addPrintBindingsTo:dict language:languageOrNil.
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2542
    super addPrintBindingsTo:dict language:languageOrNil.
16928
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2543
bf6e87aa449b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16923
diff changeset
  2544
    date year == Date today year ifTrue:[
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2545
        dict at:#yearOrTime put:('%h:%m' expandPlaceholdersWith:dict).
6795
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  2546
    ].
519894240d97 more printFormats: yearOrDate (as in unix); dayPadded and monthPadded
penk
parents: 6686
diff changeset
  2547
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2548
    "
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2549
     |d|
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2550
     d := Dictionary new.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2551
     Timestamp now addPrintBindingsTo:d language:nil.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2552
     d inspect.
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2553
    "
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2554
    
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2555
    "used by:
22331
349664f7c110 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 22280
diff changeset
  2556
        Timestamp now printStringFormat:'%y-%(mon)-%d'
18447
e494a04e3283 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 18445
diff changeset
  2557
        Timestamp now printStringFormat:'%(dayOfYear)'
17003
e73801d8f0cd class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16996
diff changeset
  2558
    "
22331
349664f7c110 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 22280
diff changeset
  2559
349664f7c110 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 22280
diff changeset
  2560
    "Modified (comment): / 03-11-2017 / 10:54:30 / cg"
4843
3a4484b834dd better printing
Claus Gittinger <cg@exept.de>
parents: 4839
diff changeset
  2561
!
3a4484b834dd better printing
Claus Gittinger <cg@exept.de>
parents: 4839
diff changeset
  2562
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2563
printGeneralizedOn:aStream
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2564
    "append a representation of the receiver to aStream in a general format,
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2565
     top-down, without separators: 'yyyymmddHHMMSS.mmmZ'
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2566
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2567
     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
  2568
     so read this before changing the output format."
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2569
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2570
    ^ self printGeneralizedOn:aStream isLocal:false short:false.
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2571
!
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2572
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2573
printGeneralizedOn:aStream isLocal:isLocal
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2574
    "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
  2575
     top-down, without separators: 'yyyymmddHHMMSS.mmm+0100'
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2576
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2577
     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
  2578
     so read this before changing the output format.
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2579
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2580
     If isLocal is true, represent as local time (Local 'yyyymmddHHMMSS.mmm+0100'), 
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2581
     otherwise as UTC time (UTC 'yyyymmddHHMMSS.mmmZ')."
5379
2cf681402817 Make literal array encoding architecture independent.
Stefan Vogel <sv@exept.de>
parents: 5376
diff changeset
  2582
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2583
    self printGeneralizedOn:aStream isLocal:isLocal short:false
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2584
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2585
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2586
    "Modified: / 1.7.1996 / 15:20:59 / cg"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2587
    "Modified: / 17.1.2000 / 15:53:02 / stefan"
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2588
!
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2589
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2590
printGeneralizedOn:aStream isLocal:isLocal short:shortFormat
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2591
    "append a representation of the receiver to aStream in a general format,
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2592
     top-down, without separators;
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2593
        long format:  'yyyymmddHHMMSS.mmm+0100'
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2594
        short format: 'yymmddHHMMSS.mmm+0100'
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2595
     Using the short format is strictly discouraged!!
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2596
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2597
     This format is used for the ASN.1 GeneralizedTime and UTCTime
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2598
     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
  2599
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2600
     If isLocal is true, represent as local time (Local 'yyyymmddHHMMSS.mmm+0100'), 
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2601
     otherwise as UTC time (UTC 'yyyymmddHHMMSS.mmmZ')."
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2602
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2603
    |t off|
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2604
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2605
    isLocal ifTrue:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2606
        t := self timeInfo.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2607
        off := t utcOffset.
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2608
    ] ifFalse:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2609
        t := self asUtcTimestamp timeInfo.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2610
        off := 0.
12819
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2611
    ].
a28ce068acd8 comment/format in: #UTCYear:month:day:hour:minute:second:millisecond:
Stefan Vogel <sv@exept.de>
parents: 12729
diff changeset
  2612
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2613
    shortFormat ifTrue:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2614
        self assert:(t year between:1951 and:2049).
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2615
        (t year \\ 100) printOn:aStream leftPaddedTo:2 with:$0.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2616
    ] ifFalse:[
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2617
        t year    printOn:aStream leftPaddedTo:4 with:$0.
12166
83f638e6223d code cleanup
Claus Gittinger <cg@exept.de>
parents: 12164
diff changeset
  2618
    ].
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  2619
    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
  2620
    t day     printOn:aStream leftPaddedTo:2 with:$0.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2621
    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
  2622
    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
  2623
    t seconds printOn:aStream leftPaddedTo:2 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2624
    aStream nextPut:$..
7512
07c56e8934f4 OS returns OSTimeInfo (instead of an Array)
Claus Gittinger <cg@exept.de>
parents: 7474
diff changeset
  2625
    t milliseconds printOn:aStream leftPaddedTo:3 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2626
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2627
    (self isUtcTimestamp or:[off == 0]) ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2628
        aStream nextPut:$Z.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2629
    ] ifFalse:[ |min|
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2630
        off < 0 ifTrue:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2631
            aStream nextPut:$+.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2632
            off := off negated.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2633
        ] ifFalse:[
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2634
            aStream nextPut:$-.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2635
        ].
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2636
        min := off // 60.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2637
        min // 60 printOn:aStream leftPaddedTo:2 with:$0.
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2638
        min \\ 60 printOn:aStream leftPaddedTo:2 with:$0.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2639
    ].
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2640
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2641
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2642
     Timestamp now printGeneralizedOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2643
     Timestamp now printGeneralizedOn:Transcript isLocal:true. Transcript cr.
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2644
     (Timestamp fromSeconds:0) printGeneralizedOn:Transcript. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2645
     Time now printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2646
     Date today printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2647
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2648
     Timestamp now printGeneralizedOn:Transcript isLocal:false short:false. Transcript cr.
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2649
     Timestamp now printGeneralizedOn:Transcript isLocal:true short:false. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2650
     UtcTimestamp now printGeneralizedOn:Transcript isLocal:false short:false. Transcript cr.
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  2651
     UtcTimestamp now printGeneralizedOn:Transcript isLocal:true short:false. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2652
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2653
     Date today asTimestamp printGeneralizedOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2654
     Date today printOn:Transcript. Transcript cr.
5290
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2655
    "
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2656
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2657
    "Modified: / 1.7.1996 / 15:20:59 / cg"
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2658
    "Modified: / 17.1.2000 / 15:53:02 / stefan"
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2659
!
f26854f0f074 Add #printGeneralizedOn:
Stefan Vogel <sv@exept.de>
parents: 4930
diff changeset
  2660
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2661
printISO8601
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2662
    <resource: #obsolete>
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2663
    "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
  2664
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2665
    ^ self printStringIso8601
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2666
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2667
    "Created: / 16-06-2005 / 16:11:15 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2668
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2669
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2670
printISO8601Compressed
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2671
    <resource: #obsolete>
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2672
    "return a printString as UTC in a format like 20141017T170939Z"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2673
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2674
    ^ self printStringIso8601Compressed
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2675
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2676
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2677
     Timestamp now printISO8601Compressed
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2678
    "
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2679
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2680
    "Created: / 16-06-2005 / 16:11:31 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2681
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2682
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2683
printISO8601CompressedOn: aStream
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2684
    <resource: #obsolete>
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2685
    "print as UTC in a format like 20141017T170939Z on aStream"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2686
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2687
    self printIso8601CompressedOn: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2688
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2689
    "Created: / 16-06-2005 / 16:11:50 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2690
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2691
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2692
printISO8601On: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2693
    <resource: #obsolete>
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2694
    "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
  2695
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2696
    self printIso8601On: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2697
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2698
    "Created: / 16-06-2005 / 16:11:07 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2699
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2700
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2701
printIso8601CompressedOn: aStream
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2702
    "print as UTC in a format like 20141017T170939Z on aStream"
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2703
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2704
    TimestampISO8601Builder printCompressed: self on: aStream
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2705
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2706
    "Created: / 16-06-2005 / 16:11:50 / masca"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2707
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2708
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2709
printIso8601FormatOn:aStream
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2710
    "append the iso8601 representation of the receiver to aStream.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2711
     This format looks like:
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2712
	1999-01-01T24:00:00
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2713
     or, for zero hr:min:sec,
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2714
	1999-01-01
17049
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2715
     Of course, a 24 hour clock is used.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2716
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2717
     Timezone information (eg. Z or +0100) is added, so the reader will read as local time."
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2718
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2719
    self printIso8601FormatOn:aStream timeSeparator:$T
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2720
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2721
    "
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2722
     Timestamp now printIso8601FormatOn:Transcript. Transcript cr.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2723
     Timestamp readIso8601FormatFrom:(Timestamp now printStringIso8601Format).
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2724
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2725
     UtcTimestamp now printIso8601FormatOn:Transcript. Transcript cr.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2726
     UtcTimestamp readIso8601FormatFrom:(UtcTimestamp now printStringIso8601Format).
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2727
    "
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2728
!
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2729
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2730
printIso8601FormatOn:aStream timeSeparator:sepChar
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2731
    "append the iso8601 representation of the receiver to aStream.
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2732
     This format looks like:
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2733
	1999-01-01T24:00:00
17049
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2734
     or, for zero hr:min:sec,
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2735
	1999-01-01
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2736
     Of course, a 24 hour clock is used.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2737
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  2738
     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
  2739
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2740
    |asUTC asLocal|
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2741
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2742
    self isUtcTimestamp ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2743
	asUTC := true. asLocal := false.
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2744
    ] ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2745
	self isLocalTimestamp ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2746
	    asUTC := false. asLocal := false.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2747
	] ifFalse:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2748
	    asUTC := false. asLocal := false.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2749
	]
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2750
    ].
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2751
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2752
    Timestamp::TimestampISO8601Builder
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2753
	print:self compact:false
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2754
	asLocal:asLocal asUTC:asUTC withMilliseconds:true
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2755
	timeSeparator:sepChar
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2756
	on:aStream
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2757
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2758
"/
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2759
"/    |format|
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2760
"/
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2761
"/    format := '%(year)-%(month)-%(day)T%h:%m:%s.%i'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2762
"/    self milliseconds = 0 ifTrue:[
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2763
"/        format := '%(year)-%(month)-%(day)T%h:%m:%s'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2764
"/        self seconds = 0 ifTrue:[
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2765
"/            format := '%(year)-%(month)-%(day)T%h:%m'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2766
"/            ((self hours = 0) and:[self minutes = 0]) ifTrue:[
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2767
"/                format := '%(year)-%(month)-%(day)'.
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2768
"/            ]
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2769
"/        ]
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2770
"/    ].
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2771
"/    self printOn:aStream format:format
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2772
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2773
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2774
     Timestamp now printIso8601FormatOn:Transcript. Transcript cr.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2775
     Timestamp readIso8601FormatFrom:(Timestamp now printStringIso8601Format).
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2776
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2777
     UtcTimestamp now printIso8601FormatOn:Transcript. Transcript cr.
16920
cc4bb9fbadb4 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16919
diff changeset
  2778
     UtcTimestamp readIso8601FormatFrom:(UtcTimestamp now printStringIso8601Format).
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2779
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2780
!
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2781
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2782
printIso8601On: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2783
    "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
  2784
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2785
    TimestampISO8601Builder print: self on: aStream
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2786
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2787
    "Created: / 16-06-2005 / 16:11:07 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2788
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2789
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2790
printOn:aStream
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2791
    "append a user readable representation of the receiver to aStream.
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2792
     The format is compatible with readFromString:, but not with readFrom:."
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2793
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2794
    |asUTC asLocal|
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2795
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2796
    self isUtcTimestamp ifTrue:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2797
	asUTC := true. asLocal := false.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2798
    ] ifFalse:[
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2799
	self isLocalTimestamp ifTrue:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2800
	    asUTC := false. asLocal := true.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2801
	] ifFalse:[
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2802
	    asUTC := false. asLocal := false.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2803
	]
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2804
    ].
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2805
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2806
    Timestamp::TimestampISO8601Builder
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2807
	print:self compact:false
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2808
	asLocal:asLocal asUTC:asUTC withMilliseconds:true
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2809
	timeSeparator:(Character space)
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2810
	on:aStream
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2811
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  2812
"/    self printOn:aStream format:'%(year)-%(mon)-%(day) %h:%m:%s.%i'
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2813
"/    self printOn:aStream format:'%(Day)-%(mon)-%(year) %h:%m:%s.%i'
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2814
"/    self printOn:aStream format:'%(mon)/%(Day)/%(year) %h:%m:%s.%i'
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  2815
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  2816
    "
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2817
     |tHere tNewYork|
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2818
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2819
     Timestamp now printOn:Transcript. Transcript cr.
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  2820
     Timestamp now asUtcTimestamp printOn:Transcript. Transcript cr.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2821
     (Timestamp now asTZTimestamp:(Timestamp utcOffsetFrom:'EST')) printOn:Transcript. Transcript cr.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2822
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2823
     tHere := Timestamp now.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2824
     tNewYork := tHere asTZTimestamp:(Timestamp utcOffsetFrom:'EST').
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2825
     tHere printOn:Transcript. Transcript cr.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  2826
     tNewYork printOn:Transcript. Transcript cr.
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  2827
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2828
     (Timestamp fromSeconds:0) printOn:Transcript. Transcript cr.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2829
     Time now printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2830
     Date today printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2831
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2832
     Time now asTimestamp printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2833
     Timestamp now printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2834
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2835
     Date today asTimestamp printOn:Transcript. Transcript cr.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2836
     Date today printOn:Transcript. Transcript cr.
92
0c73b48551ac *** empty log message ***
claus
parents: 82
diff changeset
  2837
    "
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  2838
5719
cf09067dbd1d can do millisecondDelta easier
Claus Gittinger <cg@exept.de>
parents: 5678
diff changeset
  2839
    "Modified: 1.7.1996 / 15:20:59 / cg"
cf09067dbd1d can do millisecondDelta easier
Claus Gittinger <cg@exept.de>
parents: 5678
diff changeset
  2840
!
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2841
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2842
printRFC1123FormatOn:aStream
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2843
    "append the RFC1123 representation of the receiver to aStream.
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2844
     This format is used in HTTP requests and looks like:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2845
	'Fri, 04 Jul 2003 15:56:11 GMT'
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2846
     (always GMT and all names in english)"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2847
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2848
"/       HTTP-date      = rfc1123-date | rfc850-date | asctime-date
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2849
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2850
"/       rfc1123-date   = wkday "," SP date1 SP time SP "GMT"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2851
"/       rfc850-date    = weekday "," SP date2 SP time SP "GMT"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2852
"/       asctime-date   = wkday SP date3 SP time SP 4DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2853
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2854
"/       date1          = 2DIGIT SP month SP 4DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2855
"/                        ; day month year (e.g., 02 Jun 1982)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2856
"/       date2          = 2DIGIT "-" month "-" 2DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2857
"/                        ; day-month-year (e.g., 02-Jun-82)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2858
"/       date3          = month SP ( 2DIGIT | ( SP 1DIGIT ))
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2859
"/                        ; month day (e.g., Jun  2)
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2860
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2861
"/       time           = 2DIGIT ":" 2DIGIT ":" 2DIGIT
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2862
"/                        ; 00:00:00 - 23:59:59
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2863
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2864
"/       wkday          = "Mon" | "Tue" | "Wed"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2865
"/                      | "Thu" | "Fri" | "Sat" | "Sun"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2866
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2867
"/       weekday        = "Monday" | "Tuesday" | "Wednesday"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2868
"/                      | "Thursday" | "Friday" | "Saturday" | "Sunday"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2869
"/
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2870
"/       month          = "Jan" | "Feb" | "Mar" | "Apr"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2871
"/                      | "May" | "Jun" | "Jul" | "Aug"
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2872
"/                      | "Sep" | "Oct" | "Nov" | "Dec"
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2873
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2874
    |timeInfo|
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2875
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  2876
    timeInfo := self asUtcTimestamp timeInfo.
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2877
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2878
    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
  2879
	    nextPutAll:', '.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2880
    timeInfo day printOn:aStream leftPaddedTo:2 with:$0.
7671
fc0a27888051 Fix #printRFC1123FormatOn:
Stefan Vogel <sv@exept.de>
parents: 7512
diff changeset
  2881
    aStream space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2882
    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
  2883
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2884
    "/ the following is too slow for heavy use
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2885
    "/    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
  2886
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2887
    aStream nextPut:Character space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2888
    timeInfo year printOn:aStream.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2889
    aStream nextPut:Character space.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2890
    timeInfo hours printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2891
    aStream nextPut:$:.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2892
    timeInfo minutes printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2893
    aStream nextPut:$:.
7734
650ececb37bb tuning printRFC1123FormatOn
penk
parents: 7733
diff changeset
  2894
    timeInfo seconds printOn:aStream leftPaddedTo:2 with:$0.
7677
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2895
    aStream nextPutAll:' GMT'.
e2b4eb2824c9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7671
diff changeset
  2896
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2897
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2898
     String streamContents:[:s| Timestamp now printRFC1123FormatOn:s]
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2899
    "
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2900
!
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2901
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2902
printStringIso8601
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2903
    "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
  2904
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2905
    ^ TimestampISO8601Builder print: self
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2906
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2907
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2908
     Timestamp now printStringIso8601
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2909
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2910
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2911
    "Created: / 16-06-2005 / 16:11:15 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2912
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2913
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2914
printStringIso8601Compressed
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2915
    "return a printString as UTC in a format like 20141017T170939Z"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2916
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2917
    ^ TimestampISO8601Builder printCompressed: self
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2918
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2919
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2920
     Timestamp now printStringIso8601Compressed
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2921
    "
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2922
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2923
    "Created: / 16-06-2005 / 16:11:31 / masca"
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2924
!
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2925
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2926
printStringIso8601Format
16988
ce209a206018 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16986
diff changeset
  2927
    "return the Iso8601 representation of the receiver with local timezon information.
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2928
     This format looks like:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2929
	1999-01-01T24:00:00
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2930
     or, for zero hr:min:sec,
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2931
	1999-01-01
8479
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2932
     Of course, a 24 hour clock is used."
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2933
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2934
    ^ String streamContents:[:s | self printIso8601FormatOn:s]
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2935
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2936
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2937
     Timestamp now printStringIso8601Format
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2938
    "
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2939
!
3eda51fcb74c isoFormat fixes
Claus Gittinger <cg@exept.de>
parents: 8432
diff changeset
  2940
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2941
printStringRFC1123Format
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2942
    "return the RFC1123 representation of the receiver.
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2943
     This format is used in HTTP requests and looks like:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2944
	'Fri, 04 Jul 2003 15:56:11 GMT'
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2945
     (always GMT)"
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2946
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2947
    ^ String streamContents:[:s | self printRFC1123FormatOn:s]
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2948
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2949
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2950
     Timestamp now printStringRFC1123Format
7474
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2951
    "
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2952
!
e2dbf8bc10ab RFC1123 printing
Claus Gittinger <cg@exept.de>
parents: 7466
diff changeset
  2953
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2954
storeOn:aStream
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2955
    "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
  2956
     receiver via readFrom:
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2957
     Use a OS/architecture independent format"
275
a76029ddaa98 *** empty log message ***
claus
parents: 242
diff changeset
  2958
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2959
    aStream nextPut:$(;
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2960
	    nextPutAll:self storeStringClass name;
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2961
	    nextPutAll:' readIso8601FormatFrom:'''.
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2962
    self printIso8601FormatOn:aStream.
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2963
    aStream nextPutAll:''')'.
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 30
diff changeset
  2964
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2965
    "
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  2966
     Timestamp now storeString
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2967
8822
10d99a9248f2 #storeOn: stores in ISO 8601 format.
Stefan Vogel <sv@exept.de>
parents: 8797
diff changeset
  2968
     Object readFrom:(Timestamp now storeString) readStream
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2969
     Timestamp readFrom:(Timestamp now storeString) readStream
241
6f30be88e314 *** empty log message ***
claus
parents: 213
diff changeset
  2970
    "
17049
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2971
!
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2972
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2973
storeStringClass
6ddd0b99a693 class: Timestamp
ca
parents: 17031
diff changeset
  2974
    ^ self class
30
c5f5604e0c0a Initial revision
claus
parents:
diff changeset
  2975
! !
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2976
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  2977
!Timestamp methodsFor:'private'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2978
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2979
computeTimeInfo
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2980
    |d t info|
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2981
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2982
    "/ fake an info which the OS cannot give me
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2983
    d := self asDate.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2984
    t := self asTime.
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2985
    info := OperatingSystem timeInfoClass new.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  2986
    info year:d year month:d month day:d day
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2987
	 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
  2988
	 utcOffset:(self utcOffset) dst:false dayInYear:d dayInYear dayInWeek:d dayInWeek.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2989
    ^ info
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2990
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2991
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  2992
	(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
  2993
	(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
  2994
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2995
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2996
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2997
computeUtcTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  2998
    |utcTimestamp d t info|
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  2999
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3000
    "/ fake an info which the OS cannot give me
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3001
    utcTimestamp := self asUtcTimestamp.
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3002
    d := utcTimestamp asDate.
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3003
    t := utcTimestamp asTime.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3004
    info := OperatingSystem timeInfoClass new.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3005
    info year:d year month:d month day:d day
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3006
	 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
  3007
	 utcOffset:0 dst:false dayInYear:d dayInYear dayInWeek:d dayInWeek.
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3008
    ^ info
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3009
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3010
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3011
	(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
  3012
	(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
  3013
	(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
  3014
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3015
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3016
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3017
fromOSTime:anUninterpretedOSTime
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3018
    "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
  3019
     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
  3020
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3021
    osTime := anUninterpretedOSTime
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3022
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3023
    "Created: 1.7.1996 / 14:33:21 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3024
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3025
16942
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  3026
fromOSTimeWithMilliseconds:anUninterpretedOSTime
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3027
    "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
  3028
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  3029
    osTime := anUninterpretedOSTime
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  3030
!
4cf2c0a1b800 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16939
diff changeset
  3031
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3032
getMilliseconds
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3033
    "strictly private: return the milliseconds (since the epoch) in utc"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3034
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3035
    ^ osTime
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3036
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3037
    "Created: 1.7.1996 / 14:33:56 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3038
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3039
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3040
getSeconds
22280
dba489905fcc #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21999
diff changeset
  3041
    "strictly private: return the (truncated) seconds (since the epoch) in utc"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3042
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3043
    ^ osTime // 1000
22280
dba489905fcc #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21999
diff changeset
  3044
dba489905fcc #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21999
diff changeset
  3045
    "Modified (comment): / 21-09-2017 / 18:50:23 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3046
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3047
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3048
setMilliseconds:millis
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3049
    "strictly private: set the milliseconds (since the epoch)"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3050
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3051
    osTime := millis.
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3052
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3053
    "Modified: 20.12.1995 / 11:46:36 / stefan"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3054
    "Created: 1.7.1996 / 14:34:24 / cg"
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3055
!
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3056
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3057
setSeconds:secs
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3058
    "strictly private: set the seconds (since whatever)"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3059
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3060
    osTime := (secs * 1000).
795
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
  3061
ff477bad0f2d fix setSeconds:
Stefan Vogel <sv@exept.de>
parents: 699
diff changeset
  3062
    "Modified: 20.12.1995 / 11:46:36 / stefan"
1501
2589005c849d time changes
Claus Gittinger <cg@exept.de>
parents: 1306
diff changeset
  3063
    "Modified: 1.7.1996 / 14:34:10 / cg"
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3064
!
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3065
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3066
timeInfo
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3067
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3068
	"/ fake an info which the OS cannot give me
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3069
	^ self computeTimeInfo
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3070
    ].
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3071
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3072
    ^ OperatingSystem computeTimeAndDateFrom:osTime
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3073
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3074
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3075
	(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
  3076
	(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
  3077
    "
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3078
!
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3079
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3080
utcSecondsSince1970
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3081
    "return the UTC seconds since 1970"
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3082
9430
919e0cb2257c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 9416
diff changeset
  3083
    ^ self getSeconds
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3084
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3085
    "
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  3086
     Timestamp now utcSecondsSince1970
5853
bee515a21a30 added #utcSecondsSince1970
martin
parents: 5839
diff changeset
  3087
    "
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3088
!
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3089
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3090
utcTimeInfo
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3091
    (osTime between:MinOSTime and:MaxOSTime) ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3092
	"/ fake an info which the OS cannot give me
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3093
	^ self computeUtcTimeInfo
17026
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3094
    ].
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3095
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3096
    ^ OperatingSystem computeUTCTimeAndDateFrom:osTime
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3097
aa7743e9f351 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 17020
diff changeset
  3098
    "
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3099
	(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
  3100
	(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
  3101
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3102
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3103
22337
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
  3104
9a707f3b74c2 #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 22331
diff changeset
  3105
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3106
!Timestamp methodsFor:'testing'!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3107
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3108
isLocalTimestamp
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3109
    "return true, if I am a local timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3110
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3111
    ^ true
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3112
!
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3113
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3114
isTimestamp
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3115
    "return true, if I am a timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3116
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3117
    ^ true
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3118
!
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3119
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3120
isUtcTimestamp
16986
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3121
    "return true, if I am a utc timestamp"
fafb2758c9f6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16978
diff changeset
  3122
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3123
    ^ false
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3124
! !
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3125
8396
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3126
!Timestamp methodsFor:'visiting'!
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3127
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3128
acceptVisitor:aVisitor with:aParameter
16718
1af0186b3feb comment/format only
Claus Gittinger <cg@exept.de>
parents: 16610
diff changeset
  3129
    "dispatch for visitor pattern; send #visitTimestamp:with: to aVisitor."
1af0186b3feb comment/format only
Claus Gittinger <cg@exept.de>
parents: 16610
diff changeset
  3130
8396
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3131
    ^ aVisitor visitTimestamp:self with:aParameter
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3132
! !
b13503dbc53c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 8286
diff changeset
  3133
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3134
!Timestamp::TimestampBuilderAbstract methodsFor:'error reporting'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3135
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3136
malformed:aString
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3137
    TimeConversionError raiseErrorString:(' - ', aString)
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3138
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3139
    "Created: / 15-06-2005 / 15:54:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3140
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3141
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3142
!Timestamp::TimestampBuilderAbstract methodsFor:'support'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3143
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3144
addHoursAndMinutes: arrayWithHoursAndMinutes
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3145
    "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
  3146
    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
  3147
    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
  3148
    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
  3149
    one day forward or backward)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3150
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3151
    | hours minutes |
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3152
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3153
    hours := arrayWithHoursAndMinutes first.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3154
    minutes := arrayWithHoursAndMinutes second.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3155
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3156
    utcOffset := (((hours * 60) + minutes) * 60).
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3157
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3158
    minutes isZero ifFalse: [
19915
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3159
        minute := minute + minutes.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3160
        minute >= 60 ifTrue: [
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3161
            hours := hours + 1.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3162
            minute := minute - 60.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3163
        ].
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3164
        minute < 0 ifTrue: [
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3165
            hours := hours - 1.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3166
            minute := minute + 60.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3167
        ]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3168
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3169
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3170
    "Hours may get zero by time zone specification or by minutes modifications above."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3171
    hours isZero ifTrue: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3172
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3173
    "Add or subtract the hour and make date corrections if necessary."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3174
    hour := hour + hours.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3175
    hour < 0 ifTrue: [
19915
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3176
        "Oops, got to previous day, must adjust even the date."
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3177
        hour := 24 - ((hour negated) \\ 24).
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3178
        day := day - 1.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3179
        day <= 0 ifTrue: [
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3180
            "Go to previous month..."
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3181
            month := month - 1.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3182
            month <= 0 ifTrue: [year := year - 1. month := 12].
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3183
            day := self lastDayInMonth: month
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3184
        ]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3185
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3186
    hour >= 24 ifTrue: [
19915
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3187
        hour := hour \\ 24.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3188
        day := day + 1.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3189
        day > (self lastDayInMonth: month) ifTrue: [
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3190
            month := month + 1.
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3191
            month > 12 ifTrue: [year := year + 1. month := 1].
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3192
            day := 1
1c59f9b8ffc6 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19897
diff changeset
  3193
        ]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3194
    ]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3195
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3196
    "Created: / 15-06-2005 / 16:45:49 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3197
    "Modified: / 16-06-2005 / 15:04:45 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3198
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3199
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3200
dateFromDayNumber: dayInYear
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3201
    "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
  3202
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3203
    |monthAndDay|
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3204
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3205
    (dayInYear between: 1 and: 365) ifFalse: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3206
	(dayInYear = 366 and:[self leapYear: year])
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3207
	    ifFalse: [self malformed: 'Bad day number: ' , dayInYear printString]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3208
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3209
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3210
    monthAndDay := Date monthAndDayFromDayInYear:dayInYear forYear:year.
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3211
    month := monthAndDay at:1.
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3212
    day := monthAndDay at:2
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3213
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3214
    "Created: / 15-06-2005 / 11:27:35 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3215
    "Modified: / 16-06-2005 / 12:31:37 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3216
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3217
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3218
dateFromWeek: weekInteger andWeekday: dayInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3219
    "Compute the month and day. Find the first day (weekday) in the year, maybe even
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3220
    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
  3221
    with thursday (or the one containing 4.1.)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3222
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3223
    |tmpDate|
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3224
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3225
    "Check numbers. Year may be checked if it contains 53 weeks or 52 weeks only."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3226
    (dayInteger between: 1 and: 7) ifFalse: [self malformed: 'Bad weekday number: ' , dayInteger printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3227
    (weekInteger between: 1 and: 53) ifFalse: [self malformed: 'Bad week number: ' , weekInteger printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3228
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3229
    tmpDate := Date newDayInWeek:dayInteger week:weekInteger year:year.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3230
    day := tmpDate day.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3231
    month := tmpDate month.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3232
    year := tmpDate year.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3233
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3234
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3235
isAllowedDay: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3236
    "Answer whether the given day is allowed in the current month."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3237
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3238
    ^anInteger between: 1 and: (self lastDayInMonth: month)
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3239
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3240
    "Created: / 15-06-2005 / 16:22:51 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3241
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3242
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3243
lastDayInMonth: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3244
    "Answer the number of the last day of the given month in the current year."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3245
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3246
    ^ anInteger = 2
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3247
	ifTrue: [(self leapYear: year) ifTrue: [29] ifFalse: [28]]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3248
	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
  3249
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3250
    "Created: / 15-06-2005 / 17:12:31 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3251
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3252
16836
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3253
leapYear: anInteger
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3254
    ^ Date leapYear:anInteger.
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3255
!
62f28e466c23 class: Timestamp
Stefan Vogel <sv@exept.de>
parents: 16718
diff changeset
  3256
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3257
timestampWithClass:timestampClass
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3258
    "Answer the timestamp as it has been parsed."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3259
    "Notes:
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3260
     - 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
  3261
       or is a local time stamp.
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3262
     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
  3263
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3264
    (timestampClass == UtcTimestamp) ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3265
	^ UtcTimestamp
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3266
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3267
	    hour: hour minute: minute second: second millisecond: millisecond
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3268
    ].
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3269
    (timestampClass == TZTimestamp) ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3270
	"/ 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
  3271
	^ ((TZTimestamp
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3272
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3273
	    hour: hour minute: minute second: second millisecond: millisecond) utcOffset:utcOffset)
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3274
    ].
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3275
16989
de9bc5f12297 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16988
diff changeset
  3276
    (isUtcTime or:[hasTimezone and:[utcOffset == 0]]) ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3277
	^ ((timestampClass == Timestamp) ifTrue:UtcTimestamp ifFalse:timestampClass)
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3278
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3279
	    hour: hour minute: minute second: second millisecond: millisecond
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3280
    ].
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3281
    hasTimezone ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3282
	"/ 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
  3283
	^ (((timestampClass == Timestamp) ifTrue:TZTimestamp ifFalse:timestampClass)
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3284
	    UTCYear: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3285
	    hour: hour minute: minute second: second millisecond: millisecond) utcOffset:utcOffset
17016
da04a2484c16 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17014
diff changeset
  3286
    ].
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3287
    "/ 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
  3288
    ^ (timestampClass
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3289
	year: year month: month day: day
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3290
	hour: hour minute: minute second: second millisecond: millisecond)
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3291
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3292
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3293
yearAlreadyReadAs:yearArg
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3294
    "support for readers which may have already preread the year"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3295
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3296
    year := yearArg.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3297
    yearAlreadyRead := true.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3298
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3299
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3300
!Timestamp::TimestampISO8601Builder class methodsFor:'documentation'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3301
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3302
documentation
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3303
"
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3304
    TimestampISO8601Builder is designed to read any (almost) format of ISO 8601 encoded timestamp.
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3305
    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
  3306
    It has been written because of insufficient abilities of Timestamp #readIso8601FormatFrom: method
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3307
    (which was now changed to call this as well).
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3308
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3309
    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
  3310
    (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
  3311
    broken years, incomplete times and timezones. All times read with timezone difference are recomputed
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3312
    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
  3313
    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
  3314
    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
  3315
    possible.
16915
2174b3784836 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16914
diff changeset
  3316
    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
  3317
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3318
    [author:]
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3319
	Martin Dvorak (masca@volny.cz)
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3320
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3321
    [instance variables:]
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3322
	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
  3323
			so the builder instance can be reused (by at most one thread).
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3324
	year            Current timestamp year. No default value, date must be present.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3325
	month           Current timestamp month. May change during parsing. Defaults to 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3326
	day             Current timestamp day. Defaults to 1.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3327
	hour            Current timestamp hour. Defaults to 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3328
	minute          Current timestamp minute. Defaults to 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3329
	second          Current timestamp second. Defaults to 0.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3330
	millisecond     Current timestamp millisecond. Defaults to 0.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3331
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3332
    [see also:]
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3333
	Timestamp
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3334
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3335
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3336
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3337
examples
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3338
"
21999
1f634836c816 #OTHER by mawalch
mawalch
parents: 21699
diff changeset
  3339
    See the unit tests in stx/goodies:regression >> RegressionTests::timeAndDateTest
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3340
    It covers the main features this builder has.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3341
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3342
    Just to introduce some coding examples, try:
21999
1f634836c816 #OTHER by mawalch
mawalch
parents: 21699
diff changeset
  3343
        Timestamp readISO8601From: (TimestampISO8601Builder print: Timestamp now).
1f634836c816 #OTHER by mawalch
mawalch
parents: 21699
diff changeset
  3344
        UtcTimestamp readISO8601From: (TimestampISO8601Builder print: UtcTimestamp now).
1f634836c816 #OTHER by mawalch
mawalch
parents: 21699
diff changeset
  3345
        Timestamp readISO8601From: (TimestampISO8601Builder print: UtcTimestamp now).
1f634836c816 #OTHER by mawalch
mawalch
parents: 21699
diff changeset
  3346
        Timestamp readISO8601From: (TimestampISO8601Builder print: TZTimestamp now).
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3347
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3348
    Timestamp readISO8601From:'fooBar' onError:[ Timestamp now ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3349
"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3350
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3351
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3352
history
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3353
    "Created: / 16-06-2005 / 16:28:38 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3354
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3355
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3356
!Timestamp::TimestampISO8601Builder class methodsFor:'printing'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3357
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3358
print: aTimestamp
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3359
    "Returns the printString of the given timestamp in general ISO8601 format,
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3360
     such as '2014-11-06T11:48:09Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3361
     The time is printed as UTC time"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3362
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3363
    | stream |
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3364
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3365
    stream := '' writeStream.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3366
    self print: aTimestamp on: stream.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3367
    ^ stream contents
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3368
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3369
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3370
     self print:(Timestamp now)
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
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3373
    "Created: / 15-06-2005 / 17:52:29 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3374
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3375
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3376
print:aTimestamp asLocal:asLocal on:aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3377
    "Print the given timestamp in general ISO8601 format,
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3378
     such as '2014-11-06T11:48:09Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3379
     The time is always printed as UTC time"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3380
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3381
    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
  3382
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
     self print:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3385
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3386
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3387
    "Created: / 15-06-2005 / 17:56:51 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3388
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3389
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3390
print:aTimestamp on:aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3391
    "Print the given timestamp in general ISO8601 format,
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3392
     such as '2014-11-06T11:48:09Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3393
     The time is printed as UTC 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:false asLocal:false asUTC:true 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 print:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3399
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3400
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3401
    "Created: / 15-06-2005 / 17:56:51 / masca"
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
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3404
printAsLocalTime: aTimestamp on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3405
    "Print the given timestamp in general ISO8601 format,
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3406
     such as '2014-11-06T11:48:09+01'.
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3407
     The time is printed as local time"
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
    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
  3410
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3411
    "
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3412
     self printAsLocalTime:(Timestamp now) on:Transcript
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3413
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3414
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3415
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3416
printCompressed: aTimestamp
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3417
    "Return a printString in compressed format such as '20141106T114636Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3418
     (for example, for timestamp interchange with mobile devices).
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3419
     The time is printed as UTC time"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3420
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3421
    | stream |
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3422
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3423
    stream := '' writeStream.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3424
    self printCompressed: aTimestamp on: stream.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3425
    ^ stream contents
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3426
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3427
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3428
     self printCompressed:(Timestamp now)
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3429
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3430
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3431
    "Created: / 15-06-2005 / 17:52:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3432
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3433
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3434
printCompressed:aTimestamp asLocal:asLocal on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3435
    "generates a compressed string representation, such as '20141106T114636Z'"
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3436
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3437
    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
  3438
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3439
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3440
     self printCompressed:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3441
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3442
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3443
    "Created: / 15-06-2005 / 17:54:17 / masca"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3444
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3445
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3446
printCompressed: aTimestamp on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3447
    "generates a compressed string representation, such as '20141106T114636Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3448
     The time is printed as UTC time"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3449
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3450
    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
  3451
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3452
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3453
     self printCompressed:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3454
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3455
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3456
    "Created: / 15-06-2005 / 17:54:17 / masca"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3457
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3458
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3459
printCompressedAsLocalTime: aTimestamp on: aStream
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3460
    "generates a compressed string representation, such as '20141106T114636Z'.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3461
     The time is printed as local time"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3462
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3463
    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
  3464
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3465
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3466
     self printCompressed:(Timestamp now) on:Transcript
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3467
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3468
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3469
    "Created: / 15-06-2005 / 17:54:17 / masca"
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3470
!
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3471
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3472
printTimeZone:tzOffsetArg on: aStream
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3473
    "Print the timezone delta"
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3474
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3475
    |tzOffset tzHours tzMinutes|
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3476
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3477
    tzOffset := tzOffsetArg.
17020
c995597a75c1 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17016
diff changeset
  3478
    tzOffset == 0 ifTrue:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3479
	aStream nextPutAll:'+00'.
17020
c995597a75c1 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17016
diff changeset
  3480
    ] ifFalse:[
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3481
	tzOffset := tzOffset // 60.     "/ convert from seconds to minutes
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3482
	tzOffset < 0 ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3483
	    tzOffset := tzOffset negated.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3484
	    aStream nextPut:$+
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3485
	] ifFalse:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3486
	    aStream nextPut:$-.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3487
	].
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3488
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3489
	tzHours := tzOffset // 60.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3490
	tzMinutes := tzOffset \\ 60.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3491
	(tzHours ~= 0 or:[tzMinutes ~= 0]) ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3492
	    aStream
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3493
		nextPutAll:(tzHours printStringRadix: 10 size: 2 fill: $0).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3494
	    tzMinutes ~= 0 ifTrue:[
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3495
		aStream
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3496
		    nextPut: $:;
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3497
		    nextPutAll: (tzMinutes printStringRadix: 10 size: 2 fill: $0).
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3498
	    ].
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3499
	].
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3500
    ].
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3501
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3502
    "
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3503
     self print:(Timestamp now) asLocal:true on:Transcript.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3504
     Transcript cr.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3505
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3506
     self print:(Timestamp now) asLocal:false on:Transcript.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3507
     Transcript cr.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3508
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3509
     self printCompressed:(Timestamp now) asLocal:true on:Transcript.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3510
     Transcript cr.
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3511
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3512
     self printCompressed:(Timestamp now) asLocal:false on:Transcript.
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3513
     Transcript cr.
16919
80445b2bec64 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16915
diff changeset
  3514
    "
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3515
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3516
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3517
!Timestamp::TimestampISO8601Builder class methodsFor:'printing - basic'!
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3518
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3519
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
  3520
    "Print the given timestamp in general ISO8601 format,
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3521
     such as '2014-11-06T11:48:09Z'.
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3522
	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
  3523
	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
  3524
	asUTC: if true, generates a utc string
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3525
	    if both are false:
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3526
		generate a string depending on the type of timestamp:
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3527
		    if local: generate a local timezone string
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3528
		    if utc: generate a utc string
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3529
		    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
  3530
	withMilliseconds: if false, no milliseconds are generated"
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3531
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3532
    self
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3533
	print:aTimestamp
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3534
	compact:compact asLocal:asLocal asUTC:asUTC
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3535
	withMilliseconds:withMillis
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3536
	timeSeparator:$T
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3537
	on:aStream
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3538
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3539
    "
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3540
     self print:(Timestamp now) on:Transcript
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3541
     self printAsLocalTime:(Timestamp now) on:Transcript
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3542
     self printAsLocalTime:(Timestamp now asTZTimestamp:-7200) on:Transcript
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3543
    "
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3544
!
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3545
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3546
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
  3547
    "Print the given timestamp in general ISO8601 format,
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3548
     such as '2014-11-06T11:48:09Z'.
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3549
        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
  3550
        asLocal: if true, generates a localtime string (without any timezone info)
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3551
        asUTC: if true, generates a utc string
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3552
            if both are false:
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3553
                generate a string depending on the type of timestamp:
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3554
                    if local: generate a local timezone string
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3555
                    if utc: generate a utc string
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3556
                    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
  3557
        withMilliseconds: if false, no milliseconds are generated"
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3558
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3559
    |timeInfo millis |
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3560
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3561
    asLocal ifTrue:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3562
        "/ force local
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3563
        timeInfo := aTimestamp asLocalTimestamp timeInfo.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3564
    ] ifFalse:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3565
        asUTC ifTrue:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3566
            "/ force utc
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3567
            timeInfo := aTimestamp asUtcTimestamp timeInfo.
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3568
        ] ifFalse:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3569
            "/ in the timestamps own format
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3570
            timeInfo := aTimestamp timeInfo.
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3571
        ]
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3572
    ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3573
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3574
    timeInfo year printOn:aStream leftPaddedTo:4 with:$0.
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3575
    compact ifFalse:[ aStream nextPut: $- ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3576
    timeInfo month printOn:aStream leftPaddedTo:2 with:$0.
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3577
    compact ifFalse:[ aStream nextPut: $- ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3578
    timeInfo day printOn:aStream leftPaddedTo:2 with:$0.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3579
    aStream nextPut:tSep.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3580
    timeInfo hours printOn:aStream leftPaddedTo:2 with:$0.
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3581
    compact ifFalse:[ aStream nextPut: $:].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3582
    timeInfo minutes printOn:aStream leftPaddedTo:2 with:$0.
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3583
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3584
    "always print the seconds, even if 0. 
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3585
     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
  3586
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3587
    compact ifFalse:[ aStream nextPut: $:].
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3588
    timeInfo seconds printOn:aStream leftPaddedTo:2 with:$0.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3589
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3590
    millis := withMillis ifTrue:[timeInfo milliseconds] ifFalse:[0].
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3591
    millis ~= 0 ifTrue:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3592
        aStream nextPut: $..
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3593
        millis printOn:aStream leftPaddedTo:3 with:$0.
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3594
    ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3595
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3596
    asUTC ifTrue:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3597
        aStream nextPut: $Z
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3598
    ] ifFalse:[
17422
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3599
        asLocal ifFalse:[
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3600
            self printTimeZone:aTimestamp utcOffset on:aStream.
0a01cd7cf5f2 class: Timestamp::TimestampISO8601Builder
Stefan Vogel <sv@exept.de>
parents: 17172
diff changeset
  3601
        ].
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3602
    ].
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3603
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3604
    "
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3605
     self print:(Timestamp now) on:Transcript
16967
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3606
     self printAsLocalTime:(Timestamp now) on:Transcript
4640b54ab64a class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16955
diff changeset
  3607
     self printAsLocalTime:(Timestamp now asTZTimestamp:-7200) on:Transcript
16921
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3608
    "
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3609
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3610
    "Created: / 15-06-2005 / 17:56:51 / masca"
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3611
! !
8b4c683d9d5b class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16920
diff changeset
  3612
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3613
!Timestamp::TimestampISO8601Builder class methodsFor:'public parsing'!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3614
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3615
read: stringOrStream withClass:timestampClass
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3616
    ^ self new read:stringOrStream withClass:timestampClass
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3617
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3618
    "Created: / 15-06-2005 / 17:52:03 / masca"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3619
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3620
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3621
read: stringOrStream withClass:timestampClass yearAlreadyReadAs:yearArg
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3622
    "support for readers which may have already preread the year"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3623
16945
Claus Gittinger <cg@exept.de>
parents: 16943
diff changeset
  3624
    ^ self new
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3625
	yearAlreadyReadAs:yearArg;
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3626
	read:stringOrStream withClass:timestampClass
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3627
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3628
    "Created: / 15-06-2005 / 17:52:03 / masca"
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3629
! !
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3630
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3631
!Timestamp::TimestampISO8601Builder methodsFor:'private-reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3632
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3633
nextDigit
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3634
    | char |
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3635
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3636
    char := stream peekOrNil.
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3637
    char isNil ifTrue: [^-1].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3638
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3639
    char isDigit ifTrue: [
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3640
	stream next.
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3641
	^ char codePoint - $0 codePoint
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3642
    ].
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  3643
    ^ -1
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3644
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3645
    "Created: / 14-06-2005 / 11:48:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3646
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3647
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3648
nextDigitOrError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3649
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3650
    | digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3651
    digit := self nextDigit.
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3652
    ^ digit < 0
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3653
	ifTrue: [self malformed: 'No digit found']
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3654
	ifFalse: [digit]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3655
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3656
    "Created: / 15-06-2005 / 10:57:00 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3657
    "Modified: / 15-06-2005 / 17:22:52 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3658
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3659
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3660
nextDigits: anInteger
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3661
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3662
    | char number |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3663
    number := 0.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3664
    anInteger timesRepeat: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3665
	char := stream peekOrNil.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3666
	char ifNil: [self malformed: 'Stream does not contain all ' , anInteger printString , ' digits'].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3667
	char isDigit
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3668
	    ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3669
		stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3670
		number := number * 10 + char codePoint - $0 codePoint]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3671
	    ifFalse: [self malformed: 'Requested ' , anInteger printString , ' digits not found']
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3672
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3673
    ^ number
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3674
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3675
    "Created: / 14-06-2005 / 11:57:22 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3676
    "Modified: / 15-06-2005 / 15:54:29 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3677
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3678
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3679
!Timestamp::TimestampISO8601Builder methodsFor:'public processing'!
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3680
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3681
read:stringOrStream withClass:timestampClass
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3682
    | peek |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3683
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3684
    stream := stringOrStream readStream.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3685
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3686
    month := day := 1.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3687
    hour := minute := second := millisecond := 0.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3688
    isUtcTime := hasTimezone := false.
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3689
    utcOffset := 0.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3690
16936
cf59a3abe590 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16935
diff changeset
  3691
    yearAlreadyRead ~~ true ifTrue:[
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3692
        "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
  3693
        self readYear.
16923
719c8a7b1cdd class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16922
diff changeset
  3694
    ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3695
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3696
    "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
  3697
    There is possible inconsistency - a dash may be read followed by T, which is not
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3698
    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
  3699
    peek := stream peekOrNil.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3700
    peek ifNil: [
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3701
        "End of stream, only year has been read."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3702
        ^ self timestampWithClass:timestampClass].
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3703
    peek == $- ifTrue: [
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3704
        "Skip the dash after year, if present."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3705
        stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3706
        peek := stream peekOrNil].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3707
    peek := peek asUppercase.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3708
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3709
    (peek == $T or: [peek == Character space])
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3710
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3711
            "Got time signature. Skip the signature, read time and answer the timestamp."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3712
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3713
            peek == Character space ifTrue:[stream skipSeparators].
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3714
            self readTime.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3715
            self readTimezone.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3716
            ^ self timestampWithClass:timestampClass
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3717
        ]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3718
        ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3719
            "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
  3720
            peek == $W
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3721
                ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3722
                    "Parse week number and (possibly) day number."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3723
                    stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3724
                    self readWeekNumber]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3725
                ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3726
                    "Got digit, read month number followed by day or day number."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3727
                    self readMonthOrDay]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3728
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3729
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3730
    peek := stream peekOrNil.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3731
    peek ifNil: [
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3732
        "End of stream, only year has been read."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3733
        ^ self timestampWithClass:timestampClass].
16955
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3734
2c49b8f7fc7f class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16950
diff changeset
  3735
    (peek asUppercase == $T or: [peek == Character space])
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3736
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3737
            "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
  3738
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3739
            peek == Character space ifTrue:[stream skipSeparators].
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3740
            self readTime.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3741
            self readTimezone
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  3742
        ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3743
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3744
    ^ self timestampWithClass:timestampClass
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3745
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3746
    "Created: / 14-06-2005 / 11:45:04 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3747
    "Modified: / 16-06-2005 / 10:15:35 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3748
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3749
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3750
!Timestamp::TimestampISO8601Builder methodsFor:'reading'!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3751
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3752
readFraction
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3753
    "Read an arbitrary number of digits representing a fraction."
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3754
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3755
    ^ Fraction readDecimalFractionFrom:stream onError:[self malformed: 'Missing digits after fraction separator'].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3756
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3757
"/    | anyDigit digit factor fraction |
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3758
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3759
"/    factor := (1 / 10).
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3760
"/    fraction := 0.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3761
"/    anyDigit := false.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3762
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3763
"/    [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3764
"/        digit := self nextDigit.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3765
"/        digit >= 0
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3766
"/    ] whileTrue: [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3767
"/        anyDigit := true.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3768
"/        fraction := digit * factor + fraction.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3769
"/        factor := (factor / 10)
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3770
"/    ].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3771
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3772
"/    anyDigit ifFalse: [self malformed: 'Missing digits after fraction separator'].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3773
"/    ^ fraction
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3774
"/
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3775
!
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3776
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3777
readMilliseconds
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3778
    "Read an arbitrary number of digits representing milliseconds. As the timestamp can
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3779
    hold only integer amounts of milliseconds, don't mind the rest of the digits."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3780
16939
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3781
    millisecond := (self readFraction * 1000) asInteger
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3782
"/    | digit factor |
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3783
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3784
"/    factor := 100.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3785
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3786
"/    [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3787
"/        digit := self nextDigit.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3788
"/        digit >= 0
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3789
"/    ] whileTrue: [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3790
"/        factor > 0 ifTrue: [
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3791
"/            "Factor still > 0, did not read all three digits of mantissa."
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3792
"/            millisecond := digit * factor + millisecond.
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3793
"/            factor := (factor / 10) integerPart
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3794
"/        ]
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3795
"/    ].
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3796
"/
1c51cd6660e5 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16936
diff changeset
  3797
"/    factor = 100 ifTrue: [self malformed: 'No digits after millisecond separator']
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3798
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3799
    "Created: / 15-06-2005 / 15:25:45 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3800
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3801
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3802
readMonthOrDay
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3803
    "Read month number, optionally followed by day, or absolute day number (three digit)."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3804
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3805
    | dayDigit1 dayDigit2 |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3806
    month := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3807
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3808
    stream peekOrNil = $-
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3809
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3810
	    "Got dash. Day number must follow."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3811
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3812
	    day := self nextDigits: 2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3813
	    (self isAllowedDay: day) ifFalse: [self malformed: 'Bad day: ' , day printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3814
	    ^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3815
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3816
    dayDigit1 := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3817
    dayDigit1 < 0 ifTrue: [
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3818
	"No more digits than month, leave day unspecified."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3819
	(month between: 1 and: 12) ifFalse: [self malformed: 'Bad month: ' , month printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3820
	^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3821
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3822
    dayDigit2 := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3823
    dayDigit2 < 0
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3824
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3825
	    "Read only three digits, this is absolute day number in a year."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3826
	    self dateFromDayNumber: month * 10 + dayDigit1]
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3827
	ifFalse: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3828
	    "Read four digits. So there's month and day."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3829
	    (month between: 1 and: 12) ifFalse: [self malformed: 'Bad month: ' , month printString].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3830
	    day := dayDigit1 * 10 + dayDigit2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3831
	    (self isAllowedDay: day) ifFalse: [self malformed: 'Bad day: ' , day printString]]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3832
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3833
    "Created: / 15-06-2005 / 11:12:02 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3834
    "Modified: / 16-06-2005 / 11:47:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3835
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3836
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3837
readTime
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3838
    "Date read, don't mind it. Read only the time value."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3839
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3840
    | peek f |
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3841
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3842
    hour := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3843
    (hour between: 0 and: 24) ifFalse: [self malformed: 'Bad hour: ' , hour printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3844
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3845
    peek := stream peekOrNil.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3846
    peek isNil ifTrue: [^self].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3847
    (peek == $:) ifTrue: [
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3848
        "/ read minutes
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3849
        stream next.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3850
        minute := self nextDigits: 2.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3851
    ] ifFalse: [
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3852
        peek isDigit ifTrue: [
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3853
            "/ read minutes
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3854
            minute := self nextDigits: 2.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3855
        ] ifFalse:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3856
            (peek == $. or:[peek == $,]) ifTrue:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3857
                stream next.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3858
                minute := self readFraction * 60.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3859
            ] ifFalse:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3860
                ^ self.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3861
            ].
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3862
        ]
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3863
    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3864
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3865
    minute isInteger ifFalse:[
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3866
        f := minute.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3867
        minute := f truncated.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3868
        second := (f - minute) * 60.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3869
        second isInteger ifFalse:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3870
            f := second.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3871
            second := f truncated.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3872
            millisecond := (f - second) * 1000.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3873
            millisecond := millisecond rounded.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3874
        ].
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3875
    ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3876
    (minute between: 0 and: 59) ifFalse: [self malformed: 'Bad minute: ' , minute printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3877
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3878
    peek := stream peekOrNil.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3879
    peek isNil ifTrue: [^self].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3880
    (peek == $:) ifTrue: [
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3881
        "/ read seconds
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3882
        stream next.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3883
        second := self nextDigits: 2.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3884
    ] ifFalse: [
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3885
        peek isDigit ifTrue: [
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3886
            "/ read seconds
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3887
            second := self nextDigits: 2.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3888
        ] ifFalse:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3889
            (peek == $. or:[peek == $,]) ifTrue:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3890
                stream next.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3891
                second := self readFraction * 60.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3892
            ] ifFalse:[
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3893
                ^ self.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3894
            ].
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3895
        ]
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3896
    ].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3897
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3898
    second isInteger ifFalse:[
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3899
        f := second.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3900
        second := f truncated.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3901
        millisecond := (f - second) * 1000.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3902
        millisecond := millisecond rounded.
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3903
    ].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3904
    (second between: 0 and: 59) ifFalse: [
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3905
        "Seconds are usually in this range, do a special check for leap seconds."
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3906
        second <= 61
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3907
            ifTrue: [
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3908
                "Leap seconds can occur only on midnight on 31.12. or 30.6. Don't check year
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3909
                as it's not deterministic."
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3910
                (minute = 59 and: [hour = 23 and: [(month = 12 and: [day = 31]) or: [month = 6 and: [day = 30]]]])
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3911
                    ifFalse: [self malformed: 'Bad leap second']]
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3912
            ifFalse: [self malformed: 'Bad second: ' , second printString]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3913
    ].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3914
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3915
    "Hour, minute and second read. Read appendices."
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  3916
    ((peek := stream peekOrNil) == $. or:[peek == $,])
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3917
        ifTrue: [
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3918
            "Read dot. Skip it and read milliseconds."
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3919
            stream next.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3920
            self readMilliseconds].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3921
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3922
    hour = 24 ifTrue: [
20817
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3923
        (minute = 0 and: [second = 0 and: [millisecond = 0]])
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3924
            ifTrue: [
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3925
                "On 24 hour, advance to the next day."
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3926
                "hour := 0.
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3927
                self addMinutes: 1440"]
f85fbb0ac273 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20616
diff changeset
  3928
            ifFalse: [self malformed: 'Bad 24 hour (minutes, seconds and millis not 0)']
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3929
    ]
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3930
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3931
    "Created: / 14-06-2005 / 17:27:00 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3932
    "Modified: / 30-06-2005 / 11:34:38 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3933
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3934
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3935
readTimezone
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3936
    "Read time zone information. There are three possibilities of what can occur.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3937
    If there is nothing more to read, the offset is unknown - this is treated as
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3938
    Zulu time as this may not be true."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3939
19916
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3940
    | peek tzOffset |
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3941
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3942
    peek := stream peek.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3943
    peek ifNil: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3944
    peek := peek asUppercase.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3945
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3946
    "If the time is in Zulu, don't modify the timestamp. This makes the machine
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3947
    run in Zulu time zone, maybe some corrections would be nice."
19916
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3948
    peek == $Z ifTrue: [
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3949
        "Time read, skip Zulu signature and exit."
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3950
        isUtcTime := true.
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3951
        stream next.
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3952
        ^ self
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3953
    ].
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3954
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3955
    (peek == $+ or:[peek == $-]) ifTrue: [
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3956
        "Read a plus/minus, expect a negative/positive time zone difference."
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3957
        hasTimezone := true.
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3958
        stream next.
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3959
        tzOffset := self readTimezoneOffset.
19917
b273314a4ef7 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 19916
diff changeset
  3960
        peek == $+ ifTrue:[
19916
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3961
            tzOffset := tzOffset collect: [:e | e negated].
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3962
        ].    
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3963
        self addHoursAndMinutes: tzOffset.
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3964
        ^ self
e8c8589b1928 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 19915
diff changeset
  3965
    ].
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3966
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3967
    "This is local time"
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3968
    isUtcTime := false.
16975
7b1b852a393e class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16973
diff changeset
  3969
    hasTimezone := false.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3970
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3971
    "Created: / 16-06-2005 / 09:54:21 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3972
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3973
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3974
readTimezoneOffset
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3975
    "Read time zone offset as a number minutes. Generally, there should be hours only
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3976
    but as the format introduces minutes in offsets, we must accept them."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3977
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3978
    | hours digit |
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3979
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3980
    "Read hours."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3981
    hours := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3982
    (hours between: 0 and: 12) ifFalse: [self malformed: 'Bad offset hour: ' , hours printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3983
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  3984
    stream peekOrNil = $:
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3985
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3986
	    "Colon read, minutes must follow."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3987
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3988
	    digit := self nextDigits: 2.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  3989
	    (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
  3990
	    ^Array with: hours with: digit].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3991
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3992
    "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
  3993
     check boundaries."
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3994
    digit := self nextDigit.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3995
    digit < 0 ifTrue: [^Array with: hours with: 0].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3996
    digit >= 6 ifTrue: [self malformed: 'Bad offset minute: ' , (digit * 10) printString].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3997
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3998
    "Read the last digit of offset, it must be present."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  3999
    ^Array with: hours with: digit * 10 + self nextDigitOrError
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4000
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4001
    "Created: / 15-06-2005 / 15:35:41 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4002
    "Modified: / 15-06-2005 / 17:45:58 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4003
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4004
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4005
readWeekNumber
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4006
16914
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  4007
    | week dayInWeek digit |
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  4008
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4009
    "Read week number. It is always two digits long."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4010
    week := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4011
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  4012
    stream peekOrNil = $-
17006
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4013
	ifTrue: [
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4014
	    "Got dash, day number must follow."
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4015
	    stream next.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4016
	    digit := self nextDigit.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4017
	    digit < 0 ifTrue: [self malformed: 'Bad weekday number'].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4018
	    digit > 7 ifTrue: [self malformed: 'Bad weekday number'].
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4019
	    self dateFromWeek: week andWeekday: digit.
d6ec5e448ac5 timestamp changes
Claus Gittinger <cg@exept.de>
parents: 17005
diff changeset
  4020
	    ^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4021
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4022
    "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
  4023
    dayInWeek := self nextDigit.
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  4024
    dayInWeek <= 0 ifTrue: [dayInWeek := 1].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  4025
    dayInWeek > 7 ifTrue: [self malformed: 'Bad weekday number'].
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  4026
c550a2e2359d class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 16901
diff changeset
  4027
    self dateFromWeek: week andWeekday: dayInWeek
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4028
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4029
    "Created: / 14-06-2005 / 12:06:47 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4030
    "Modified: / 15-06-2005 / 15:53:34 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4031
!
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4032
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4033
readYear
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4034
    "Read YYYY or :Y (broken decade) from the stream. Also handles correctly YY- and YYY-."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4035
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4036
    | read peek |
13236
74872163b47b Support subclass UtcTimestamp -
Stefan Vogel <sv@exept.de>
parents: 13225
diff changeset
  4037
    stream peekOrNil = $:
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4038
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4039
            "Broken two digit year > 1999 follows."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4040
            stream next.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4041
            year := self nextDigitOrError + 2000.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4042
            ^self].
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4043
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4044
    "Expecting two-, three- or four-digit year"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4045
    "Read the first two digits. They must be there."
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4046
    read := self nextDigits: 2.
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4047
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4048
    "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
  4049
    peek := stream peekOrNil.
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4050
    peek ifNil: [^self].
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4051
17067
b32e90d1cc4d simplified the code
Claus Gittinger <cg@exept.de>
parents: 17049
diff changeset
  4052
    ((peek == $-) or:[peek == $W])
17465
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4053
        ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4054
            "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
  4055
            year := read < 70
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4056
                ifTrue: [read + 2000]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4057
                ifFalse: [read + 1900]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4058
        ] ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4059
            "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
  4060
             read := read * 10 + self nextDigitOrError.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4061
             peek := stream peekOrNil.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4062
             (peek isNil or: [peek == $-])
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4063
                ifTrue: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4064
                    "Read three digit year, return it."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4065
                    year :=  read + 1900
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4066
                ] ifFalse: [
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4067
                    "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
  4068
                    two-digit year format is deprecated anyway."
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4069
                    read := read * 10 + self nextDigitOrError.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4070
                    year :=  read.
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4071
                ]
e78bccbfe573 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 17424
diff changeset
  4072
        ]
11993
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4073
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4074
    "Created: / 14-06-2005 / 12:01:11 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4075
    "Modified: / 15-06-2005 / 17:31:56 / masca"
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4076
! !
f303ffa58005 abstract timestamp builder
fm
parents: 11876
diff changeset
  4077
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  4078
!Timestamp class methodsFor:'documentation'!
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4079
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4080
version
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  4081
    ^ '$Header$'
12164
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  4082
!
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  4083
b87f20d77369 added: #readShortGeneralizedFrom:onError:
Claus Gittinger <cg@exept.de>
parents: 11994
diff changeset
  4084
version_CVS
18761
2358ffda3751 #BUGFIX
Stefan Vogel <sv@exept.de>
parents: 18455
diff changeset
  4085
    ^ '$Header$'
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4086
! !
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  4087
14713
eb944b3267e6 class: Timestamp
Claus Gittinger <cg@exept.de>
parents: 14428
diff changeset
  4088
8246
7b66fe46e2c3 defined source container
Stefan Vogel <sv@exept.de>
parents: 8223
diff changeset
  4089
Timestamp initialize!