diff options
Diffstat (limited to 'module/vcomponent')
| -rw-r--r-- | module/vcomponent/base.scm | 29 | ||||
| -rw-r--r-- | module/vcomponent/recurrence/generate.scm | 21 |
2 files changed, 9 insertions, 41 deletions
diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm index 38034a81..399f7af9 100644 --- a/module/vcomponent/base.scm +++ b/module/vcomponent/base.scm @@ -5,18 +5,6 @@ :use-module (vcomponent primitive) :use-module ((ice-9 optargs) :select (define*-public))) -;; (define og-struct-ref struct-ref) -;; (define (struct-ref struct field) -;; (format #t "struct = ~a, field = ~a~%" struct field) -;; (og-struct-ref struct field)) - -(use-modules (system vm trap-state)) - -(install-trap-handler! (lambda args (format #t "args = ~a~%" args))) - -(add-trace-at-procedure-call! struct-ref) -(add-trap-at-procedure-call! struct-ref) - ;; vline → value (define-public value (make-procedure-with-setter @@ -34,20 +22,11 @@ value)) (define (set-attr! component attr value) - (format #t "attr = ~a~%" attr) (aif (attr* component attr) - (begin (format #t "Existed~%") (struct-set! it 0 value)) - (begin (format #t "Creating, component = ~a, attr = ~a, value = ~a~%" component attr value) - (format #t "map = ~a~%" (struct-ref component 3)) - (let ((return (hash-set! (struct-ref component 3) - (as-string attr) - (make-vline value)))) - - (format #t "Return = ~a~%" return) - return - ) - - ))) + (struct-set! it 0 value) + (hash-set! (struct-ref component 3) + (as-string attr) + (make-vline value)))) ;; (define-public (values-left-count attr-list) ;; (length (take-while identity attr-list))) diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index a274ecfa..c2863954 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -73,10 +73,8 @@ (date->time-utc d)) (when (attr e 'DTEND) - (format #t "file = ~a~%dtstart = ~a~%duration = ~a~%" - (attr e 'X-HNH-FILENAME) (attr e 'DTSTART) (attr e 'DURATION)) - (set! (attr e 'DTEND) - (add-duration (attr e 'DTSTART) (attr e 'DURATION)))) + (set! (attr e 'DTEND) + (add-duration (attr e 'DTSTART) (attr e 'DURATION)))) ;; Return e)) @@ -126,21 +124,12 @@ (if (not (attr event 'RRULE)) (stream event) (begin - (format #t "!!! DURATION = ~a~%" (attr event 'DURATION)) (when (and (attr event 'DTEND) (not (attr event 'DURATION))) - (let ((dt (time-difference (attr event "DTEND") (attr event "DTSTART") ))) - (format #t "duration = ~a~%start = ~a, end = ~a~%diff = ~a~%" - (attr event "DURATION") - (attr event "DTSTART") (attr event "DTEND") - dt) - (set! (attr event "DURATION") - dt - #; - (time-difference + (set! (attr event "DURATION") + (time-difference (attr event "DTEND") - (attr event "DTSTART"))))) - (format #t "||| DURATION = ~a~%" (attr* event "DURATION")) + (attr event "DTSTART")))) (if (attr event "RRULE") (recur-event-stream event (parse-recurrence-rule (attr event "RRULE"))) ;; TODO some events STANDARD and DAYLIGT doesn't have RRULE's, but rather |