Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.57 -r1.180.2.58
--- openacs-4/packages/xowiki/xowiki.info	9 Feb 2021 11:16:22 -0000	1.180.2.57
+++ openacs-4/packages/xowiki/xowiki.info	14 Mar 2021 16:34:43 -0000	1.180.2.58
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d73" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d73.apm">
+    <version name="5.10.0d74" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d74.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.0d73"/>
+	<provides url="xowiki" version="5.10.0d74"/>
 	<requires url="xotcl-core" version="5.10.0d38"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.9.1"/>
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.542.2.102 -r1.542.2.103
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	6 Mar 2021 14:24:36 -0000	1.542.2.102
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	14 Mar 2021 16:34:43 -0000	1.542.2.103
@@ -388,6 +388,7 @@
          io.creation_date,
          io.creation_user,
          io.creation_ip,
+         ci.storage_type,
          o.security_inherit_p,
          o.last_modified, o.modifying_user, o.modifying_ip,
          cr.revision_id, cr.title, content_revision__get_content(ci.live_revision) AS text,
@@ -401,7 +402,7 @@
          xowiki_page.creator
       FROM xowiki_form_instance_item_index xi
          inner join acs_objects io on object_id = xi.item_id,
-         lateral (select live_revision from cr_items where item_id = xi.item_id) ci
+         lateral (select live_revision, storage_type from cr_items where item_id = xi.item_id) ci
          left join cr_revisions cr on (cr.revision_id = ci.live_revision)
          left join acs_objects o on (o.object_id = ci.live_revision)
          left join xowiki_page on (xowiki_page.page_id = ci.live_revision)
@@ -417,6 +418,7 @@
          io.creation_date,
          io.creation_user,
          io.creation_ip,
+         ci.storage_type,
          o.security_inherit_p,
          o.last_modified, o.modifying_user, o.modifying_ip,
          cr.revision_id, cr.title, content_revision__get_content(cr.revision_id) AS text,
Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v
diff -u -r1.15.2.12 -r1.15.2.13
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	17 Oct 2020 16:31:27 -0000	1.15.2.12
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	14 Mar 2021 16:34:44 -0000	1.15.2.13
@@ -855,7 +855,18 @@
         }
       }
     }
-    
+
+    set v 5.10.0d74
+    if {[apm_version_names_compare $from_version_name $v] == -1 &&
+        [apm_version_names_compare $to_version_name $v] > -1} {
+      ns_log notice "-- upgrading to $v"
+
+      ns_log notice "dropping view xowiki_form_instance_item_view"
+      ::xo::dc dml drop {
+        drop view if exists xowiki_form_instance_item_view
+      }
+    }
+
   }
 }