diff options
| -rw-r--r-- | libical/design-data/restrictions.csv | 32 | ||||
| -rwxr-xr-x | libical/scripts/mkderivedproperties.pl | 6 | ||||
| -rwxr-xr-x | libical/scripts/mkderivedvalues.pl | 22 | ||||
| -rwxr-xr-x | libical/scripts/mkrestrictiontable.pl | 12 | ||||
| -rw-r--r-- | libical/test-data/1 | 7 |
5 files changed, 49 insertions, 30 deletions
diff --git a/libical/design-data/restrictions.csv b/libical/design-data/restrictions.csv index e93f0a2a2a..bf71d96327 100644 --- a/libical/design-data/restrictions.csv +++ b/libical/design-data/restrictions.csv @@ -8,7 +8,7 @@ PUBLISH,VEVENT,UID,NONE,ONE PUBLISH,VEVENT,RECURRENCEID,NONE,ZEROORONE PUBLISH,VEVENT,SEQUENCE,NONE,ZEROORONE PUBLISH,VEVENT,ATTACH,NONE,ZEROPLUS -PUBLISH,VEVENT,CATEGORIES,NONE,ZEROORONE +PUBLISH,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard PUBLISH,VEVENT,CLASS,NONE,ZEROORONE PUBLISH,VEVENT,COMMENT,NONE,ZEROORONE PUBLISH,VEVENT,CONTACT,NONE,ZEROPLUS @@ -47,7 +47,7 @@ REQUEST,VEVENT,SEQUENCE,NONE,ZEROORONE REQUEST,VEVENT,SUMMARY,NONE,ONE REQUEST,VEVENT,UID,NONE,ONE REQUEST,VEVENT,ATTACH,NONE,ZEROPLUS -REQUEST,VEVENT,CATEGORIES,NONE,ZEROORONE +REQUEST,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard REQUEST,VEVENT,CLASS,NONE,ZEROORONE REQUEST,VEVENT,COMMENT,NONE,ZEROORONE REQUEST,VEVENT,CONTACT,NONE,ZEROPLUS @@ -85,7 +85,7 @@ REPLY,VEVENT,RECURRENCEID,NONE,ZEROORONE REPLY,VEVENT,UID,NONE,ONE REPLY,VEVENT,SEQUENCE,NONE,ZEROORONE REPLY,VEVENT,ATTACH,NONE,ZEROPLUS -REPLY,VEVENT,CATEGORIES,NONE,ZEROORONE +REPLY,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard REPLY,VEVENT,CLASS,NONE,ZEROORONE REPLY,VEVENT,COMMENT,NONE,ZEROORONE REPLY,VEVENT,CONTACT,NONE,ZEROPLUS @@ -125,7 +125,7 @@ ADD,VEVENT,SUMMARY,NONE,ONE ADD,VEVENT,UID,NONE,ONE ADD,VEVENT,ATTACH,NONE,ZEROPLUS ADD,VEVENT,ATTENDEE,NONE,ZEROPLUS -ADD,VEVENT,CATEGORIES,NONE,ZEROORONE +ADD,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard ADD,VEVENT,CLASS,NONE,ZEROORONE ADD,VEVENT,COMMENT,NONE,ZEROORONE ADD,VEVENT,CONTACT,NONE,ZEROPLUS @@ -163,7 +163,7 @@ CANCEL,VEVENT,SEQUENCE,NONE,ONE CANCEL,VEVENT,UID,NONE,ONE CANCEL,VEVENT,COMMENT,NONE,ZEROORONE CANCEL,VEVENT,ATTACH,NONE,ZEROPLUS -CANCEL,VEVENT,CATEGORIES,NONE,ZEROORONE +CANCEL,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard CANCEL,VEVENT,CLASS,NONE,ZEROORONE CANCEL,VEVENT,CONTACT,NONE,ZEROPLUS CANCEL,VEVENT,CREATED,NONE,ZEROORONE @@ -242,7 +242,7 @@ COUNTER,VEVENT,SUMMARY,NONE,ONE COUNTER,VEVENT,UID,NONE,ONE COUNTER,VEVENT,ATTACH,NONE,ZEROPLUS COUNTER,VEVENT,ATTENDEE,NONE,ZEROPLUS -COUNTER,VEVENT,CATEGORIES,NONE,ZEROORONE +COUNTER,VEVENT,CATEGORIES,NONE,ZEROPLUS #Non-standard COUNTER,VEVENT,CLASS,NONE,ZEROORONE COUNTER,VEVENT,COMMENT,NONE,ZEROORONE COUNTER,VEVENT,CONTACT,NONE,ZEROPLUS @@ -381,7 +381,7 @@ PUBLISH,VTODO,SEQUENCE,NONE,ZEROORONE PUBLISH,VTODO,SUMMARY,NONE,ONE PUBLISH,VTODO,UID,NONE,ONE PUBLISH,VTODO,ATTACH,NONE,ZEROPLUS -PUBLISH,VTODO,CATEGORIES,NONE,ZEROORONE +PUBLISH,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard PUBLISH,VTODO,CLASS,NONE,ZEROORONE PUBLISH,VTODO,COMMENT,NONE,ZEROORONE PUBLISH,VTODO,CONTACT,NONE,ZEROPLUS @@ -421,7 +421,7 @@ REQUEST,VTODO,SEQUENCE,NONE,ZEROORONE REQUEST,VTODO,SUMMARY,NONE,ONE REQUEST,VTODO,UID,NONE,ONE REQUEST,VTODO,ATTACH,NONE,ZEROPLUS -REQUEST,VTODO,CATEGORIES,NONE,ZEROORONE +REQUEST,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard REQUEST,VTODO,CLASS,NONE,ZEROORONE REQUEST,VTODO,COMMENT,NONE,ZEROORONE REQUEST,VTODO,CONTACT,NONE,ZEROPLUS @@ -457,7 +457,7 @@ REPLY,VTODO,ORGANIZER,NONE,ONE REPLY,VTODO,REQUESTSTATUS,NONE,ONEPLUS REPLY,VTODO,UID,NONE,ONE REPLY,VTODO,ATTACH,NONE,ZEROPLUS -REPLY,VTODO,CATEGORIES,NONE,ZEROORONE +REPLY,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard REPLY,VTODO,CLASS,NONE,ZEROORONE REPLY,VTODO,COMMENT,NONE,ZEROORONE REPLY,VTODO,CONTACT,NONE,ZEROPLUS @@ -497,7 +497,7 @@ ADD,VTODO,SUMMARY,NONE,ONE ADD,VTODO,UID,NONE,ONE ADD,VTODO,ATTACH,NONE,ZEROPLUS ADD,VTODO,ATTENDEE,NONE,ZEROPLUS -ADD,VTODO,CATEGORIES,NONE,ZEROORONE +ADD,VTODO,CATEGORIES,NONE,ZEROPLUS ADD,VTODO,CLASS,NONE,ZEROORONE ADD,VTODO,COMMENT,NONE,ZEROORONE ADD,VTODO,CONTACT,NONE,ZEROPLUS @@ -534,7 +534,7 @@ CANCEL,VTODO,DTSTAMP,NONE,ONE CANCEL,VTODO,ORGANIZER,NONE,ONE CANCEL,VTODO,SEQUENCE,NONE,ONE CANCEL,VTODO,ATTACH,NONE,ZEROPLUS -CANCEL,VTODO,CATEGORIES,NONE,ZEROORONE +CANCEL,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-Standard CANCEL,VTODO,CLASS,NONE,ZEROORONE CANCEL,VTODO,COMMENT,NONE,ZEROORONE CANCEL,VTODO,CONTACT,NONE,ZEROPLUS @@ -609,7 +609,7 @@ COUNTER,VTODO,PRIORITY,NONE,ONE COUNTER,VTODO,SUMMARY,NONE,ONE COUNTER,VTODO,UID,NONE,ONE COUNTER,VTODO,ATTACH,NONE,ZEROPLUS -COUNTER,VTODO,CATEGORIES,NONE,ZEROORONE +COUNTER,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-standard COUNTER,VTODO,CLASS,NONE,ZEROORONE COUNTER,VTODO,COMMENT,NONE,ZEROORONE COUNTER,VTODO,CONTACT,NONE,ZEROPLUS @@ -646,7 +646,7 @@ DECLINECOUNTER,VTODO,ORGANIZER,NONE,ONE DECLINECOUNTER,VTODO,SEQUENCE,NONE,ONE DECLINECOUNTER,VTODO,UID,NONE,ONE DECLINECOUNTER,VTODO,ATTACH,NONE,ZEROPLUS -DECLINECOUNTER,VTODO,CATEGORIES,NONE,ZEROORONE +DECLINECOUNTER,VTODO,CATEGORIES,NONE,ZEROPLUS #Non-standard DECLINECOUNTER,VTODO,CLASS,NONE,ZEROORONE DECLINECOUNTER,VTODO,COMMENT,NONE,ZEROORONE DECLINECOUNTER,VTODO,CONTACT,NONE,ZEROPLUS @@ -683,7 +683,7 @@ PUBLISH,VJOURNAL,DTSTART,NONE,ONE PUBLISH,VJOURNAL,ORGANIZER,NONE,ONE PUBLISH,VJOURNAL,UID,NONE,ONE PUBLISH,VJOURNAL,ATTACH,NONE,ZEROPLUS -PUBLISH,VJOURNAL,CATEGORIES,NONE,ZEROORONE +PUBLISH,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard PUBLISH,VJOURNAL,CLASS,NONE,ZEROORONE PUBLISH,VJOURNAL,COMMENT,NONE,ZEROORONE PUBLISH,VJOURNAL,CONTACT,NONE,ZEROPLUS @@ -715,7 +715,7 @@ ADD,VJOURNAL,ORGANIZER,NONE,ONE ADD,VJOURNAL,SEQUENCE,NONE,ONE ADD,VJOURNAL,UID,NONE,ONE ADD,VJOURNAL,ATTACH,NONE,ZEROPLUS -ADD,VJOURNAL,CATEGORIES,NONE,ZEROORONE +ADD,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard ADD,VJOURNAL,CLASS,NONE,ZEROORONE ADD,VJOURNAL,COMMENT,NONE,ZEROORONE ADD,VJOURNAL,CONTACT,NONE,ZEROPLUS @@ -745,7 +745,7 @@ CANCEL,VJOURNAL,SEQUENCE,NONE,ONE CANCEL,VJOURNAL,UID,NONE,ONE CANCEL,VJOURNAL,ATTACH,NONE,ZEROPLUS CANCEL,VJOURNAL,ATTENDEE,NONE,ZEROPLUS -CANCEL,VJOURNAL,CATEGORIES,NONE,ZEROORONE +CANCEL,VJOURNAL,CATEGORIES,NONE,ZEROPLUS #Non-standard CANCEL,VJOURNAL,CLASS,NONE,ZEROORONE CANCEL,VJOURNAL,COMMENT,NONE,ZEROORONE CANCEL,VJOURNAL,CONTACT,NONE,ZEROPLUS diff --git a/libical/scripts/mkderivedproperties.pl b/libical/scripts/mkderivedproperties.pl index f3c94f2cfd..010e35d178 100755 --- a/libical/scripts/mkderivedproperties.pl +++ b/libical/scripts/mkderivedproperties.pl @@ -56,7 +56,11 @@ if ($opt_i) { } - print "/* Everything below this line is machine generated. Do not edit. */\n"; + if($opt_p){ + print "# Everything below this line is machine generated. Do not edit. \n"; + } else { + print "/* Everything below this line is machine generated. Do not edit. */\n"; + } } diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl index a0909a6d94..ca2ee4b3a1 100755 --- a/libical/scripts/mkderivedvalues.pl +++ b/libical/scripts/mkderivedvalues.pl @@ -32,7 +32,11 @@ if ($opt_i) { } - print "/* Everything below this line is machine generated. Do not edit. */\n"; + if($opt_p){ + print "# Everything below this line is machine generated. Do not edit. \n"; + } else { + print "/* Everything below this line is machine generated. Do not edit. */\n"; + } } @@ -224,9 +228,9 @@ EOM print <<EOM; -package ICal::Value::${ucf}; -use ICal::Value; -\@ISA=qw(ICal::Value); +package Net::ICal::Value::${ucf}; +use Net::ICal::Value; +\@ISA=qw(Net::ICal::Value); sub new { my \$self = []; @@ -238,9 +242,9 @@ sub new my \$p; if (\$value){ - \$p = ICal::icalvalue_new_from_string(\$ICal::ICAL_${uc}_VALUE,\$value); + \$p = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${uc}_VALUE,\$value); } else { - \$p = ICal::icalvalue_new(\$ICal::ICAL_${uc}_VALUE); + \$p = Net::ICal::icalvalue_new(\$Net::ICal::ICAL_${uc}_VALUE); } \$self->[0] = \$p; @@ -256,9 +260,9 @@ sub set my \$impl = \$self->_impl(); if (\$v) { - my \$new_value = ICal::icalvalue_new_from_string(\$ICal::ICAL_${uc}_VALUE,\$v); + my \$new_value = Net::ICal::icalvalue_new_from_string(\$Net::ICal::ICAL_${uc}_VALUE,\$v); if (\$new_value){ - ICal::icalvalue_free(\$self->[0]); + Net::ICal::icalvalue_free(\$self->[0]); \$self->[0] = \$new_value; } @@ -273,7 +277,7 @@ sub get if (defined \$impl){ - return ICal::icalvalue_as_ical_string(\$impl); + return Net::ICal::icalvalue_as_ical_string(\$impl); } } diff --git a/libical/scripts/mkrestrictiontable.pl b/libical/scripts/mkrestrictiontable.pl index c91f3d0bc4..1dab5709b9 100755 --- a/libical/scripts/mkrestrictiontable.pl +++ b/libical/scripts/mkrestrictiontable.pl @@ -30,6 +30,7 @@ if ($opt_i) { close IN; } +# First build the property restriction table print "icalrestriction_property_record icalrestriction_property_records[] = {\n"; while(<F>) @@ -54,6 +55,7 @@ while(<F>) } +# Print the terminating line print " {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_NONE}\n"; print "};\n"; @@ -61,6 +63,7 @@ print "};\n"; print "icalrestriction_component_record icalrestriction_component_records[] = {\n"; +# Go back through the entire file and build the component restriction table close(F); open(F,"$ARGV[0]") || die "Can't open restriction data file $ARGV[0]:$!"; @@ -71,16 +74,21 @@ while(<F>) s/\#.*$//; - my($method,$targetcomp,$prop,$subcomp,$restr) = split(/,/,$_); + my($method,$targetcomp,$prop,$subcomp,$restr,$sub) = split(/,/,$_); next if !$method; + if(!$sub) { + $sub = "0"; + } + if($subcomp ne "NONE"){ - print(" \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${subcomp}_COMPONENT,ICAL_RESTRICTION_${restr}\},\n"); + print(" \{ICAL_METHOD_${method},ICAL_${targetcomp}_COMPONENT,ICAL_${subcomp}_COMPONENT,ICAL_RESTRICTION_${restr},$sub\},\n"); } } +# print the terminating line print " {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_NONE}\n"; print "};\n"; diff --git a/libical/test-data/1 b/libical/test-data/1 index 213b37d916..6a368d9997 100644 --- a/libical/test-data/1 +++ b/libical/test-data/1 @@ -23,14 +23,17 @@ DTSTAMP:19980309T231000Z UID:guid-1.host1.com ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com +ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:Employee-B@HOST.com +ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@Agony.Qualcomm.com DESCRIPTION:Project XYZ Review Meeting CATEGORIES:MEETING CLASS:PUBLIC CREATED:19980309T130000Z SUMMARY:XYZ Project Review -DTSTART;TZID=US-Eastern:19980312T083000 +DTSTAR;TZID=US-Eastern:19980312T083000 DTEND;TZID=US-Eastern:19980312T093000 -LOCATION:1CP Conference Room 4350 +LOCATION:1CP Conference +Room 4350 END:VEVENT END:VCALENDAR |