Makefile

@@ -1,18 +0,0 @@
-LISP=sbcl
-
-run:
-	$(LISP) --eval "(ql:quickload :cl-bible)" --eval "(cl-bible:start)"
-
-build:
-	$(LISP) --eval "(ql:quickload :cl-bible)" --eval "(cl-bible:build)"
-
-install: build
-	sudo cp bible /usr/local/bin/
-
-uninstall:
-	rm /usr/local/bin/bible
-
-clean:
-	rm bible
-
-all: build

README.md

@@ -14,7 +14,3 @@ $ sbcl
 * (in-package :cl-bible-user)
 * (start)
 ```
-
-## bibles
-
-Most of the bibles are from [here](https://github.com/gratis-bible/bible).

cl-bible.asd

@@ -4,7 +4,7 @@
   :description "A bible study app"
   :author "Silas Vedder <silas@silasvedder.xyz>"
   :license  "MIT"
-  :version "0.0.4"
+  :version "0.0.3"
   :serial t
   :depends-on (#:str #:clog)
   :components ((:file "package")

clog.lisp

@@ -13,50 +13,26 @@
 (defun ergebnis/se (n)
   (format nil "~A Ergebnis~A" n (if (= n 1) "" "se")))
 
-(defun search-in-bible (phrase bible canvas)
+(defun search-in-bible (phrase canvas)
-  (let* ((win (window-content
+  (let* ((win (window-content (create-gui-window canvas :title phrase
-               (create-gui-window canvas :title
+                                                        :height 400
-                                  (format nil "~A: ~A"
+                                                        :width 650)))
-                                          d:*translation*
-                                          phrase)
-                                  :height 400
-                                  :width 650)))
          (lift-search (create-button win :content "Lift Search"))
          (div (create-div win))
-         (results (s:find-in-bible bible phrase)))
+         (results (s:find-in-bible d:*bible* phrase)))
     (set-on-click lift-search (lift-search-window canvas results))
     (create-p div :content (ergebnis/se
                             (length results)))
     (mapc (lambda (verse)
-            (v:verse-to-clog verse div :translation d:*translation*))
+            (v:verse-to-clog verse div :translation d::*translation*))
           results)))
 
-(defun %bible-book-or-chapter (bible book chapter)
-  (if (string= book "")
-      bible
-      (let ((book (s:find-book bible book)))
-        (if (string= chapter "")
-            book
-            (s:find-chapter book chapter)))))
-
-(defun search-with-chapter (window)
-  (lambda (data)
-    (let ((book (cadr (assoc "book" data :test #'string=)))
-          (chapter (cadr (assoc "chapter" data :test #'string=)))
-          (phrase (cadr (assoc "phrase" data :test #'string=))))
-      (search-in-bible phrase
-                       (%bible-book-or-chapter d:*bible* book chapter)
-                       window))))
-
 (defun searcher (window)
   (lambda (obj)
     (declare (ignore obj))
-    (form-dialog window "What do you want to search?"
+    (input-dialog window "What do you want to search?"
-                 '(("Phrase" "phrase" :text)
+                  (lambda (phrase)
-                   ("Book" "book" :text)
+                    (search-in-bible phrase window))))) 
-                   ("Chapter" "chapter" :text))
-                 (search-with-chapter window)
-                 :title "Search a phrase")))
 
 (defun reload (window)
   (lambda (obj)
@@ -73,6 +49,7 @@
                                              ("Schlachter 1951" :sch1951)
                                              ("Ukrainische Version" :ukr))))
                  (lambda (results)
+                   (princ (cadar results))
                    (d:update-bible (cadar results))
                    :title "Load a Bible"))))
 
@@ -83,31 +60,29 @@
       (if (string= chapter "")
           (load-book canvas book)
           (load-chapter canvas book chapter)))))
-
+           
 
 (defun load-book (canvas book)
   (let* ((win (window-content
-               (create-gui-window canvas :title (format nil "~A: ~A"
+               (create-gui-window canvas :title (format nil "~A"
-                                                        d:*translation*
                                                         book)
                                          :height 400
                                          :width 650)))
          (div (create-div win)))
     (mapc (lambda (verse)
-            (v:verse-to-clog verse div :translation d:*translation*))
+            (v:verse-to-clog verse div :translation d::*translation*))
           (s:find-book d:*bible* book))))
 
 (defun load-chapter (canvas book chapter)
   (let* ((win (window-content
-               (create-gui-window canvas :title (format nil "~A: ~A ~A"
+               (create-gui-window canvas :title (format nil "~A ~A"
-                                                        d:*translation*
                                                         book
                                                         chapter)
                                          :height 400
                                          :width 650)))
          (div (create-div win)))
     (mapc (lambda (verse)
-            (v:verse-to-clog verse div :translation d:*translation*))
+            (v:verse-to-clog verse div :translation d::*translation*))
           (s:find-chapter (s:find-book d:*bible* book) chapter))))
 
 (defun get-chapter (window body)

lift-search.lisp

@@ -5,7 +5,8 @@
 (defun frequent-words () (str:words "der die das dir mir wir ihr sie sein mein dein euer unser dem den in zu und"))
 
 (defun lift-search (search-result)
-  (comb (diff-verses (mapcar #'v:get-text search-result))
+  (comb (diff-verses (mapcar #'v:text
+                             search-result))
         (length search-result)))
 
 (defun count-words (words)

package.lisp

@@ -12,8 +12,7 @@
            vnumber
            text
            notes
-           translations
+           translations))
-           get-text))
 
 (defpackage #:cl-bible.search
   (:use #:cl)
@@ -22,6 +21,12 @@
            find-book
            find-chapter))
 
+(defpackage #:cl-bible.lift-search
+  (:use #:cl)
+  (:local-nicknames (#:s #:cl-bible.search)
+                    (#:v #:cl-bible.verse))
+  (:export lift-search))
+
 (defpackage #:cl-bible.data
   (:use #:cl)
   (:local-nicknames (#:s #:cl-bible.search)
@@ -32,13 +37,6 @@
            persist
            load-bibles))
 
-(defpackage #:cl-bible.lift-search
-  (:use #:cl)
-  (:local-nicknames (#:s #:cl-bible.search)
-                    (#:v #:cl-bible.verse)
-                    (#:d #:cl-bible.data))
-  (:export lift-search))
-
 (defpackage #:cl-bible.clog
   (:use #:cl #:clog #:clog-gui)
   (:local-nicknames (#:l #:cl-bible.lift-search)

search.lisp

@@ -4,7 +4,9 @@
 
 (defun find-in-bible (bible phrase)
   (remove-if-not (lambda (verse) (search phrase
-                                         (v:get-text verse)))
+                                         (cdr
+                                          (assoc cl-bible.data:*translation*
+                                                 (v:translations verse)))))
                  bible))
 
 (defun find-book (bible book)

verse.lisp

@@ -49,10 +49,6 @@
           separator
           (cdr (assoc translation (translations verse)))))
 
-(defgeneric get-text (verse))
-(defmethod get-text ((verse verse))
-  (cdr (assoc cl-bible.data:*translation* (translations verse))))
-
 (defmethod show-notes ((verse verse) (parent clog:clog-obj))
   (let* ((win (clog-gui:create-gui-window parent
                               :title "Notes"