Index: openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql	7 Aug 2017 23:47:47 -0000	1.11
+++ openacs-4/packages/acs-content-repository/tcl/revision-procs-postgresql.xql	3 Sep 2024 15:37:31 -0000	1.12
@@ -2,49 +2,22 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="cr_write_content.get_item_info">
+<fullquery name="cr_write_content-file.write_file_content">
       <querytext>
-          select i.storage_type, i.storage_area_key, r.mime_type,
-          r.revision_id, r.content_length
-          from cr_items i, cr_revisions r
-          where r.revision_id = content_item__get_live_revision(:item_id) and i.item_id = r.item_id
-      </querytext>
-</fullquery>
-
-<fullquery name="cr_write_content.write_file_content">
-      <querytext>
           select :path || content
           from cr_revisions
           where revision_id = :revision_id
       </querytext>
 </fullquery>
 
-<fullquery name="cr_write_content.write_lob_content">
+<fullquery name="cr_write_content-lob.write_lob_content">
       <querytext>
           select lob as content, 'lob' as storage_type
           from cr_revisions
           where revision_id = :revision_id
       </querytext>
 </fullquery>
 
-<fullquery name="cr_import_content.mime_type_register">
-      <querytext>
-          select content_type__register_mime_type('content_revision', :mime_type)
-      </querytext>
-</fullquery>
-
-<fullquery name="cr_import_content.image_subclass">
-      <querytext>
-         select content_item__is_subclass(:image_type, 'image')
-      </querytext>
-</fullquery>
-
-<fullquery name="cr_import_content.content_revision_subclass">
-      <querytext>
-         select content_item__is_subclass(:other_type, 'content_revision')
-      </querytext>
-</fullquery>
-
 <fullquery name="cr_import_content.image_new">
       <querytext>
          select image__new(
@@ -57,7 +30,7 @@
             /* creation_ip   => */ :creation_ip,
             /* title         => */ :title,
             /* description   => */ :description,
-            /* storage_type  => */ :storage_type,
+            /* storage_type  => */ :storage_type::cr_item_storage_type_enum,
             /* content_type  => */ :image_type,
             /* nls_language  => */ null,
             /* publish_date  => */ current_timestamp,
@@ -129,24 +102,24 @@
             /* creation_date  => */ current_timestamp,
             /* creation_user  => */ :creation_user,
             /* creation_ip    => */ :creation_ip,
-	    /* content_length => */ null, 
+	    /* content_length => */ null,
             /* package_id     => */ :package_id
     );
       </querytext>
 </fullquery>
- 
-<fullquery name="cr_import_content.set_lob_content">      
+
+<fullquery name="cr_import_content.set_lob_content">
       <querytext>
 
 	update cr_revisions
 	set mime_type = :mime_type,
  	   lob = [set __lob_id [db_string get_lob_id {select empty_lob()}]]
 	where revision_id = :revision_id
-	   
+
       </querytext>
 </fullquery>
- 
-<fullquery name="cr_import_content.set_lob_size">      
+
+<fullquery name="cr_import_content.set_lob_size">
       <querytext>
 
          update cr_revisions
@@ -162,14 +135,4 @@
       </querytext>
 </fullquery>
 
-<fullquery name="cr_import_content.set_file_content">
-      <querytext>
-          update cr_revisions
-          set content = :filename,
-              mime_type = :mime_type,
-              content_length = :tmp_size
-          where revision_id = :revision_id
-      </querytext>
-</fullquery>
-
 </queryset>