X-Git-Url: https://git.jsancho.org/?p=bongodb.git;a=blobdiff_plain;f=src%2Fbongodb.scm;h=e4df14bde9e1699503e91b4b9d6b9883446ba0b1;hp=c6b2571605ba23e3a9b4e1ef64a5796ea57760ba;hb=0fe9f925e00b6899f3b685082ed9b3374933c527;hpb=4740ec95b9715b4df93223c8547ac2ea398d0201

diff --git a/src/bongodb.scm b/src/bongodb.scm
index c6b2571..e4df14b 100644
--- a/src/bongodb.scm
+++ b/src/bongodb.scm
@@ -1,4 +1,3 @@
-;;;
 ;;; BongoDB, an embedded document-based engine
 ;;; Copyright (C) 2016 by Javier Sancho Fernandez <jsf at jsancho dot org>
 ;;;
@@ -20,7 +19,12 @@
   #:use-module (ice-9 receive)
   #:use-module (ice-9 vlist)
   #:use-module (srfi srfi-9)
-  #:use-module (srfi srfi-9 gnu))
+  #:use-module (srfi srfi-9 gnu)
+  #:export (make-collection
+	    collection?
+	    count
+	    insert
+	    find))
 
 
 ;;; Collection Definition
@@ -33,11 +37,14 @@
 (define (make-collection)
   (make-collection-record vlist-null))
 
+(define (count col)
+  (vlist-length (get-table col)))
+
 (set-record-type-printer! collection
   (lambda (record port)
     (format port
 	    "#<collection with ~a documents>"
-	    (vlist-length (get-table record)))))
+	    (count record))))
 
 
 ;;; Working with documents
@@ -72,10 +79,23 @@
   "Query the collection and return the documents that match with filter"
   (let ((table (get-table col)))
     (vhash-fold
-     (lambda (key value result) (cons (vhash->alist value) result))
+     (lambda (key document result)
+       (cond ((match-document? document filter)
+	      (cons (vhash->alist document) result))
+	     (else
+	      result)))
      '()
      table)))
 
+(define (match-document? document filter)
+  "Try to match the given document with a list of conditions"
+  (cond ((null? filter)
+	 #t)
+	(else
+	 (and
+	  (equal? (vhash-assoc (caar filter) document) (car filter))
+	  (match-document? document (cdr filter))))))
+
 
 ;;; Tools
 
@@ -84,13 +104,3 @@
    (lambda (key value result) (assoc-set! result key value))
    '()
    vhash))
-
-
-;;; Testing
-
-(define (sample-test)
-  (let ((col (make-collection)))
-    (format #t "1 New collection: ~a~%" col)
-    (set! col (insert col '((a . 1) (b . 2)) '((a . 10) (b . 20)) '((a . 1) (b . "hello world"))))
-    (format #t "2 Insert 3 documents: ~a~%" col)
-    (format #t "3 Search (a . 1): ~a~%" (find col '((a . 1))))))