Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.53 -r1.54
--- openacs-4/packages/xowiki/xowiki.info	26 Jun 2007 11:57:02 -0000	1.53
+++ openacs-4/packages/xowiki/xowiki.info	14 Jul 2007 18:14:26 -0000	1.54
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.54" url="http://openacs.org/repository/download/apm/xowiki-0.54.apm">
+    <version name="0.55" url="http://openacs.org/repository/download/apm/xowiki-0.55.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>2007-06-26</release-date>
+        <release-date>2007-07-14</release-date>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a wiki implementation for OpenACS in XOTcl. Instead of
 trying to implement the full set of wiki markup commands of systems
@@ -121,17 +121,22 @@
 improved localization, new includelet &quot;unread-items&quot;,
 export renaming for unnamed entries 
 
-0.54: FormField classes, more internationalization, recursive inclusion bug fixed
+0.54: FormField classes, more internationalization, 
+recursive inclusion bug fixed
+
+0.55: More complete set of FormField classes including 
+composite fields, better mix of HTML forms with 
+auto-generated form components.
 &lt;/pre&gt;</description>
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.54"/>
+        <provides url="xowiki" version="0.55"/>
         <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.52"/>
+        <requires url="xotcl-core" version="0.53"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
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.139 -r1.140
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 Jul 2007 14:14:06 -0000	1.139
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	14 Jul 2007 18:14:26 -0000	1.140
@@ -114,9 +114,10 @@
       -pretty_name "XoWiki Page Instance" -pretty_plural "XoWiki Page Instances" \
       -table_name "xowiki_page_instance"  -id_column "page_instance_id" \
       -cr_attributes {
-        ::Generic::Attribute new -attribute_name page_template -datatype integer 
-        ::Generic::Attribute new -attribute_name instance_attributes -datatype text \
-            -default ""
+        ::Generic::Attribute new -attribute_name page_template \
+            -datatype integer -sqltype integer
+        ::Generic::Attribute new -attribute_name instance_attributes \
+            -datatype text -sqltype long_text -default ""
       } \
       -form ::xowiki::PageInstanceForm \
       -edit_form ::xowiki::PageInstanceEditForm
@@ -131,8 +132,10 @@
       -pretty_name "XoWiki Form" -pretty_plural "XoWiki Forms" \
       -table_name "xowiki_form"  -id_column "xowiki_form_id" \
       -cr_attributes {
-        ::Generic::Attribute new -attribute_name form -datatype text 
-        ::Generic::Attribute new -attribute_name form_constraints -datatype text
+        ::Generic::Attribute new -attribute_name form \
+            -datatype text -sqltype long_text -default ""
+        ::Generic::Attribute new -attribute_name form_constraints \
+            -datatype text -sqltype long_text -default ""
       } \
       -form ::xowiki::FormForm
 
@@ -162,12 +165,12 @@
   ::xo::db::require index -table xowiki_last_visited -col user_id,package_id
   ::xo::db::require index -table xowiki_last_visited -col time
 
-
+  # Oracle has a limit of 3118 characters for keys, therefore no text as type for "tag"
   ::xo::db::require table xowiki_tags \
        "item_id integer references cr_items(item_id) on delete cascade,
         package_id integer,
         user_id integer references users(user_id),
-        tag     [::xo::db::sql map_datatype text],
+        tag     varchar(3000),
         time    timestamp"
   ::xo::db::require index -table xowiki_tags -col user_id,item_id
   ::xo::db::require index -table xowiki_tags -col tag,package_id
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.73 -r1.74
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Jul 2007 14:14:06 -0000	1.73
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	14 Jul 2007 18:14:26 -0000	1.74
@@ -752,6 +752,7 @@
         $f render_item
       }
     } $fcn
+
     #
     # append some fields after the HTML contents of the form 
     #