Don't bail when a tag doesn't exist yet

Add the tag to the database if `first-result' returns nothing.
This commit is contained in:
Tom Willemsen 2012-12-28 01:39:16 +01:00
parent 908bbc3cfb
commit 59af3a13f9

View file

@ -15,19 +15,25 @@
(format #t "~a~% ~a~% ~a~% ~a~%~%" (string-no-null name) (string-no-null description) (format #t "~a~% ~a~% ~a~% ~a~%~%" (string-no-null name) (string-no-null description)
(string-no-null url) (seconds->string seconds))) (string-no-null url) (seconds->string seconds)))
(define (add-tag name)
(execute db "INSERT INTO tag VALUES (?)" name)
(last-insert-rowid db))
(define (add-bookmark url name description tags) (define (add-bookmark url name description tags)
(execute db "INSERT INTO bookmark VALUES (?, STRFTIME('%s'), ?, ?)" (execute db "INSERT INTO bookmark VALUES (?, STRFTIME('%s'), ?, ?)"
url name description) url name description)
(let ((bookmark-id (last-insert-rowid db))) (let ((bookmark-id (last-insert-rowid db)))
(for-each (lambda (tag) (for-each (lambda (tag)
(let ((tag-id (first-result db "SELECT rowid FROM tag WHERE name = ?" tag))) (let ((tag-id '()))
(unless tag-id (condition-case
(execute db "INSERT INTO tag VALUES (?)" tag) (set! tag-id (first-result db "SELECT rowid FROM tag WHERE name = ?" tag))
(set! tag-id (last-insert-rowid db))) (exn (exn sqlite3)
(if (eq? (get-condition-property exn 'sqlite3 'status) 'done)
(set! tag-id (add-tag tag))
(signal exn))))
(execute db "INSERT INTO bookmark_tag VALUES (?, ?)" (execute db "INSERT INTO bookmark_tag VALUES (?, ?)"
bookmark-id tag-id))) bookmark-id tag-id)))
tags)) tags)))
#t)
(define (url-string? str) (define (url-string? str)
(and (> (string-length str) 7) (and (> (string-length str) 7)
@ -42,7 +48,7 @@
(cond (cond
((url-string? (car cla)) ((url-string? (car cla))
(with-transaction (with-transaction
db (lambda () (add-bookmark (car cla) (cadr cla) (caddr cla) (cdddr cla))))) db (lambda () (add-bookmark (car cla) (cadr cla) (caddr cla) (cdddr cla)) #t)))
(else (else
(format #t "Unrecognized option: ~a~%" (car cla)))))) (format #t "Unrecognized option: ~a~%" (car cla))))))