merged

android/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="foam.symbai"
-      android:versionCode="8"
+      android:versionCode="10"
       android:versionName="1.0">
   <application android:label="@string/app_name"
                android:icon="@drawable/logo"
@@ -26,7 +26,7 @@
     <activity android:name="foam.symbai.FamilyActivity" android:configChanges="orientation"></activity>
     <activity android:name="foam.symbai.MigrationActivity" android:configChanges="orientation"></activity>
     <activity android:name="foam.symbai.IncomeActivity" android:configChanges="orientation"></activity>
-    <activity android:name="foam.symbai.GeneaologyActivity" android:configChanges="orientation"></activity>
+    <activity android:name="foam.symbai.GenealogyActivity" android:configChanges="orientation"></activity>
     <activity android:name="foam.symbai.SocialActivity" android:configChanges="orientation"></activity>
     <activity android:name="foam.symbai.FriendshipActivity" android:configChanges="orientation"></activity>
     <activity android:name="foam.symbai.AgreementActivity" android:configChanges="orientation"></activity>

android/README.md

-Open Sauces Notebook
-====================
-
-A structured notebook for recipes
+Symbai android app
+==================

android/assets/dbsync.scm

@@ -17,6 +17,8 @@
 
 (msg "dbsync.scm")
 
+(define unset-int 2147483647)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; stuff in memory
 
@@ -88,22 +90,51 @@
 (define (entity-get-value key)
   (ktv-get (get-current 'entity-values '()) key))
 
+(define (check-type type value)
+  (cond
+   ((equal? type "varchar")
+    (string? value))
+   ((equal? type "file")
+    (string? value))
+   ((equal? type "int")
+    (number? value))
+   ((equal? type "real")
+    (number? value))))
+
 ;; version to check the entity has the key
 (define (entity-set-value! key type value)
+  (when (not (check-type type value))
+        (msg "INCORRECT TYPE FOR" key ":" type ":" value))
+
   (let ((existing-type (ktv-get-type (get-current 'entity-values '()) key)))
-    (if (equal? existing-type type)
-        (set-current!
-         'entity-values
-         (ktv-set
-          (get-current 'entity-values '())
-          (ktv key type value)))
-        ;;
-        (begin
-          (msg "entity-set-value! - adding new " key "of type" type "to entity")
-          (entity-add-value-create! key type value)))
-    ;; save straight to local db every time
-    (entity-update-single-value! (list key type value))
-    ))
+    (cond
+     ((equal? existing-type type)
+      ;; save straight to local db every time (checks for modification)
+      (entity-update-single-value! (list key type value))
+      ;; then save to memory
+      (set-current!
+       'entity-values
+       (ktv-set
+        (get-current 'entity-values '())
+        (ktv key type value))))
+      ;;
+     (else
+      (msg "entity-set-value! - adding new " key "of type" type "to entity")
+      (entity-add-value-create! key type value))
+     )))
+
+;; version to check the entity has the key
+(define (entity-set-value-mem! key type value)
+  (when (not (check-type type value))
+        (msg "INCORRECT TYPE FOR" key ":" type ":" value))
+
+  ;; then save to memory
+  (set-current!
+   'entity-values
+   (ktv-set
+    (get-current 'entity-values '())
+    (ktv key type value))))
+
 
 
 (define (date-time->string dt)
@@ -163,6 +194,8 @@
         (table (get-current 'table #f))
         (unique-id (ktv-get (get-current 'entity-values '()) "unique_id")))
     (cond
+     ((ktv-eq? (ktv-get-whole (get-current 'entity-values '()) (ktv-key ktv)) ktv)
+      (msg "eusv: no change for" (ktv-key ktv)))
      (unique-id
       (update-entity db table (entity-id-from-unique db table unique-id) (list ktv)))
      (else
@@ -455,7 +488,7 @@
   (list
    (network-connect
     "network"
-    "mongoose-web"
+    "symbai-web"
     (lambda (state)
       (debug! (string-append "Raspberry Pi connection state now: " state))
       (append
@@ -575,11 +608,25 @@
                (layout 'fill-parent 'wrap-content 1 'centre 0)
                fn))))
 
+(define (medit-text-large id type fn)
+  (linear-layout
+   (make-id (string-append (symbol->string id) "-container"))
+   'vertical
+   (layout 'fill-parent 'wrap-content 1 'centre 20)
+   (list 0 0 0 0)
+   (list
+    (text-view 0 (mtext-lookup id)
+               30 (layout 'wrap-content 'wrap-content -1 'centre 0))
+    (edit-text (symbol->id id) "" 30 type
+               (layout 'fill-parent 300 -1 'left 0)
+               fn))))
+
+
 (define (mspinner id types fn)
   (vert
    (text-view (symbol->id id)
               (mtext-lookup id)
-              30 (layout 'wrap-content 'wrap-content 1 'centre 10))
+              30 (layout 'wrap-content 'wrap-content 1 'centre 0))
    (spinner (make-id (string-append (symbol->string id) "-spinner"))
             (map mtext-lookup types)
             (layout 'wrap-content 'wrap-content 1 'centre 0)
@@ -650,15 +697,19 @@
 (define (image-invalid? image-name)
   (or (null? image-name)
       (not image-name)
-      (equal? image-name "none")))
+      (equal? image-name "none")
+      (equal? image-name "")))
 
 ;; fill out the widget from the current entity in the memory store
 ;; dispatches based on widget type
 (define (mupdate widget-type id-symbol key)
   (cond
    ((or (eq? widget-type 'edit-text) (eq? widget-type 'text-view))
-    (update-widget widget-type (get-symbol-id id-symbol) 'text
-                   (entity-get-value key)))
+    (let ((v (entity-get-value key)))
+      (update-widget widget-type (get-symbol-id id-symbol) 'text
+                     ;; hide -1 as it represents unset
+                     (if (and (number? v) (eqv? v -1))
+                         "" v))))
    ((eq? widget-type 'toggle-button)
     (update-widget widget-type (get-symbol-id id-symbol) 'checked
                    (entity-get-value key)))
@@ -779,7 +830,7 @@
 
 ;; a standard builder for list widgets of entities and a
 ;; make new button, to add defaults to the list
-(define (build-list-widget db table title entity-type edit-activity parent-fn ktv-default-fn)
+(define (build-list-widget db table title title-ids entity-type edit-activity parent-fn ktv-default-fn)
     (vert-colour
      colour-two
      (horiz
@@ -794,7 +845,7 @@
           (ktvlist-merge
            (ktv-default-fn)
            (list (ktv "parent" "varchar" (parent-fn)))))
-         (list (update-list-widget db table entity-type edit-activity (parent-fn))))))
+         (list (update-list-widget db table title-ids entity-type edit-activity (parent-fn))))))
      (linear-layout
       (make-id (string-append entity-type "-list"))
       'vertical
@@ -802,13 +853,28 @@
       (list 0 0 0 0)
       (list))))
 
+(define (make-list-widget-title e title-ids)
+  (if (eqv? (length title-ids) 1)
+      (ktv-get e (car title-ids))
+      (string-append
+       (ktv-get e (car title-ids)) "\n"
+       (foldl
+        (lambda (id r)
+          (if (equal? r "")
+              (ktv-get e id)
+              (string-append r " " (ktv-get e id))))
+        "" (cdr title-ids)))))
+
 ;; pull db data into list of button widgets
-(define (update-list-widget db table entity-type edit-activity parent)
+(define (update-list-widget db table title-ids entity-type edit-activity parent)
   (let ((search-results
          (if parent
              (db-filter-only db table entity-type
                              (list (list "parent" "varchar" "=" parent))
-                             (list (list "name" "varchar")))
+                             (map
+                              (lambda (id)
+                                (list id "varchar"))
+                              title-ids))
              (db-all db table entity-type))))
     (update-widget
      'linear-layout
@@ -820,8 +886,8 @@
           (lambda (e)
             (button
              (make-id (string-append "list-button-" (ktv-get e "unique_id")))
-             (or (ktv-get e "name") "Unamed item")
-             40 (layout 'fill-parent 'wrap-content 1 'centre 5)
+             (make-list-widget-title e title-ids)
+             30 (layout 'fill-parent 'wrap-content 1 'centre 5)
              (lambda ()
                (list (start-activity edit-activity 0 (ktv-get e "unique_id"))))))
           search-results)))))
@@ -1029,13 +1095,13 @@
      (msg "making village" i)
      (let ((village (simpsons-village db table village-ktvlist)))
        (looper!
-        3
+        15
         (lambda (i)
           (alog "household")
           (msg "making household" i)
           (let ((household (simpsons-household db table village household-ktvlist)))
             (looper!
-             (random 10)
+             (+ 2 (random 5))
              (lambda (i)
                (msg "making individual" i)
                (simpsons-individual db table household individual-ktvlist))))))))))

android/assets/lib.scm

@@ -706,7 +706,7 @@
 
 (define (relative rules colour . l)
   (relative-layout
-   0 (rlayout 'fill-parent 'wrap-content 20 rules)
+   0 (rlayout 'fill-parent 'wrap-content (list 20 20 20 20) rules)
    colour
    l))
 
@@ -795,7 +795,8 @@
          ((null? w) #f)
          ;; drill deeper
          ((eq? (update-widget-token w) 'contents)
-          (msg "updateing contents from callback")
+          (update-callbacks! (update-widget-value w)))
+         ((eq? (update-widget-token w) 'contents-add)
           (update-callbacks! (update-widget-value w)))
          ((eq? (update-widget-token w) 'grid-buttons)
           (add-callback! (callback (update-widget-id w)
@@ -862,6 +863,7 @@
         (begin (display "no dialog called ")(display name)(newline))
         (let ((events (apply (dialog-fn dialog) args)))
           (update-dialogs! events)
+          (update-callbacks-from-update! events)
           (send (scheme->json events))))))
 
 ;; called by java

android/src/foam/symbai/starwisp.java

@@ -71,7 +71,7 @@ public class starwisp extends StarwispActivity
         ActivityManager.RegisterActivity("family",FamilyActivity.class);
         ActivityManager.RegisterActivity("migration",MigrationActivity.class);
         ActivityManager.RegisterActivity("income",IncomeActivity.class);
-        ActivityManager.RegisterActivity("geneaology",GeneaologyActivity.class);
+        ActivityManager.RegisterActivity("genealogy",GenealogyActivity.class);
         ActivityManager.RegisterActivity("social",SocialActivity.class);
         ActivityManager.RegisterActivity("friendship",FriendshipActivity.class);
         ActivityManager.RegisterActivity("individual-chooser",IndividualChooserActivity.class);
@@ -96,6 +96,8 @@ public class starwisp extends StarwispActivity
 
         File filesdir = new File(m_AppDir+"/files/");
         filesdir.mkdirs();
+        File backupdir = new File(m_AppDir+"/backup/");
+        backupdir.mkdirs();
 
         // build static things
         m_Scheme = new Scheme(this);

eavdb/eavdb.ss

@@ -86,3 +86,10 @@
    (lambda (i)
      (get-entity-only db table i kt-list))
    (filter-entities db table type filter)))
+
+;; only return (eg. name and photo)
+(define (db-filter-only-inc-deleted db table type filter kt-list)
+  (map
+   (lambda (i)
+     (get-entity-only db table i kt-list))
+   (filter-entities-inc-deleted db table type filter)))

eavdb/entity-filter.ss

@@ -86,6 +86,28 @@
    (if typed "where e.entity_type = ? order by n.value"
        "order by n.value")))
 
+(define (build-query-inc-deleted table filter)
+  (string-append
+   (foldl
+    (lambda (i r)
+      (let ((var (string-append (filter-key i) "_var")))
+        ;; add a query chunk
+        (string-append
+         r "join " table "_value_" (filter-type i) " "
+         "as " var " on "
+         var ".entity_id = e.entity_id and " var ".attribute_id = '" (filter-key i) "' and "
+         var ".value " (filter-op i) " ? ")))
+
+    ;; boilerplate query start
+    (string-append
+     "select e.entity_id from " table "_entity as e "
+     ;; order by name
+     "join " table "_value_varchar "
+     "as n on n.entity_id = e.entity_id and n.attribute_id = 'name' ")
+    filter)
+   "where e.entity_type = ? order by n.value"))
+
+
 (define (build-args filter)
   (map
    (lambda (i)
@@ -93,6 +115,23 @@
    filter))
 
 (define (filter-entities db table type filter)
+  (let ((q (build-query table filter)))
+    (let ((s (apply
+	      db-select
+	      (append
+	       (list db q)
+	       (build-args filter)
+	       (list type)))))
+      (msg (db-status db))
+      (if (null? s)
+	  '()
+	  (map
+	   (lambda (i)
+	     (vector-ref i 0))
+	   (cdr s))))))
+
+(define (filter-entities-inc-deleted db table type filter)
+  (let ((q (build-query-inc-deleted table filter)))
   (let ((s (apply
             db-select
             (append
@@ -105,4 +144,4 @@
         (map
          (lambda (i)
            (vector-ref i 0))
-         (cdr s)))))
+         (cdr s))))))

eavdb/entity-insert.ss

@@ -65,7 +65,7 @@
     ;; add all the keys
     (for-each
      (lambda (ktv)
-       (insert-value db table id ktv dirty))
+       (insert-value db table id ktv (not (zero? dirty))))
      ktvlist)
 
     (db-exec db "end transaction")

eavdb/entity-sync.ss

@@ -68,7 +68,8 @@
 (define (dirty-entities db table)
   (let ((de (db-select
              db (string-append
-                 "select entity_id, entity_type, unique_id, dirty, version from " table "_entity where dirty=1;"))))
+                 "select entity_id, entity_type, unique_id, dirty, version from "
+                 table "_entity where dirty=1 limit 5;"))))
     (if (null? de)
         '()
         (map

eavdb/entity-values.ss

@@ -88,7 +88,7 @@
     ;;(msg ktv)
     ;;(msg entity-id)
     (if (null? s)
-        (insert-value db table entity-id ktv #t)
+        (insert-value db table entity-id ktv #t) ;; <- don't make dirty!?
         (db-exec
          db (string-append "update " table "_value_" (ktv-type ktv)
                            " set value=?, dirty=0 where entity_id = ? and attribute_id = ?")
@@ -114,8 +114,8 @@
                               " where entity_id = ? and attribute_id = ?")
             entity-id (ktv-key kt))))
     (if (null? s) '()
-	(list (vector-ref (cadr s) 0)
-	      (vector-ref (cadr s) 1)))))
+        (list (vector-ref (cadr s) 0)
+              (vector-ref (cadr s) 1)))))
 
 (define (clean-value db table entity-id kt)
   (db-exec db (string-append "update " table "_value_" (ktv-type kt)

eavdb/ktv-list.ss

@@ -25,6 +25,13 @@
     (ktv-value (car ktv-list)))
    (else (ktv-get (cdr ktv-list) key))))
 
+(define (ktv-get-whole ktv-list key)
+  (cond
+   ((null? ktv-list) #f)
+   ((equal? (ktv-key (car ktv-list)) key)
+    (car ktv-list))
+   (else (ktv-get-whole (cdr ktv-list) key))))
+
 (define (ktv-get-type ktv-list key)
   (cond
    ((null? ktv-list) #f)

symbaidb/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="foam.symbaidb"
+      android:versionCode="1"
+      android:versionName="1.0">
+  <application android:label="@string/app_name"
+               android:icon="@drawable/logo"
+               android:theme="@style/StarwispTheme"
+               android:hardwareAccelerated="true"
+               >
+
+    <activity android:name="foam.symbaidb.starwisp"
+              android:configChanges="orientation"
+              android:label="@string/app_name">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name="MainActivity" android:configChanges="orientation"></activity>
+    <activity android:name="ReviewItemActivity" android:configChanges="orientation"></activity>
+
+  </application>
+
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-sdk android:minSdkVersion="8" />
+  <uses-feature android:name="android.hardware.camera" android:required="true" />
+
+  <supports-screens
+      android:smallScreens="true"
+      android:normalScreens="true"
+      android:largeScreens="true"
+      android:xlargeScreens="true"
+      android:anyDensity="true" />
+
+</manifest>

symbaidb/README.md

+Admin SQLite eavdb editor
+=========================

symbaidb/ant.properties

+#
+# Set the keystore properties for signing the application.
+#
+#key.store=ushahidi-key.keystore
+#key.alias=ushahidi-android
+key.store=/home/dave/.keystore
+key.alias=release_key

symbaidb/assets/.#dbsync.scm

+dave@fulmar.4670:1404729118
\ No newline at end of file

symbaidb/assets/eavdb

+../../eavdb/
\ No newline at end of file