cutting down on some of the repeating regexp in effort to speed parser

2 files changed, 54 insertions, 54 deletions

diff --git a/calendars/School.ics b/calendars/School.ics
index 20c6a0f..c0d3dfa 100644
--- a/calendars/School.ics
+++ b/calendars/School.ics
@@ -3,83 +3,83 @@ CALSCALE:GREGORIAN
 X-WR-TIMEZONE;VALUE=TEXT:US/Central
 PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
 X-WR-CALNAME;VALUE=TEXT:School
-X-WR-RELCALID;VALUE=TEXT:7400C75A-EC34-11D6-B2E3-0050E4E60429
+X-WR-RELCALID;VALUE=TEXT:179767CA-EE1A-11D6-A6EB-0050E4E60429
 VERSION:2.0
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T080000
+UID:179653BA-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T235007Z
 SUMMARY:Computer Organization
-EXDATE;TZID=US/Central:20021010T080000
-EXDATE;TZID=US/Central:20021129T080000
-EXDATE;TZID=US/Central:20021001T080000
 EXDATE;TZID=US/Central:20021018T080000
-EXDATE;TZID=US/Central:20021128T080000
-EXDATE;TZID=US/Central:20021021T080000
 EXDATE;TZID=US/Central:20021112T080000
 EXDATE;TZID=US/Central:20021002T080000
-UID:73FFD768-EC34-11D6-B2E3-0050E4E60429
+EXDATE;TZID=US/Central:20021129T080000
+EXDATE;TZID=US/Central:20021010T080000
+EXDATE;TZID=US/Central:20021128T080000
+EXDATE;TZID=US/Central:20021001T080000
+EXDATE;TZID=US/Central:20021021T080000
+DTSTART;TZID=US/Central:20020904T080000
 DTEND;TZID=US/Central:20020904T090000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T090000
+UID:17965C2C-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021030T181835Z
 SUMMARY:Linguistics
-EXDATE;TZID=US/Central:20021018T090000
-EXDATE;TZID=US/Central:20021108T090000
 EXDATE;TZID=US/Central:20021002T090000
-EXDATE;TZID=US/Central:20021021T090000
+EXDATE;TZID=US/Central:20021108T090000
 EXDATE;TZID=US/Central:20021129T090000
-UID:73FFE032-EC34-11D6-B2E3-0050E4E60429
+EXDATE;TZID=US/Central:20021018T090000
+EXDATE;TZID=US/Central:20021021T090000
+DTSTART;TZID=US/Central:20020904T090000
 DTEND;TZID=US/Central:20020904T100000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T103000
+UID:17966D68-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T233307Z
 SUMMARY:First Aid & CPR
 EXDATE;TZID=US/Central:20021021T103000
 EXDATE;TZID=US/Central:20021002T103000
-UID:73FFEF46-EC34-11D6-B2E3-0050E4E60429
+DTSTART;TZID=US/Central:20020904T103000
 DTEND;TZID=US/Central:20020904T113000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,WE
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020904T133000
+UID:179672EC-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T235015Z
 SUMMARY:Japanese
-EXDATE;TZID=US/Central:20021129T133000
-EXDATE;TZID=US/Central:20021021T133000
-EXDATE;TZID=US/Central:20021001T133000
 EXDATE;TZID=US/Central:20021002T133000
+EXDATE;TZID=US/Central:20021021T133000
 EXDATE;TZID=US/Central:20021018T133000
-UID:73FFF408-EC34-11D6-B2E3-0050E4E60429
+EXDATE;TZID=US/Central:20021129T133000
+EXDATE;TZID=US/Central:20021001T133000
+DTSTART;TZID=US/Central:20020904T133000
 DTEND;TZID=US/Central:20020904T143000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,TU,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20020905T143000
+UID:17967888-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021030T180513Z
 SUMMARY:The Bible
 EXDATE;TZID=US/Central:20021001T143000
 EXDATE;TZID=US/Central:20021024T143000
 EXDATE;TZID=US/Central:20021128T143000
-UID:73FFF8D5-EC34-11D6-B2E3-0050E4E60429
+DTSTART;TZID=US/Central:20020905T143000
 DTEND;TZID=US/Central:20020905T163000
 RRULE:FREQ=WEEKLY;UNTIL=20021216T055959;INTERVAL=1;BYDAY=TU,TH
 END:VEVENT
 BEGIN:VEVENT
-UID:73FFFD56-EC34-11D6-B2E3-0050E4E60429
+UID:17967E06-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20020919T031814Z
 SUMMARY:Reading Day
 DTSTART;VALUE=DATE:20021214
 DTEND;VALUE=DATE:20021215
 END:VEVENT
 BEGIN:VEVENT
-DTSTART;TZID=US/Central:20021219T153000
+UID:17968370-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20020919T042240Z
 SUMMARY:Japanese Final
-UID:74003E05-EC34-11D6-B2E3-0050E4E60429
+DTSTART;TZID=US/Central:20021219T153000
 ORGANIZER;CN=Jared Wangen:mailto:jwangen@gac.edu
 DTEND;TZID=US/Central:20021219T173000
 DESCRIPTION:VH 301
@@ -87,59 +87,59 @@ END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T041543Z
 SUMMARY:The Bible Final
-DTSTART;TZID=US/Central:20021217T103000
+UID:179688FE-EE1A-11D6-A6EB-0050E4E60429
 ORGANIZER;CN=Jared Wangen:mailto:jwangen@gac.edu
-DESCRIPTION:NHS Auditorium
-UID:740044D2-EC34-11D6-B2E3-0050E4E60429
+DTSTART;TZID=US/Central:20021217T103000
 DURATION:PT2H
+DESCRIPTION:NHS Auditorium
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033447Z
 SUMMARY:Computer Organization Final
+UID:17968E62-EE1A-11D6-A6EB-0050E4E60429
 DTSTART;TZID=US/Central:20021218T080000
-UID:7400494D-EC34-11D6-B2E3-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:Olin 321 (Classroom)
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033454Z
 SUMMARY:Linguistics Final
+UID:179693B0-EE1A-11D6-A6EB-0050E4E60429
 DTSTART;TZID=US/Central:20021217T130000
-UID:74004DD2-EC34-11D6-B2E3-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:VH 202 (Classroom)
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033438Z
 SUMMARY:CPR & First Aid Final
+UID:17969902-EE1A-11D6-A6EB-0050E4E60429
 DTSTART;TZID=US/Central:20021217T080000
-UID:74005246-EC34-11D6-B2E3-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:Lund 109 (Classroom)
 END:VEVENT
 BEGIN:VEVENT
-UID:740056C2-EC34-11D6-B2E3-0050E4E60429
+UID:1796EDF6-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T233220Z
 SUMMARY:Fall Break
 DTSTART;VALUE=DATE:20021018
 DTEND;VALUE=DATE:20021022
 END:VEVENT
 BEGIN:VEVENT
-UID:74005BC7-EC34-11D6-B2E3-0050E4E60429
+UID:1796F4B8-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T233332Z
 SUMMARY:Nobel Conference
 DTSTART;VALUE=DATE:20021001
 DTEND;VALUE=DATE:20021003
 END:VEVENT
 BEGIN:VEVENT
-UID:74006098-EC34-11D6-B2E3-0050E4E60429
+UID:17970B20-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T234504Z
 SUMMARY:CS - Lab 1 Due
 DTSTART;VALUE=DATE:20021003
 DTEND;VALUE=DATE:20021004
 END:VEVENT
 BEGIN:VEVENT
-UID:74006524-EC34-11D6-B2E3-0050E4E60429
+UID:179711DA-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T234552Z
 SUMMARY:CS -  HW Ch 1-4\,A\,B Due
 DTSTART;VALUE=DATE:20021008
@@ -149,18 +149,18 @@ BEGIN:VEVENT
 DTSTAMP:20021024T234631Z
 SUMMARY:Computer Organization Test 1
 DTEND;TZID=US/Central:20021010T203000
-UID:74007B3B-EC34-11D6-B2E3-0050E4E60429
 DTSTART;TZID=US/Central:20021010T190000
+UID:1797176E-EE1A-11D6-A6EB-0050E4E60429
 END:VEVENT
 BEGIN:VEVENT
-UID:7400805F-EC34-11D6-B2E3-0050E4E60429
+UID:17971CB6-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T234720Z
 SUMMARY:CS - Lab 2 Due
 DTSTART;VALUE=DATE:20021101
 DTEND;VALUE=DATE:20021102
 END:VEVENT
 BEGIN:VEVENT
-UID:74008510-EC34-11D6-B2E3-0050E4E60429
+UID:17972228-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T234754Z
 SUMMARY:CS - HW Ch 5-6 Due
 DTSTART;VALUE=DATE:20021111
@@ -170,39 +170,39 @@ BEGIN:VEVENT
 DTSTAMP:20021024T234841Z
 SUMMARY:Computer Organization Test 2
 DTEND;TZID=US/Central:20021112T203000
-UID:740089B4-EC34-11D6-B2E3-0050E4E60429
 DTSTART;TZID=US/Central:20021112T190000
+UID:17972788-EE1A-11D6-A6EB-0050E4E60429
 END:VEVENT
 BEGIN:VEVENT
-DTSTAMP:20021024T234904Z
+DTSTAMP:20021102T041802Z
 SUMMARY:CS - Lab 3 Due
-UID:74008E30-EC34-11D6-B2E3-0050E4E60429
-DTSTART;TZID=US/Central:20021118T150000
-DURATION:PT1H45M
+UID:17972CDC-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;VALUE=DATE:20021118
+DTEND;VALUE=DATE:20021119
 END:VEVENT
 BEGIN:VEVENT
-UID:740092C0-EC34-11D6-B2E3-0050E4E60429
+UID:1797323A-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T235055Z
 SUMMARY:Thanksgiving Break
 DTSTART;VALUE=DATE:20021128
 DTEND;VALUE=DATE:20021202
 END:VEVENT
 BEGIN:VEVENT
-UID:740098ED-EC34-11D6-B2E3-0050E4E60429
+UID:179737BE-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T235244Z
 SUMMARY:CS - Lab 4 Due
 DTSTART;VALUE=DATE:20021209
 DTEND;VALUE=DATE:20021210
 END:VEVENT
 BEGIN:VEVENT
-UID:74009D95-EC34-11D6-B2E3-0050E4E60429
+UID:17973D1C-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021024T235322Z
 SUMMARY:CS - HW Ch 7-9 Due
 DTSTART;VALUE=DATE:20021213
 DTEND;VALUE=DATE:20021214
 END:VEVENT
 BEGIN:VEVENT
-UID:7400A566-EC34-11D6-B2E3-0050E4E60429
+UID:1797431C-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021030T180640Z
 SUMMARY:Ling - Journal Due: Phonology
 DTSTART;VALUE=DATE:20021104
@@ -212,33 +212,33 @@ BEGIN:VEVENT
 DTSTAMP:20021030T180940Z
 RECURRENCE-ID;TZID=US/Central:20021106T090000
 DTSTART;TZID=US/Central:20021106T090000
-UID:73FFE032-EC34-11D6-B2E3-0050E4E60429
+UID:17965C2C-EE1A-11D6-A6EB-0050E4E60429
 DURATION:PT1H
 DESCRIPTION:Meet in Library Computer Lab
 END:VEVENT
 BEGIN:VEVENT
-UID:73FFE032-EC34-11D6-B2E3-0050E4E60429
 RECURRENCE-ID;TZID=US/Central:20021111T090000
+UID:17965C2C-EE1A-11D6-A6EB-0050E4E60429
 DTSTART;TZID=US/Central:20021111T090000
 DURATION:PT1H
 DESCRIPTION:Meet in Confer 230
 END:VEVENT
 BEGIN:VEVENT
-UID:7400AAE0-EC34-11D6-B2E3-0050E4E60429
+UID:179748A4-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021030T181349Z
 SUMMARY:Ling - Rough Draft for Paper 1 Due
 DTSTART;VALUE=DATE:20021111
 DTEND;VALUE=DATE:20021112
 END:VEVENT
 BEGIN:VEVENT
-UID:7400AF8D-EC34-11D6-B2E3-0050E4E60429
+UID:17974E1A-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021030T181450Z
 SUMMARY:CPR - Red Cross Written Test
 DTSTART;VALUE=DATE:20021106
 DTEND;VALUE=DATE:20021107
 END:VEVENT
 BEGIN:VEVENT
-UID:7400B448-EC34-11D6-B2E3-0050E4E60429
+UID:179753B2-EE1A-11D6-A6EB-0050E4E60429
 DTSTAMP:20021030T181535Z
 SUMMARY:Bible - Quiz 2
 DTSTART;VALUE=DATE:20021105
diff --git a/calendars/default.ics b/calendars/default.ics
index a39010b..a0df229 100644
--- a/calendars/default.ics
+++ b/calendars/default.ics
@@ -63,11 +63,11 @@ END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:5
 DTSTAMP:20020926T031348Z
-SUMMARY:New Event
+SUMMARY:last sunday
 UID:54C848A4-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20020922T113000
 DURATION:PT1H
-RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1SU
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=-2SU,-3FR
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3