Changeset 401 for ruby/trunk/lib/open_ehr/assumed_library_types.rb
- Timestamp:
- Jan 25, 2010, 5:35:20 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ruby/trunk/lib/open_ehr/assumed_library_types.rb
r398 r401 165 165 end 166 166 167 def to_days 168 days = nilthenzero(@year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR + 169 nilthenzero(@month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + 170 nilthenzero(@day) 171 return days 172 end 173 167 174 def month_unknown? 168 175 @month.nil? … … 217 224 218 225 def <=>(other) 219 magnitude = 220 nilthenzero(@year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR + 221 nilthenzero(@month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + 222 nilthenzero(@day) 223 other_magnitude = 224 nilthenzero(other.year)*TimeDefinitions::NOMINAL_DAYS_IN_YEAR + 225 nilthenzero(other.month)*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + 226 nilthenzero(other.day) 227 magnitude <=> other_magnitude 226 self.to_days <=> other.to_days 228 227 end 229 228 … … 322 321 end 323 322 324 323 def to_second 324 second = (nilthenzero(@hour)*60 + nilthenzero(@minute))*60 + 325 nilthenzero(@second) + 326 nilthenzero(@fractional_second) 327 return second 328 end 325 329 end 326 330 … … 357 361 358 362 def <=>(other) 359 magnitude = (nilthenzero(@hour)*60 + nilthenzero(@minute))*60 + 360 nilthenzero(@second) + 361 nilthenzero(@fractional_second) 362 other_magnitude = (nilthenzero(other.hour) * 60 + 363 nilthenzero(other.minute)) * 60 + 364 nilthenzero(other.second) + 365 nilthenzero(other.fractional_second) 366 magnitude <=> other_magnitude 363 self.to_second <=> other.to_second 367 364 end 368 365 … … 480 477 end 481 478 end 479 480 def <=>(other) 481 self.magnitude <=> other.magnitude 482 end 483 484 protected 485 def magnitude 486 return self.to_days*HOURS_IN_DAY*MINUTES_IN_HOUR*SECONDS_IN_MINUTE + 487 self.to_second 488 end 482 489 end 483 490
Note:
See TracChangeset
for help on using the changeset viewer.