Index: openacs-4/packages/file-storage/lib/folder-links-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/Attic/folder-links-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/lib/folder-links-oracle.xql	7 Aug 2017 23:48:11 -0000	1.3
+++ openacs-4/packages/file-storage/lib/folder-links-oracle.xql	21 Nov 2017 11:20:13 -0000	1.4
@@ -13,39 +13,6 @@
     </querytext>
   </partialquery>
   
-  <fullquery name="select_folder_contents">
-        <querytext>
-
-            select fs_objects.object_id,
-                   fs_objects.name,
-                   fs_objects.live_revision,
-                   fs_objects.type,
-     	           fs_objects.pretty_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.sort_key,
-                   fs_objects.file_upload_name,
-                   nvl(fs_objects.title,fs_objects.name) as title,
-		    fs_objects.description,
-                   case
-                     when :folder_path is null
-                     then fs_objects.file_upload_name
-                     else :folder_path || '/' || fs_objects.file_upload_name
-                   end as file_url,
-                   fs_objects.html_description
-            from fs_objects
-            where fs_objects.parent_id = :folder_id
-	$permission_clause
-              and fs_objects.approved_p = 't'
-              and ((fs_objects.active_date_start is null) or (sysdate >= fs_objects.active_date_start))
-              and ((fs_objects.active_date_end is null) or (sysdate <= fs_objects.active_date_end))
-              $object_list_where
-            order by fs_objects.sort_key, fs_objects.order_n, fs_objects.name
-
-        </querytext>
-    </fullquery>
-
     <fullquery name="get_folder_path">
         <querytext>
             declare begin
Index: openacs-4/packages/file-storage/lib/folder-links-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/Attic/folder-links-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/lib/folder-links-postgresql.xql	7 Aug 2017 23:48:11 -0000	1.3
+++ openacs-4/packages/file-storage/lib/folder-links-postgresql.xql	21 Nov 2017 11:20:13 -0000	1.4
@@ -5,48 +5,14 @@
   
   <partialquery name="permission_clause">
     <querytext>
-    and acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'read')
+      and acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'read')
     </querytext>
   </partialquery>
-  
-  <fullquery name="select_folder_contents">
-        <querytext>
 
-            select fs_objects.object_id,
-                   fs_objects.name,
-                   fs_objects.live_revision,
-                   fs_objects.type,
-     	           fs_objects.pretty_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.sort_key,
-                   fs_objects.file_upload_name,
-                   coalesce(fs_objects.title,fs_objects.name) as title,
-	--	    fs_objects.description,
-                   case
-                     when :folder_path is null
-                     then fs_objects.file_upload_name
-                     else :folder_path || '/' || fs_objects.file_upload_name
-                   end as file_url --,
---                   fs_objects.html_description
-            from fs_objects
-            where fs_objects.parent_id = :folder_id
-	$permission_clause
---              and fs_objects.approved_p = 't'
---             and ((fs_objects.active_date_start is null) or (current_timestamp >= fs_objects.active_date_start))
---            and ((fs_objects.active_date_end is null) or (current_timestamp <= fs_objects.active_date_end))
-              $object_list_where
-	order by fs_objects.sort_key, fs_objects.name 
---            order by fs_objects.sort_key, fs_objects.order_n, fs_objects.name
+  <fullquery name="get_folder_path">
+    <querytext>
+      select content_item__get_path(:folder_id, :root_folder_id)
+    </querytext>
+  </fullquery>
 
-        </querytext>
-    </fullquery>
-
-    <fullquery name="get_folder_path">
-        <querytext>
-                select content_item__get_path(:folder_id, :root_folder_id)
-        </querytext>
-    </fullquery>
-
 </queryset>
Index: openacs-4/packages/file-storage/lib/folder-links.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/Attic/folder-links.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/lib/folder-links.xql	8 Aug 2006 21:26:48 -0000	1.2
+++ openacs-4/packages/file-storage/lib/folder-links.xql	21 Nov 2017 11:20:13 -0000	1.3
@@ -9,5 +9,39 @@
             order by upper(short_name)
         </querytext>
     </fullquery>
+  
+    <fullquery name="select_folder_contents">
+        <querytext>
 
+            select fs_objects.object_id,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+     	           fs_objects.pretty_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.sort_key,
+                   fs_objects.file_upload_name,
+                   coalesce(fs_objects.title,fs_objects.name) as title,
+	--	    fs_objects.description,
+                   case
+                     when :folder_path is null
+                     then fs_objects.file_upload_name
+                     else :folder_path || '/' || fs_objects.file_upload_name
+                   end as file_url --,
+--                   fs_objects.html_description
+            from fs_objects
+            where fs_objects.parent_id = :folder_id
+	$permission_clause
+--              and fs_objects.approved_p = 't'
+--             and ((fs_objects.active_date_start is null) or (current_timestamp >= fs_objects.active_date_start))
+--            and ((fs_objects.active_date_end is null) or (current_timestamp <= fs_objects.active_date_end))
+              $object_list_where
+	order by fs_objects.sort_key, fs_objects.name 
+--            order by fs_objects.sort_key, fs_objects.order_n, fs_objects.name
+
+        </querytext>
+      </fullquery>
+    
 </queryset>