? 685942-1_feeds_fixes.patch
? 685942-2_feeds_school.patch
? 685942-3_feeds_fixes.patch
Index: FeedsIcalDateParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/parser_ical/FeedsIcalDateParser.inc,v
retrieving revision 1.4
diff -u -p -r1.4 FeedsIcalDateParser.inc
--- FeedsIcalDateParser.inc	15 Jan 2010 10:36:23 -0000	1.4
+++ FeedsIcalDateParser.inc	15 Jan 2010 19:31:16 -0000
@@ -2,7 +2,8 @@
 // $Id: FeedsIcalDateParser.inc,v 1.4 2010/01/15 10:36:23 ekes Exp $
 
 /**
- * Overridden version of FeedsDateTimeElement that supports iCal specific parsing and repetition.
+ * Overridden version of FeedsDateTimeElement that supports iCal specific
+ * parsing and repetition.
  *
  * @todo repeating date storage not iCal specific, could be moved to base class.
  */
@@ -47,7 +48,8 @@ class FeedsIcalDateTimeElement extends F
        * Make sure we don't end up with thousands of values with RRULES
        * that have no UNTIL or COUNT.
        * @todo could be adjusted or made configurable later.
-       * NOTE: This is not properly timezone converted; that's the least of its problems.
+       * NOTE: This is not properly timezone converted; that's the least of its
+       * problems.
        */
       $max = date_now();
       $max_repeats = 52;
@@ -63,7 +65,8 @@ class FeedsIcalDateTimeElement extends F
       elseif (empty($form_values['UNTIL'])) {
         $form_values['UNTIL'] = array('datetime' => $until, 'tz' => 'UTC');
       }
-      // Save these in the form_values format, which date can convert to an rrule with date_api_ical_build_rrule()
+      // Save these in the form_values format, which date can convert to an
+      // rrule with date_api_ical_build_rrule()
       $this->repeat_vals = $form_values;
     }
   }
Index: tests/feeds_mapper_ical.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/parser_ical/tests/feeds_mapper_ical.test,v
retrieving revision 1.1
diff -u -p -r1.1 feeds_mapper_ical.test
--- tests/feeds_mapper_ical.test	15 Jan 2010 10:36:23 -0000	1.1
+++ tests/feeds_mapper_ical.test	15 Jan 2010 19:31:16 -0000
@@ -18,9 +18,9 @@ class FeedsMapperiCalTestCase extends  F
 
   public static function getInfo() {
     return array(
-      'name' => t('iCal Parser'),
-      'description' => t('Test Feeds iCal parser support and date mapping.'),
-      'group' => t('Feeds'),
+      'name' => t('Feeds integration'),
+      'description' => t('Test Feeds iCal parser support and date mapping. <strong>Requires Feeds and Date module.</strong>'),
+      'group' => t('iCal Parser'),
     );
   }
 
@@ -102,7 +102,11 @@ class FeedsMapperiCalTestCase extends  F
     }
   }
 
-protected function getFormFieldsNames($field_name, $index) {
+  /**
+   * Return the form field name for a given CCK field. Special handling for date
+   * fields.
+   */
+  protected function getFormFieldsNames($field_name, $index) {
     if (in_array($field_name, array('date', 'datetime', 'datestamp', 'eventdate', 'eventdate2'))) {
       return array("field_{$field_name}[{$index}][value][date]");
     }
Index: tests/feeds/School.ics
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/parser_ical/tests/feeds/School.ics,v
retrieving revision 1.1
diff -u -p -r1.1 School.ics
--- tests/feeds/School.ics	15 Jan 2010 10:36:23 -0000	1.1
+++ tests/feeds/School.ics	15 Jan 2010 19:31:17 -0000
@@ -1,6 +1,6 @@
 BEGIN:VCALENDAR
 METHOD:PUBLISH
-X-WR-TIMEZONE:US/Eastern
+X-WR-TIMEZONE:America/Montreal
 PRODID:-//Apple Inc.//iCal 3.0//EN
 CALSCALE:GREGORIAN
 X-WR-CALNAME:School
@@ -11,11 +11,11 @@ BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:C41732F8-ED49-4BD1-B1A0-ACF44101E653
-DTSTART;TZID=US/Eastern:20090831T193000
+DTSTART;TZID=America/Montreal:20090831T193000
 DTSTAMP:20090831T043238Z
 SUMMARY:Dunster Assembly
 CREATED:20090831T043208Z
-DTEND;TZID=US/Eastern:20090831T203000
+DTEND;TZID=America/Montreal:20090831T203000
 LOCATION:Dunster Dining Hall
 END:VEVENT
 BEGIN:VEVENT
@@ -26,61 +26,61 @@ DTSTART;TZID=Europe/Paris:20090901T19000
 DTSTAMP:20090831T131111Z
 SUMMARY:Advising Meeting with Ed
 CREATED:20090831T131037Z
-DTEND;TZID=US/Eastern:20090901T200000
+DTEND;TZID=Europe/Paris:20090901T200000
 LOCATION:Dunster Dining Hall
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:85B9AE9F-D01D-49D4-8065-FD5B951A6444
-DTSTART;TZID=US/Eastern:20090903T180000
+DTSTART;TZID=America/Montreal:20090903T180000
 DTSTAMP:20090831T154244Z
 SUMMARY:Sophomore Dinner
 CREATED:20090831T154230Z
-DTEND;TZID=US/Eastern:20090903T193000
+DTEND;TZID=America/Montreal:20090903T193000
 LOCATION:Dunster Dining Hall
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:2
 TRANSP:OPAQUE
 UID:CA0B177B-6C35-4822-A8E3-30F86476846E
-DTSTART;TZID=US/Eastern:20090905T094500
+DTSTART;TZID=America/Montreal:20090905T094500
 DTSTAMP:20090831T154329Z
 SUMMARY:Dunster Outing\, boat cruise
 CREATED:20090831T154319Z
-DTEND;TZID=US/Eastern:20090905T150000
+DTEND;TZID=America/Montreal:20090905T150000
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:6313079F-BD2F-4EC4-92A3-D9314C4B9A2A
-DTSTART;TZID=US/Eastern:20090902T100000
+DTSTART;TZID=America/Montreal:20090902T100000
 DTSTAMP:20090902T120313Z
 SUMMARY:Econ 1776
 CREATED:20090902T120301Z
-DTEND;TZID=US/Eastern:20090902T110000
+DTEND;TZID=America/Montreal:20090902T110000
 LOCATION:University Hall 201
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:0AA230CC-F858-4455-8F7C-C5604D81106B
-DTSTART;TZID=US/Eastern:20090902T160000
+DTSTART;TZID=America/Montreal:20090902T160000
 DTSTAMP:20090902T120334Z
 SUMMARY:Compsci 175
 CREATED:20090902T120318Z
-DTEND;TZID=US/Eastern:20090902T173000
+DTEND;TZID=America/Montreal:20090902T173000
 LOCATION:MD G-125
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:5
 TRANSP:OPAQUE
 UID:7CDFFB2E-074B-4177-8A60-7882C650B4A5
-DTSTART;TZID=US/Eastern:20090903T090000
+DTSTART;TZID=America/Montreal:20090903T090000
 DTSTAMP:20090914T150518Z
 SUMMARY:LitArt A-64
 CREATED:20090903T033151Z
-DTEND;TZID=US/Eastern:20090903T100000
+DTEND;TZID=America/Montreal:20090903T100000
 LOCATION:Boylston 110\, Fong
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20090915T035959Z;BYDAY=TU,TH;WKST=SU
 END:VEVENT
@@ -88,12 +88,12 @@ BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:75EF7CA6-90E2-4AF2-9749-54FF49DCF849
-DTSTART;TZID=US/Eastern:20090903T100000
+DTSTART;TZID=America/Montreal:20090903T100000
 DTSTAMP:20091118T222221Z
 SUMMARY:Physics 143a
-EXDATE;TZID=US/Eastern:20091126T100000
+EXDATE;TZID=America/Montreal:20091126T100000
 CREATED:20090903T033207Z
-DTEND;TZID=US/Eastern:20090903T113000
+DTEND;TZID=America/Montreal:20090903T113000
 LOCATION:Jefferson 256
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091208T045959Z;BYDAY=TU,TH;WKST=SU
 END:VEVENT
@@ -101,12 +101,12 @@ BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:68302B2D-3FA2-4B35-92EF-B2A08D134A64
-DTSTART;TZID=US/Eastern:20090903T113000
+DTSTART;TZID=America/Montreal:20090903T113000
 DTSTAMP:20091118T222221Z
 SUMMARY:Math 122
-EXDATE;TZID=US/Eastern:20091126T113000
+EXDATE;TZID=America/Montreal:20091126T113000
 CREATED:20090903T033217Z
-DTEND;TZID=US/Eastern:20090903T130000
+DTEND;TZID=America/Montreal:20090903T130000
 LOCATION:SC 507
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091208T045959Z;BYDAY=TU,TH;WKST=SU
 END:VEVENT
@@ -114,57 +114,57 @@ BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:2B1C6DCE-C49B-43DC-9E52-70A5F1D33DD2
-DTSTART;TZID=US/Eastern:20090903T130000
+DTSTART;TZID=America/Montreal:20090903T130000
 DTSTAMP:20090903T033256Z
 SUMMARY:Math 115
 CREATED:20090903T033224Z
-DTEND;TZID=US/Eastern:20090903T143000
+DTEND;TZID=America/Montreal:20090903T143000
 LOCATION:SC 310
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:349B2AF9-D3F3-49DA-BD3F-11F2F357E7A8
-DTSTART;TZID=US/Eastern:20090903T143000
+DTSTART;TZID=America/Montreal:20090903T143000
 DTSTAMP:20090903T033347Z
 SUMMARY:Compsci 61
 CREATED:20090903T033230Z
-DTEND;TZID=US/Eastern:20090903T160000
+DTEND;TZID=America/Montreal:20090903T160000
 LOCATION:MD G-115
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:5
 TRANSP:OPAQUE
 UID:A85D7912-A853-46A3-B164-58153804267F
-DTSTART;TZID=US/Eastern:20090903T133000
+DTSTART;TZID=America/Montreal:20090903T133000
 DTSTAMP:20090903T033433Z
 SUMMARY:Physics 15c
 CREATED:20090903T033350Z
-DTEND;TZID=US/Eastern:20090903T150000
+DTEND;TZID=America/Montreal:20090903T150000
 LOCATION:SC D
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:55FF8AC0-D541-405F-AE70-21BA967A4CE6
-DTSTART;TZID=US/Eastern:20090904T110000
+DTSTART;TZID=America/Montreal:20090904T110000
 DTSTAMP:20090904T002315Z
 SUMMARY:APMath 105a
 CREATED:20090904T002303Z
-DTEND;TZID=US/Eastern:20090904T120000
+DTEND;TZID=America/Montreal:20090904T120000
 LOCATION:Jefferson 250
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:7
 TRANSP:OPAQUE
 UID:F826A6FE-3EF5-49F9-9BA9-17B3040B5092
-DTSTART;TZID=US/Eastern:20090904T143000
+DTSTART;TZID=America/Montreal:20090904T143000
 DTSTAMP:20091118T222208Z
 SUMMARY:Physics 210
-EXDATE;TZID=US/Eastern:20091127T143000
-EXDATE;TZID=US/Eastern:20091125T143000
+EXDATE;TZID=America/Montreal:20091127T143000
+EXDATE;TZID=America/Montreal:20091125T143000
 CREATED:20090904T002328Z
-DTEND;TZID=US/Eastern:20090904T160000
+DTEND;TZID=America/Montreal:20090904T160000
 LOCATION:Jefferson 453
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091204T045959Z;BYDAY=WE,FR;WKST=SU
 END:VEVENT
@@ -172,22 +172,22 @@ BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:0C34C922-7E00-4093-AAB3-61880D4553B0
-DTSTART;TZID=US/Eastern:20090904T120000
+DTSTART;TZID=America/Montreal:20090904T120000
 DTSTAMP:20090904T002445Z
 SUMMARY:Math 131
 CREATED:20090904T002411Z
-DTEND;TZID=US/Eastern:20090904T130000
+DTEND;TZID=America/Montreal:20090904T130000
 LOCATION:SC 310
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:F8F66196-5AEB-4433-9DD5-8098F76261C9
-DTSTART;TZID=US/Eastern:20090909T170000
+DTSTART;TZID=America/Montreal:20090909T170000
 DTSTAMP:20091118T222221Z
 SUMMARY:Physics 143a Section
 CREATED:20090909T202701Z
-DTEND;TZID=US/Eastern:20090909T183000
+DTEND;TZID=America/Montreal:20090909T183000
 LOCATION:Lyman 425
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091209T045959Z
 END:VEVENT
@@ -195,11 +195,11 @@ BEGIN:VEVENT
 SEQUENCE:5
 TRANSP:OPAQUE
 UID:3292BDC1-FEDC-4179-B33B-C046F6FD4124
-DTSTART;TZID=US/Eastern:20090909T160000
+DTSTART;TZID=America/Montreal:20090909T160000
 DTSTAMP:20091118T222221Z
 SUMMARY:Math 122 Section
 CREATED:20090910T181726Z
-DTEND;TZID=US/Eastern:20090909T170000
+DTEND;TZID=America/Montreal:20090909T170000
 LOCATION:SC 103B
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091209T045959Z
 END:VEVENT
@@ -207,12 +207,12 @@ BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:13EC6F84-F8ED-4A63-A732-0428E30E859F
-DTSTART;TZID=US/Eastern:20090915T090000
+DTSTART;TZID=America/Montreal:20090915T090000
 DTSTAMP:20091118T222221Z
 SUMMARY:LitArt A-64
-EXDATE;TZID=US/Eastern:20091126T090000
+EXDATE;TZID=America/Montreal:20091126T090000
 CREATED:20090903T033151Z
-DTEND;TZID=US/Eastern:20090915T100000
+DTEND;TZID=America/Montreal:20090915T100000
 LOCATION:Sever 211
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091208T045959Z;BYDAY=TU,TH;WKST=SU
 END:VEVENT
@@ -220,12 +220,12 @@ BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:BF9E7FC9-88BA-4B81-A5D0-C4D98184286B
-DTSTART;TZID=US/Eastern:20090918T100000
+DTSTART;TZID=America/Montreal:20090918T100000
 DTSTAMP:20091118T222221Z
 SUMMARY:LitArt A-64 Section
-EXDATE;TZID=US/Eastern:20091127T100000
+EXDATE;TZID=America/Montreal:20091127T100000
 CREATED:20090914T220608Z
-DTEND;TZID=US/Eastern:20090918T110000
+DTEND;TZID=America/Montreal:20090918T110000
 LOCATION:Sever 112
 RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20091211T045959Z
 END:VEVENT
@@ -244,11 +244,11 @@ BEGIN:VEVENT
 SEQUENCE:4
 TRANSP:OPAQUE
 UID:C026968B-9DC3-4D05-B7AD-10E57484E000
-DTSTART;TZID=US/Eastern:20091004T200000
+DTSTART;TZID=America/Montreal:20091004T200000
 DTSTAMP:20091004T174248Z
 SUMMARY:Physics 143a review with Jay
 CREATED:20091004T174222Z
-DTEND;TZID=US/Eastern:20091004T220000
+DTEND;TZID=America/Montreal:20091004T220000
 LOCATION:Dunster Dining Hall
 END:VEVENT
 BEGIN:VEVENT
@@ -266,33 +266,33 @@ BEGIN:VEVENT
 SEQUENCE:3
 TRANSP:OPAQUE
 UID:FD1E3BA4-DD40-42C6-A899-A8807EABC051
-DTSTART;TZID=US/Eastern:20091212T140000
+DTSTART;TZID=America/Montreal:20091212T140000
 DTSTAMP:20091211T065353Z
 SUMMARY:LitArts A-64 Final
 CREATED:20091118T221813Z
-DTEND;TZID=US/Eastern:20091212T170000
+DTEND;TZID=America/Montreal:20091212T170000
 LOCATION:Sever 103
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:4
 TRANSP:OPAQUE
 UID:42FF755C-AAC6-49A6-B843-25A3A199681E
-DTSTART;TZID=US/Eastern:20091216T140000
+DTSTART;TZID=America/Montreal:20091216T140000
 DTSTAMP:20091211T065459Z
 SUMMARY:Math 122 Final
 CREATED:20091118T222335Z
-DTEND;TZID=US/Eastern:20091216T170000
+DTEND;TZID=America/Montreal:20091216T170000
 LOCATION:SC E
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:2
 TRANSP:OPAQUE
 UID:9C31A2C8-7CC3-453A-A63E-D82C8DA8D9EB
-DTSTART;TZID=US/Eastern:20091212T090000
+DTSTART;TZID=America/Montreal:20091212T090000
 DTSTAMP:20091118T222412Z
 SUMMARY:Physics 143a Final (bring calc!)
 CREATED:20091118T222403Z
-DTEND;TZID=US/Eastern:20091212T120000
+DTEND;TZID=America/Montreal:20091212T120000
 LOCATION:Sever 103
 END:VEVENT
 END:VCALENDAR