Proper parsing of credit lines.
This commit is contained in:
parent
d9b81561e9
commit
be01416a93
2 changed files with 13 additions and 4 deletions
|
@ -173,7 +173,7 @@ BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm \
|
||||||
testing.import.scm util-dict-list.import.scm cal-month.import.scm \
|
testing.import.scm util-dict-list.import.scm cal-month.import.scm \
|
||||||
cal-period.import.scm configuration.import.scm \
|
cal-period.import.scm configuration.import.scm \
|
||||||
util-string.import.scm util-list.import.scm \
|
util-string.import.scm util-list.import.scm \
|
||||||
util-parser.import.scm
|
util-parser.import.scm cal-day.import.scm
|
||||||
|
|
||||||
brmember-parser.o: brmember-parser.import.scm
|
brmember-parser.o: brmember-parser.import.scm
|
||||||
brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES)
|
brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES)
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
(chicken base)
|
(chicken base)
|
||||||
(chicken io)
|
(chicken io)
|
||||||
(chicken irregex)
|
(chicken irregex)
|
||||||
|
(chicken string)
|
||||||
brmember
|
brmember
|
||||||
testing
|
testing
|
||||||
util-dict-list
|
util-dict-list
|
||||||
|
@ -43,7 +44,8 @@
|
||||||
util-list
|
util-list
|
||||||
configuration
|
configuration
|
||||||
util-string
|
util-string
|
||||||
util-parser)
|
util-parser
|
||||||
|
cal-day)
|
||||||
|
|
||||||
;; Pass 2: known keys
|
;; Pass 2: known keys
|
||||||
(define mandatory-keys '(nick name mail phone))
|
(define mandatory-keys '(nick name mail phone))
|
||||||
|
@ -116,8 +118,15 @@
|
||||||
(lambda (rec)
|
(lambda (rec)
|
||||||
(let* ((fr (string-first+rest (car rec)))
|
(let* ((fr (string-first+rest (car rec)))
|
||||||
(amt (string->number (car fr)))
|
(amt (string->number (car fr)))
|
||||||
(msg (cdr fr)))
|
(msg (cdr fr))
|
||||||
(list amt "--" msg)))
|
(mlst (string-split msg))
|
||||||
|
(mon (if (null? mlst)
|
||||||
|
#f
|
||||||
|
(parse-cal-day/month (car mlst))))
|
||||||
|
(rmsg (if mon
|
||||||
|
(string-intersperse (cdr mlst) " ")
|
||||||
|
msg)))
|
||||||
|
(list amt mon rmsg)))
|
||||||
value)))
|
value)))
|
||||||
((nick)
|
((nick)
|
||||||
(let ((mr0 (brmember-sub-set mr output key (car value))))
|
(let ((mr0 (brmember-sub-set mr output key (car value))))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue