Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -r1.46 -r1.47
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	2 Apr 2013 12:04:43 -0000	1.46
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	7 Aug 2017 23:48:11 -0000	1.47
@@ -20,18 +20,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::new_folder.new_folder">
-        <querytext>
-            select file_storage__new_folder(
-                :name,
-                :pretty_name,
-                :parent_id,
-                :creation_user,
-                :creation_ip
-            );
-        </querytext>
-    </fullquery>
-
     <fullquery name="fs::rename_folder.rename_folder">
         <querytext>
             select content_folder__edit_name(
@@ -44,51 +32,17 @@
     </fullquery>
 
     <fullquery name="fs::get_folder_objects.select_folder_contents">
-        <rdbms><type>postgresql</type><version>8.4</version></rdbms>
         <querytext>
 
-          select cr_items.item_id as object_id,
-          cr_items.name
-          from cr_items
-          where cr_items.parent_id = :folder_id
-          and acs_permission__permission_p(cr_items.item_id, :user_id, 'read')
+          select cr_items.item_id as object_id, cr_items.name
+          from   cr_items
+          where  cr_items.parent_id = :folder_id
+          and    acs_permission__permission_p(cr_items.item_id, :user_id, 'read')
 
         </querytext>
     </fullquery>
 
     <fullquery name="fs::get_folder_contents.select_folder_contents">
-        <querytext>
-
-            select fs_objects.object_id,
-                   fs_objects.name,
-                   fs_objects.title,
-                   fs_objects.live_revision,
-                   fs_objects.type,
-                   to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
-                   fs_objects.content_size,
-                   fs_objects.url,
-                   fs_objects.key,
-                   fs_objects.sort_key,
-                   fs_objects.file_upload_name,
-                   fs_objects.title,
-                   case when fs_objects.last_modified >= (now() - interval '$n_past_days days') then 1 else 0 end as new_p,
-                   acs_permission__permission_p(fs_objects.object_id, :user_id, 'admin') as admin_p,
-                   acs_permission__permission_p(fs_objects.object_id, :user_id, 'delete') as delete_p,
-                   acs_permission__permission_p(fs_objects.object_id, :user_id, 'write') as write_p
-            from fs_objects
-            where fs_objects.parent_id = :folder_id
-              and exists (select 1
-                   from acs_object_party_privilege_map m
-                   where m.object_id = fs_objects.object_id
-                     and m.party_id = :user_id
-                     and m.privilege = 'read')
-            order by fs_objects.sort_key, fs_objects.name
-
-        </querytext>
-    </fullquery>
-
-
-    <fullquery name="fs::get_folder_contents.select_folder_contents">
         <rdbms><type>postgresql</type><version>8.4</version></rdbms>
         <querytext>
 
@@ -283,23 +237,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="fs::notification::get_url.select_fs_package_url">
-    <querytext>
-      select site_node__url(node_id) 
-      from site_nodes
-      where object_id = (select package_id
-         from fs_root_folders r,
-             (select parent.item_id as folder_id
-               from cr_items parent,
-                   cr_items children
-              where children.item_id = :folder_id
-               and children.tree_sortkey
-                between parent.tree_sortkey
-                and tree_right(parent.tree_sortkey)) t
-      where r.folder_id = t.folder_id)
-    </querytext>
-  </fullquery>
-
   <fullquery name="fs::add_created_version.new_file_revision">
     <querytext>
 	select content_revision__new (
@@ -340,25 +277,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="fs::add_created_version.new_lob_revision">
-    <querytext>
-         select content_revision__new (
-            /* title         => */ :title,
-            /* description   => */ :description,
-            /* publish_date  => */ current_timestamp,
-            /* mime_type     => */ :mime_type,
-            /* nls_language  => */ null,
-            /* data          => */ null,
-            /* item_id       => */ :item_id,
-            /* revision_id   => */ :revision_id,
-            /* creation_date => */ current_timestamp,
-            /* creation_user => */ :creation_user,
-            /* creation_ip   => */ :creation_ip,
-            /* package_id    => */ :package_id
-    )
-    </querytext>
-  </fullquery>
-
 <fullquery name="fs::add_created_version.set_lob_content">      
       <querytext>
 
@@ -414,4 +332,5 @@
             where object_id = :object_id
         </querytext>
     </fullquery>
+
 </queryset>