Load messages and handle table string with single tab inside.

bank-account.scm

@@ -40,6 +40,7 @@
   bank-transaction-currency
   bank-transaction-date
   bank-transaction-id
+  bank-transaction-message
   )
 
  (import scheme
@@ -67,6 +68,6 @@
 	 (cdr account)))
 
  ;; Creates a new bank transaction.
- (define-record bank-transaction id date amount currency varsym)
+ (define-record bank-transaction id date amount currency varsym message)
 
  )

bank-fio.scm

@@ -48,8 +48,9 @@
 				   (caddr row)
 				   ".")))
 	 (currency (string->symbol (cadddr row)))
-	 (varsym (list-ref row 9)))
+	 (varsym (list-ref row 9))
-     (make-bank-transaction id date amount currency varsym)))
+	 (message (list-ref row 12)))
+     (make-bank-transaction id date amount currency varsym message)))
 
  ;; Loads Fio bank accound statement.
  (define (bank-fio-parse fn)

members-payments.scm

@@ -53,9 +53,15 @@
      (if (null? transactions)
 	 mb
 	 (let* ((transaction (car transactions))
-		(varsym-id
+		(varsym-id0
 		 (string->number
-		   (bank-transaction-varsym transaction))))
+		  (bank-transaction-varsym transaction)))
+		(varsym-id
+		 (or varsym-id0
+		     (string->number
+		      (irregex-replace (irregex "[^0-9].*" 'u)
+				       (bank-transaction-message transaction)
+				       "")))))
 	   (loop (members-base-update mb
 				      (lambda (mr)
 					(eq? (member-id mr)

table.scm

@@ -139,9 +139,12 @@
  ;; Normalizes cell line to required width and handles leading and
  ;; trailing tabs to allow for right and center alignment.
  (define (table-normalize-cell-line line w)
+   (print "tncl " w " \"" line "\"")
    (let* ((lst (string->list line))
 	  (first-char (if (null? lst) #f (car lst)))
-	  (last-char (if (null? lst) #f (car (reverse lst))))
+	  (last-char (if (or (null? lst)
+			     (null? (cdr lst)))
+			 #f (car (reverse lst))))
 	  (first-tab (eq? first-char #\tab))
 	  (last-tab (eq? last-char #\tab))
 	  (line0 (if first-tab (substring line 1) line))