Branch: Tag:

2001-07-18

2001-07-18 10:03:39 by Martin Nilsson <mani@lysator.liu.se>

Backported bugfixes from 7.3

Rev: lib/modules/Calendar.pmod/Event.pmod:1.12
Rev: lib/modules/Calendar.pmod/Events.pmod:1.9
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.5
Rev: lib/modules/Calendar.pmod/Islamic.pmod:1.5
Rev: lib/modules/Calendar.pmod/Language.pmod:1.16
Rev: lib/modules/Calendar.pmod/Time.pmod:1.12
Rev: lib/modules/Calendar.pmod/TimeRanges.pmod:1.14
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.17
Rev: lib/modules/Calendar.pmod/YMD.pmod:1.30

1:   //! module Calendar    - // $Id: TimeRanges.pmod,v 1.13 2001/01/10 23:44:13 mirar Exp $ + // $Id: TimeRanges.pmod,v 1.14 2001/07/18 10:03:38 nilsson Exp $      #pike __REAL_VERSION__   
498:   //! |-------A-------| A preceeds B, A succeeds B,   //! |---B---| A overlaps B, A contains B, A touches B   //! - //! |----A----| A overlaps B, A touches B + //! |----A----| A overlaps B, A touches B, A contains B   //! |----B----| A equals B, A starts with B, A ends with B   //!   //! |-------A-------| A succeeds B, A starts with B
514:   //! |----B----| A succeeds B   //!   //! </pre> + //! + //! note: + //! These methods only check the range of the first to the + //! last time in the period; + //! use of combined time periods (<ref>SuperTimeRange</ref>s) + //! might not give you the result you want. + //! + //! see also: `&    -  +    //- internal method   //- returns [-1,0,1] for comparison between   //- (in order) begin/begin,begin/end,end/begin and end/end
934:    {    return calendar_object;    } +  +  +  string _sprintf(int t,mapping m) +  { +  switch (t) +  { +  case 'O': +  return "TimeRange()"; +  case 't': +  return "Calendar."+calendar_name()+".TimeRange"; +  default: +  return 0;    } -  +  } + }      // ----------------------------------------------------------------   
1116:    return predef::`+(@map(parts,"__hash"));    }    -  string _sprintf(int t) +  string _sprintf(int t,mapping m)    {    switch (t)    {    case 'O':    return "SuperTimeRange("+    map(parts,"_sprintf",'O')*", "+")"; -  +  case 't': +  return "SuperTimeRange("+ +  map(parts,"_sprintf",'t')*", "+")";    } -  return 0; +  return ::_sprintf(t,m);    }       TimeRange set_timezone(string|Timezone tz)
1233:    return 1;    }    -  string _sprintf(int t) +  string _sprintf(int t,mapping m)    {    switch (t)    {    case 'O': return "NullTimeRange"; -  default: return 0; +  case 't': return "Calendar."+calendar_name()+".NullTimeRange"; +  default: return ::_sprintf(t,m);    }    }   }