Add -d debug option, and more debug output.

diff --git a/linux/plan2icalendar b/linux/plan2icalendar
index f128ab088837b34c1094fac2c11ac3fe7c6470b4..ec8bed647e72afccb370e3c2e4080919dcba6dc1 100755 (executable)
--- a/linux/plan2icalendar
+++ b/linux/plan2icalendar
@@ -20,12 +20,12 @@ use Date::ICal;
 
 my @events;
 my %opts;
 
 my @events;
 my %opts;

-my $debug = 0;
-unless (getopts('if:o:', \%opts)) {
+unless (getopts('dif:o:', \%opts)) {

     usage();
     exit 1;
 }
 
     usage();
     exit 1;
 }
 

+my $debug = $opts{d} || 0;

 my $input  = $opts{f};
 my $output = $opts{o};
 
 my $input  = $opts{f};
 my $output = $opts{o};
 


@@ -47,6 +47,7 @@ Imports or exports between plan and iCalendar.
   -i          import ical file
   -f infile   read input from 'infile'
   -o outfile  read output from 'outfile'
   -i          import ical file
   -f infile   read input from 'infile'
   -o outfile  read output from 'outfile'

+  -d          enable debug output

 EOF
 }
 sub read_planfile {
 EOF
 }
 sub read_planfile {


@@ -153,25 +154,27 @@ sub read_icalendar {
     open (ICALENDAR, "<$filename") or die "Unable to read from $filename";
     my $oldval = $/;
     $/ = "\r\n";
     open (ICALENDAR, "<$filename") or die "Unable to read from $filename";
     my $oldval = $/;
     $/ = "\r\n";

+    print STDERR "Loading $filename\n" if $debug;

     while (<ICALENDAR>) {
     while (<ICALENDAR>) {

-       chomp;
-       if (m/^BEGIN:VEVENT/) {
-           my %event;
-           while (<ICALENDAR>) {
-               chomp;
-               last if (m/END:VEVENT/);
-               $event{description} = $1 if (m/^DESCRIPTION\s*:\s*(.+)$/);
-               $event{created} = $1 if (m/^CREATED\s*:\s*(.+)$/);
-               $event{dtend} = $1 if (m/^DTEND\s*:\s*(.+)$/);
-               $event{dtstamp} = $1 if (m/^DTSTAMP\s*:\s*(.+)$/);
-               $event{dtstart} = $1 if (m/^DTSTART\s*:\s*(.+)$/);
-               $event{last-modified} = $1 if (m/^LAST-MODIFIED\s*:\s*(.+)$/);
-               $event{sequence} = $1 if (m/^SEQUENCE\s*:\s*(.+)$/);
-               $event{summary} = $1 if (m/^SUMMARY\s*:\s*(.+)$/);
-               $event{uid} = $1 if (m/^UID\s*:\s*(.+)$/);
-           }
-           push @events, \%event;
-       }
+        chomp;
+        if (m/^BEGIN:VEVENT/) {
+            my %event;
+            while (<ICALENDAR>) {
+                chomp;
+                last if (m/END:VEVENT/);
+                $event{description} = $1 if (m/^DESCRIPTION\s*:\s*(.+)$/);
+                $event{created} = $1 if (m/^CREATED\s*:\s*(.+)$/);
+                $event{dtend} = $1 if (m/^DTEND\s*:\s*(.+)$/);
+                $event{dtstamp} = $1 if (m/^DTSTAMP\s*:\s*(.+)$/);
+                $event{dtstart} = $1 if (m/^DTSTART\s*:\s*(.+)$/);
+                $event{last-modified} = $1 if (m/^LAST-MODIFIED\s*:\s*(.+)$/);
+                $event{sequence} = $1 if (m/^SEQUENCE\s*:\s*(.+)$/);
+                $event{summary} = $1 if (m/^SUMMARY\s*:\s*(.+)$/);
+                $event{uid} = $1 if (m/^UID\s*:\s*(.+)$/);
+            }
+            push @events, \%event;
+            print STDERR "Event pushed\n" if $debug;
+        }

     }
     close (ICALENDAR);
     $/ = $oldval;
     }
     close (ICALENDAR);
     $/ = $oldval;