api.lisp

@@ -1,12 +0,0 @@
-(in-package #:cl-bible.api)
-
-(defvar *server* (make-instance 'h:easy-acceptor :port 4242))
-
-(defmethod start ((server h:easy-acceptor))
-  (h:start server))
-
-(h:define-easy-handler (get-reference :uri "/ref") (reference bible)
-  (setf (h:content-type*) "text/plain")
-  (setf (h:header-out :access-control-allow-origin) "*")
-  (let ((bible (d::read-bible-from-tsv (or bible "mng"))))
-    (j:to-json (v:to-sexp (s:find-verse bible (s:parse-position reference))))))

chapter.lisp

@@ -27,9 +27,7 @@
   (create-div (create-web-content (create-web-main canvas))))
 
 (defmethod display-chapter-or-book (canvas (chapter chapter))
-  (let ((div (book/chapter-window canvas)))
-    (chapter-to-clog chapter div)
-    div))
+  (chapter-to-clog chapter (book/chapter-window canvas)))
 
 (defmethod load-chapter (canvas (book string) (chapter string))
   (let* ((bk (s:find-book d:*bible* book))

cl-bible.asd

@@ -6,7 +6,7 @@
   :license  "MIT"
   :version "0.0.4"
   :serial t
-  :depends-on (#:str #:clog #:hunchentoot #:jonathan)
+  :depends-on (#:str #:clog)
   :components ((:file "package")
                (:file "chapter")
                (:file "verse")

cl-bible.lisp

@@ -12,5 +12,8 @@
   (start)
   (loop))
 
-(defun build (&optional (name "bible"))
-  #+sbcl (sb-ext:save-lisp-and-die name :executable t :toplevel #'main))
+(defun build ()
+  (mapc (lambda (verse)
+          (setf (cl-bible.verse:notes verse) nil))
+        cl-bible.data:*bible*)
+  #+sbcl (sb-ext:save-lisp-and-die "bible" :executable t :toplevel #'main))

clog.lisp

@@ -3,7 +3,6 @@
 (in-package #:cl-bible.clog)
 
 (defvar *body*)
-(defvar *text* nil)
 
 (defun lift-search-window (body search)
   (let ((result (mapcar #'car (l:lift-search search))))
@@ -33,12 +32,10 @@
                                         (v:verse-to-string verse)))
              (lambda (obj)
                (declare (ignore obj))
-               (when *text* (destroy *text*))
-               (setf *text* (ch:load-chapter canvas
+               (ch:load-chapter canvas
                                 (v:bname verse)
-                                             (v:chapter verse))))))
-          results)
-    content))
+                                (v:chapter verse)))))
+          results)))
 
 (defun reload (window)
   (lambda (obj)
@@ -88,14 +85,12 @@
     (set-on-submit form1
                    (lambda (obj)
                      (declare (ignore obj))
-                     (when *text* (destroy *text*))
-                     (setf *text* (ch:load-position body (value passage)))))
+                     (ch:load-position body (value passage))))
     (create-form-element form3 :submit :value "Search phrase")
     (set-on-submit form3
                    (lambda (obj)
                      (declare (ignore obj))
-                     (when *text* (destroy *text*))
-                     (setf *text* (search-in-bible (value search) d:*bible* body))))))
+                     (search-in-bible (value search) d:*bible* body)))))
 
 (defun on-new-window (body)
   (setf *body* body)

package.lisp

@@ -75,13 +75,3 @@
         #:cl-bible.search)
   (:local-nicknames (#:c #:clog)
                     (#:cg #:clog-gui)))
-
-(defpackage #:cl-bible.api
-  (:use #:cl)
-  (:local-nicknames (#:l #:cl-bible.lift-search)
-                    (#:d #:cl-bible.data)
-                    (#:s #:cl-bible.search)
-                    (#:v #:cl-bible.verse)
-                    (#:ch #:cl-bible.chapter)
-                    (#:h #:hunchentoot)
-                    (#:j #:jonathan)))

verse.lisp

@@ -33,7 +33,7 @@
 (defgeneric from-sexp (bible))
 
 (defmethod print-object ((verse verse) stream)
-  (format stream (verse-to-string verse)))
+  (format stream (verse-to-string verse :separator " ")))
 
 (defmethod string-to-verse ((string string))
   (let ((verse (uiop:split-string string :separator '(#\Tab))))