Navigation

Changeset 178

Timestamp:

07/15/08 20:21:10 (3 months ago)

Author:

landon

Message:

Fixed the regex for parsing entries without an On $date: statement (Really this time!)

Files:

r176	r178
25	25	#First part: On $date:
26	26	# where $date is in the form: "Friday", "07-23-1989", or "July 23, 1989"
27		setdate_re = r"^(?:(?:on )?(?P<prefix>\b\w+\b\|\b\d{2,2}\b.\b\d{1,2}\b.\b\d{2,4}\b\|\b\w+\b.\b\d{1,2}(?:,.\d{2,4})?).?[,:] ?)?"
	27	setdate_re = r"^(?:(?:on )?(?P<prefix>\b\w{3,8}\b\|\b\d{2,2}\b.\b\d{1,2}\b.\b\d{2,4}\b\|\b\w+\b.\b\d{1,2}(?:,.\d{2,4})?).?[,:] ?)?"
28	28
29	29	setdate = re.search(setdate_re + r"(?P<rest>.*)", ievent.txt, re.I)
…	…
31	31	setdate = setdate.groupdict()
32	32	day = setdate['prefix']
	33	else:
	34	day = None
33	35
34	36	#Second part: $time to $time
…	…
49	51	weekdays = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday']
50	52	weekdays += ['mon','tue','wed','thu','fri','sat','sun']
51		if (day.lower() in weekdays):
52		adjustment = dt.timedelta(days=7)
53		date = parse(day, fuzzy = True) - adjustment
	53
	54	if (day):
	55	if (day.lower() in weekdays):
	56	adjustment = dt.timedelta(days=7)
	57	date = parse(day, fuzzy = True) - adjustment
	58	else:
	59	date = dt.date.today()
54	60
55	61	start = parse(t_one, fuzzy = True)