Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.14 -r1.180.2.15
--- openacs-4/packages/xowiki/xowiki.info	29 Jul 2019 17:13:24 -0000	1.180.2.14
+++ openacs-4/packages/xowiki/xowiki.info	13 Aug 2019 16:58:30 -0000	1.180.2.15
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d34" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d34.apm">
+    <version name="5.10.0d35" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d35.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d34"/>
+        <provides url="xowiki" version="5.10.0d35"/>
         <requires url="xotcl-core" version="5.10.0d16"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
@@ -130,6 +130,7 @@
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="with_user_tracking"  default="1" description="track page view usage per user" section_name="Options"/>
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="with_yahoo_publisher"  default="0" description="When specified, a button for adding the content to my.yahoo.com is added" section_name="Options"/>
             <parameter scope="instance" datatype="number" min_n_values="1"  max_n_values="1" name="use_hstore"  default="0" description="Use hstore for accessing instance  attributes. Create index for  existing values via  ::xowiki::hstore::update_form_instance_item_index -package_id $package_id"/>
+            <parameter scope="global" datatype="number" min_n_values="1"  max_n_values="1" name="hstore_max_value_size"  default="2000" description="When hstore is activate, don't store entries larger than this size in the hkey. This makes it possible to produce smaller hkey indices and to use e.g. GIN, which has a size limit of 2K"/>
 	  </parameters>
 
     </version>
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -r1.57.2.5 -r1.57.2.6
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	9 Aug 2019 08:29:28 -0000	1.57.2.5
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	13 Aug 2019 16:58:31 -0000	1.57.2.6
@@ -96,10 +96,15 @@
   ad_proc dict_as_hkey {dict} {
     @return dict value in form of a hstore key.
   } {
+    set max_value_size [parameter::get_global_value -package_key xowiki -parameter hstore_max_value_size -default 0]
     set keys {}
     foreach {key value} $dict {
       set v [double_quote $value]
-      if {$v eq ""} continue
+      if {$v eq ""
+          || ($max_value_size > 0 && [string length $v] >= $max_value_size)
+        } {
+        continue
+      }
       lappend keys [double_quote $key]=>$v
     }
     return [join $keys ,]