Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.101 -r1.102
--- openacs-4/packages/xowiki/xowiki.info	10 Oct 2008 18:21:41 -0000	1.101
+++ openacs-4/packages/xowiki/xowiki.info	29 Oct 2008 14:14:20 -0000	1.102
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.103" url="http://openacs.org/repository/download/apm/xowiki-0.103.apm">
+    <version name="0.104" url="http://openacs.org/repository/download/apm/xowiki-0.104.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2008-10-10</release-date>
+        <release-date>2008-10-29</release-date>
         <vendor>Gustaf Neumann, WU Wien</vendor>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
@@ -54,18 +54,18 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.103"/>
+        <provides url="xowiki" version="0.104"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
         <requires url="xotcl-core" version="0.98"/>
 
         <callbacks>
-            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
             <callback type="after-install"  proc="::xowiki::after-install"/>
-            <callback type="before-uninstantiate"  proc="::xowiki::before-uninstantiate"/>
+            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
+            <callback type="before-uninstantiate"  proc="::xowiki::before-uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="autoname"  default="0" description="Automatically name items of this instance" section_name="Form"/>
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.303 -r1.304
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Oct 2008 12:33:12 -0000	1.303
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	29 Oct 2008 14:14:21 -0000	1.304
@@ -1970,6 +1970,9 @@
     my array set __ia [my instance_attributes]
     next
   }
+  FormPage instproc initialize {} {
+    # can be overloaded
+  }
 
   FormPage instproc condition=in_state {query_context value} {
     # possible values can be or-ed together (e.g. initial|final)
@@ -2082,7 +2085,7 @@
 
   FormPage instproc property {name {default ""}} {
     set key  [my property_key $name]
-    # my msg "$key [my exists $key] //[my array names __ia]//"
+    #my msg "$key [my exists $key] //[my array names __ia]//"
     if {[my exists $key]} {
       return [my set $key]
     }
@@ -2163,7 +2166,8 @@
     if {$form eq ""} {
       foreach {var _} [my template_vars $template] {
         #if {[string match _* $var]} continue
-	if {[lsearch $allvars $var] == -1} {lappend field_names $var}
+	if {[lsearch $allvars $var] == -1 
+            && [lsearch $field_names $var] == -1} {lappend field_names $var}
       }
       set from_HTML_form 0
     } else {
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.193 -r1.194
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	23 Oct 2008 12:35:10 -0000	1.193
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	29 Oct 2008 14:14:21 -0000	1.194
@@ -1660,9 +1660,15 @@
                -publish_status "production" \
                -instance_attributes $instance_attributes \
                -page_template [my item_id]]
+
     if {[my exists state]} {
       $f set state [my set state]
     }
+    # Call the application specific initialization, when a FormPage is
+    # initially created. This is used to control the live-cycle of
+    # FormPages.
+    $f initialize
+
     #
     # if we copy an item, we use source_item_id to provide defaults
     #
@@ -1673,7 +1679,7 @@
       set name "[::xowiki::autoname generate -parent_id $source_item_id -name [my name]]"
       $package_id get_lang_and_name -name $name lang name
       $f set name $name
-      my msg nls=[$f nls_language],source-nls=[$source nls_language]
+      #my msg nls=[$f nls_language],source-nls=[$source nls_language]
     } else {
       #
       # set some default values from query parameters