commit 1714235dca98fed4b676cf394a2e8167d94043d7
parent f71971803f78f372cbd7857bfbb46f66321317e0
Author: Alexander Burger <abu@software-lab.de>
Date: Thu, 12 May 2011 16:46:57 +0200
Use "family.tgz" for local installation
Diffstat:
10 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/doc/family.l b/doc/family.l
@@ -1,4 +1,4 @@
-# 06may11abu
+# 12may11abu
# (c) Software Lab. Alexander Burger
(load "@lib/http.l" "@lib/xhtml.l" "@lib/form.l" "@lib/ps.l")
@@ -95,7 +95,7 @@
(de person ()
(app)
(action
- (html 0 (get (default *ID (val *DB)) 'nm) "lib.css" NIL
+ (html 0 (get (default *ID (val *DB)) 'nm) "@lib.css" NIL
(form NIL
(<h2> NIL (<id> (: nm)))
(panel T "Person '@1'" T '(choPerson) 'nm '+Person)
@@ -138,7 +138,7 @@
# Show all contemporaries of a person
(de contemporaries (*ID)
(action
- (html 0 "Contemporaries" "lib.css" NIL
+ (html 0 "Contemporaries" "@lib.css" NIL
(form NIL
(<h3> NIL (<id> "Contemporaries of " (: nm)))
(ifn (: obj dat)
@@ -212,7 +212,7 @@
# Tree display of a person's descendants
(de treeReport (This)
- (html 0 "Family Tree View" "lib.css" NIL
+ (html 0 "Family Tree View" "@lib.css" NIL
(<h3> NIL "Family Tree View")
(<ul> NIL
(recur (This)
@@ -227,7 +227,7 @@
### RUN ###
(de main ()
- (pool "doc/family/" *Dbs)
+ (pool "family/" *Dbs)
(unless (val *DB)
(put>
(set *DB (request '(+Man) 'nm "Adam"))
diff --git a/doc/family.tgz b/doc/family.tgz
Binary files differ.
diff --git a/doc/family/1 b/doc/family/1
Binary files differ.
diff --git a/doc/family/2 b/doc/family/2
Binary files differ.
diff --git a/doc/family/3 b/doc/family/3
Binary files differ.
diff --git a/doc/family/4 b/doc/family/4
Binary files differ.
diff --git a/doc/tut.html b/doc/tut.html
@@ -1800,11 +1800,15 @@ entity/relation class framework (see also <a href="ref.html#dbase">Database</a>)
which allows a close mapping of the application data structure to the database.
<p>We provided a simple yet complete database and GUI demo application in
-<code><a href="family.l">@doc/family.l</a></code>. We recommend to start it up
-for test purposes in the following way:
+<code><a href="family.tgz">@doc/family.tgz</a></code>. It contains the sources
+in <code><a href="family.l">@doc/family.l</a></code>, and an initial database in
+the "family/" subdirectory.
+
+<p>To use it, please unpack it first in your current working directory, then
+start it up in the following way:
<pre><code>
-$ pil @doc/family.l -main +
+$ pil family.l -main +
:
</code></pre>
@@ -2081,7 +2085,7 @@ href="family.l">@doc/family.l</a></code>.
<p>To start the database <i>and</i> the application server, call:
<pre><code>
-$ pil @doc/family.l -main -go +
+$ pil family.l -main -go +
</code></pre>
<p>As before, the database is opened with <code>main</code>. The function
@@ -2100,9 +2104,9 @@ that port will cause the function <code>person</code> to be invoked.
href="http://localhost:8080" target="GUI">http://localhost:8080</a></code>'.
<p>You should see a new browser window with an input form created by the
-function <code>person</code>. We provided an initial database in
-"@doc/family/[1-4]". You can navigate through it by clicking on the pencil icons
-besides the input fields.
+function <code>person</code>. We provided an initial database in "family/[1-4]".
+You can navigate through it by clicking on the pencil icons besides the input
+fields.
<p>The chart with the children data can be scrolled using the down
(<code>v</code>) and up (<code>^</code>) buttons.
@@ -2149,7 +2153,7 @@ interactively while it is running. For example, the global variable
<p>A production application would be started in a slightly different way:
<pre><code>
-$ pil @doc/family.l -main -go -wait
+$ pil family.l -main -go -wait
</code></pre>
<p>In that case, no debug prompt will appear. In both cases, however, two
@@ -2166,9 +2170,9 @@ PicoLisp prompt.
(de person ()
(app)
(action
- (html 0 (get (default *ID (seq (db: +Person))) 'nm) "lib.css" NIL
+ (html 0 (get (default *ID (val *DB)) 'nm) "@lib.css" NIL
(form NIL
- (<h3> (<id> (: nm)))
+ (<h2> (<id> (: nm)))
</code></pre>
<p>For an in-depth explanation of that startup code, please refer to the guide
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/src/vers.h b/src/vers.h
@@ -1 +1 @@
-static byte Version[4] = {3,0,6,10};
+static byte Version[4] = {3,0,6,11};
diff --git a/src64/version.l b/src64/version.l
@@ -1,6 +1,6 @@
-# 09may11abu
+# 12may11abu
# (c) Software Lab. Alexander Burger
-(de *Version 3 0 6 10)
+(de *Version 3 0 6 11)
# vi:et:ts=3:sw=3
