1.1 --- a/vRecurrence.py Mon Oct 06 15:04:31 2014 +0200
1.2 +++ b/vRecurrence.py Mon Oct 06 16:11:56 2014 +0200
1.3 @@ -175,24 +175,16 @@
1.4 repeat = Pattern(level - 1, {"interval" : 1}, "REPEAT")
1.5 repeat.context = tuple(context)
1.6 l.append(repeat)
1.7 - else:
1.8 - from_q.context = tuple(context)
1.9 have_q = True
1.10
1.11 - # Either introduce the qualifier first.
1.12 -
1.13 - if _level > level:
1.14 - l.append(from_q)
1.15 + from_q.context = tuple(context)
1.16 + l.append(from_q)
1.17 + from_q = get_next(iter_q)
1.18
1.19 - # Or combine the qualifier and value details.
1.20 -
1.21 - else:
1.22 - l.append(combine_context_with_qualifier(context, from_q))
1.23 + if _level == level:
1.24 from_dt = get_next(iter_dt)
1.25 context.append(from_dt.args["values"][0])
1.26
1.27 - from_q = get_next(iter_q)
1.28 -
1.29 # Complete the list.
1.30
1.31 while from_dt:
1.32 @@ -205,24 +197,14 @@
1.33 repeat = Pattern(level - 1, {"interval" : 1}, "REPEAT")
1.34 repeat.context = tuple(context)
1.35 l.append(repeat)
1.36 - else:
1.37 - from_q.context = tuple(context)
1.38 have_q = True
1.39 +
1.40 + from_q.context = tuple(context)
1.41 l.append(from_q)
1.42 from_q = get_next(iter_q)
1.43
1.44 return l
1.45
1.46 -def combine_context_with_qualifier(context, from_q):
1.47 -
1.48 - """
1.49 - Combine 'context' information (a datetime) and 'from_q' (a qualifier),
1.50 - imposing the datetime value information on any qualifiers.
1.51 - """
1.52 -
1.53 - from_q.context = tuple(context)
1.54 - return from_q
1.55 -
1.56 # Datetime arithmetic.
1.57
1.58 def combine(t1, t2):