Minor modifications to parser, took out more regex where it wasn't needed

1 files changed, 48 insertions, 48 deletions

diff --git a/calendars/School.ics b/calendars/School.ics
index c0d3dfa..e0c87c6 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:179767CA-EE1A-11D6-A6EB-0050E4E60429
+X-WR-RELCALID;VALUE=TEXT:38066A8E-F1C7-11D6-A283-0050E4E60429
 VERSION:2.0
 BEGIN:VEVENT
-UID:179653BA-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;TZID=US/Central:20020904T080000
 DTSTAMP:20021024T235007Z
 SUMMARY:Computer Organization
+EXDATE;TZID=US/Central:20021010T080000
+EXDATE;TZID=US/Central:20021128T080000
 EXDATE;TZID=US/Central:20021018T080000
-EXDATE;TZID=US/Central:20021112T080000
 EXDATE;TZID=US/Central:20021002T080000
 EXDATE;TZID=US/Central:20021129T080000
-EXDATE;TZID=US/Central:20021010T080000
-EXDATE;TZID=US/Central:20021128T080000
 EXDATE;TZID=US/Central:20021001T080000
+EXDATE;TZID=US/Central:20021112T080000
 EXDATE;TZID=US/Central:20021021T080000
-DTSTART;TZID=US/Central:20020904T080000
+UID:3805B4DE-F1C7-11D6-A283-0050E4E60429
 DTEND;TZID=US/Central:20020904T090000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 END:VEVENT
 BEGIN:VEVENT
-UID:17965C2C-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;TZID=US/Central:20020904T090000
 DTSTAMP:20021030T181835Z
 SUMMARY:Linguistics
-EXDATE;TZID=US/Central:20021002T090000
-EXDATE;TZID=US/Central:20021108T090000
 EXDATE;TZID=US/Central:20021129T090000
-EXDATE;TZID=US/Central:20021018T090000
+EXDATE;TZID=US/Central:20021108T090000
 EXDATE;TZID=US/Central:20021021T090000
-DTSTART;TZID=US/Central:20020904T090000
+EXDATE;TZID=US/Central:20021018T090000
+EXDATE;TZID=US/Central:20021002T090000
+UID:3805BC0A-F1C7-11D6-A283-0050E4E60429
 DTEND;TZID=US/Central:20020904T100000
-RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,WE,FR
+RRULE:FREQ=WEEKLY;UNTIL=20021207T055959;INTERVAL=1;BYDAY=MO,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-UID:17966D68-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;TZID=US/Central:20020904T103000
 DTSTAMP:20021024T233307Z
 SUMMARY:First Aid & CPR
 EXDATE;TZID=US/Central:20021021T103000
 EXDATE;TZID=US/Central:20021002T103000
-DTSTART;TZID=US/Central:20020904T103000
+UID:3805D39E-F1C7-11D6-A283-0050E4E60429
 DTEND;TZID=US/Central:20020904T113000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,WE
 END:VEVENT
 BEGIN:VEVENT
-UID:179672EC-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;TZID=US/Central:20020904T133000
 DTSTAMP:20021024T235015Z
 SUMMARY:Japanese
-EXDATE;TZID=US/Central:20021002T133000
-EXDATE;TZID=US/Central:20021021T133000
 EXDATE;TZID=US/Central:20021018T133000
 EXDATE;TZID=US/Central:20021129T133000
+EXDATE;TZID=US/Central:20021002T133000
 EXDATE;TZID=US/Central:20021001T133000
-DTSTART;TZID=US/Central:20020904T133000
+EXDATE;TZID=US/Central:20021021T133000
+UID:3805D8FA-F1C7-11D6-A283-0050E4E60429
 DTEND;TZID=US/Central:20020904T143000
 RRULE:FREQ=WEEKLY;UNTIL=20021214T055959;INTERVAL=1;BYDAY=MO,TU,WE,FR
 END:VEVENT
 BEGIN:VEVENT
-UID:17967888-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;TZID=US/Central:20020905T143000
 DTSTAMP:20021030T180513Z
 SUMMARY:The Bible
 EXDATE;TZID=US/Central:20021001T143000
-EXDATE;TZID=US/Central:20021024T143000
 EXDATE;TZID=US/Central:20021128T143000
-DTSTART;TZID=US/Central:20020905T143000
+EXDATE;TZID=US/Central:20021024T143000
+UID:3805DE14-F1C7-11D6-A283-0050E4E60429
 DTEND;TZID=US/Central:20020905T163000
 RRULE:FREQ=WEEKLY;UNTIL=20021216T055959;INTERVAL=1;BYDAY=TU,TH
 END:VEVENT
 BEGIN:VEVENT
-UID:17967E06-EE1A-11D6-A6EB-0050E4E60429
+UID:3805E2BA-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20020919T031814Z
 SUMMARY:Reading Day
 DTSTART;VALUE=DATE:20021214
 DTEND;VALUE=DATE:20021215
 END:VEVENT
 BEGIN:VEVENT
-UID:17968370-EE1A-11D6-A6EB-0050E4E60429
+DTSTART;TZID=US/Central:20021219T153000
 DTSTAMP:20020919T042240Z
 SUMMARY:Japanese Final
-DTSTART;TZID=US/Central:20021219T153000
+UID:3805E7AC-F1C7-11D6-A283-0050E4E60429
 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
-UID:179688FE-EE1A-11D6-A6EB-0050E4E60429
-ORGANIZER;CN=Jared Wangen:mailto:jwangen@gac.edu
 DTSTART;TZID=US/Central:20021217T103000
-DURATION:PT2H
+ORGANIZER;CN=Jared Wangen:mailto:jwangen@gac.edu
 DESCRIPTION:NHS Auditorium
+UID:3805ED12-F1C7-11D6-A283-0050E4E60429
+DURATION:PT2H
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20020919T033447Z
 SUMMARY:Computer Organization Final
-UID:17968E62-EE1A-11D6-A6EB-0050E4E60429
 DTSTART;TZID=US/Central:20021218T080000
+UID:3805F204-F1C7-11D6-A283-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:3805F6B4-F1C7-11D6-A283-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:3805FB43-F1C7-11D6-A283-0050E4E60429
 DURATION:PT2H
 DESCRIPTION:Lund 109 (Classroom)
 END:VEVENT
 BEGIN:VEVENT
-UID:1796EDF6-EE1A-11D6-A6EB-0050E4E60429
+UID:38060036-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T233220Z
 SUMMARY:Fall Break
 DTSTART;VALUE=DATE:20021018
 DTEND;VALUE=DATE:20021022
 END:VEVENT
 BEGIN:VEVENT
-UID:1796F4B8-EE1A-11D6-A6EB-0050E4E60429
+UID:380605BC-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T233332Z
 SUMMARY:Nobel Conference
 DTSTART;VALUE=DATE:20021001
 DTEND;VALUE=DATE:20021003
 END:VEVENT
 BEGIN:VEVENT
-UID:17970B20-EE1A-11D6-A6EB-0050E4E60429
+UID:38060AD2-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T234504Z
 SUMMARY:CS - Lab 1 Due
 DTSTART;VALUE=DATE:20021003
 DTEND;VALUE=DATE:20021004
 END:VEVENT
 BEGIN:VEVENT
-UID:179711DA-EE1A-11D6-A6EB-0050E4E60429
+UID:38060FC2-F1C7-11D6-A283-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:38061472-F1C7-11D6-A283-0050E4E60429
 DTSTART;TZID=US/Central:20021010T190000
-UID:1797176E-EE1A-11D6-A6EB-0050E4E60429
 END:VEVENT
 BEGIN:VEVENT
-UID:17971CB6-EE1A-11D6-A6EB-0050E4E60429
+UID:3806192C-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T234720Z
 SUMMARY:CS - Lab 2 Due
 DTSTART;VALUE=DATE:20021101
 DTEND;VALUE=DATE:20021102
 END:VEVENT
 BEGIN:VEVENT
-UID:17972228-EE1A-11D6-A6EB-0050E4E60429
+UID:38061E68-F1C7-11D6-A283-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:38062D42-F1C7-11D6-A283-0050E4E60429
 DTSTART;TZID=US/Central:20021112T190000
-UID:17972788-EE1A-11D6-A6EB-0050E4E60429
 END:VEVENT
 BEGIN:VEVENT
+UID:38063304-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021102T041802Z
 SUMMARY:CS - Lab 3 Due
-UID:17972CDC-EE1A-11D6-A6EB-0050E4E60429
 DTSTART;VALUE=DATE:20021118
 DTEND;VALUE=DATE:20021119
 END:VEVENT
 BEGIN:VEVENT
-UID:1797323A-EE1A-11D6-A6EB-0050E4E60429
+UID:380637B8-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T235055Z
 SUMMARY:Thanksgiving Break
 DTSTART;VALUE=DATE:20021128
 DTEND;VALUE=DATE:20021202
 END:VEVENT
 BEGIN:VEVENT
-UID:179737BE-EE1A-11D6-A6EB-0050E4E60429
+UID:38063D06-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T235244Z
 SUMMARY:CS - Lab 4 Due
 DTSTART;VALUE=DATE:20021209
 DTEND;VALUE=DATE:20021210
 END:VEVENT
 BEGIN:VEVENT
-UID:17973D1C-EE1A-11D6-A6EB-0050E4E60429
+UID:38064228-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021024T235322Z
 SUMMARY:CS - HW Ch 7-9 Due
 DTSTART;VALUE=DATE:20021213
 DTEND;VALUE=DATE:20021214
 END:VEVENT
 BEGIN:VEVENT
-UID:1797431C-EE1A-11D6-A6EB-0050E4E60429
+UID:380647C2-F1C7-11D6-A283-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:17965C2C-EE1A-11D6-A6EB-0050E4E60429
+UID:3805BC0A-F1C7-11D6-A283-0050E4E60429
 DURATION:PT1H
 DESCRIPTION:Meet in Library Computer Lab
 END:VEVENT
 BEGIN:VEVENT
+UID:3805BC0A-F1C7-11D6-A283-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:179748A4-EE1A-11D6-A6EB-0050E4E60429
+UID:38064C92-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021030T181349Z
 SUMMARY:Ling - Rough Draft for Paper 1 Due
 DTSTART;VALUE=DATE:20021111
 DTEND;VALUE=DATE:20021112
 END:VEVENT
 BEGIN:VEVENT
-UID:17974E1A-EE1A-11D6-A6EB-0050E4E60429
+UID:380651BA-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021030T181450Z
 SUMMARY:CPR - Red Cross Written Test
 DTSTART;VALUE=DATE:20021106
 DTEND;VALUE=DATE:20021107
 END:VEVENT
 BEGIN:VEVENT
-UID:179753B2-EE1A-11D6-A6EB-0050E4E60429
+UID:380656C4-F1C7-11D6-A283-0050E4E60429
 DTSTAMP:20021030T181535Z
 SUMMARY:Bible - Quiz 2
 DTSTART;VALUE=DATE:20021105