Index: openacs-4/packages/cms/www/modules/sitemap/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/index.tcl	25 May 2001 02:15:56 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/index.tcl	26 May 2001 18:40:15 -0000	1.3
@@ -159,35 +159,6 @@
   select content_folder.get_index_page($parent_var) from dual
 "
 
-
-set id_sql "
-  select
-    r.item_id, '' as context,
-    decode(o.object_type, 'content_symlink', r.label,
-			  'content_folder', f.label,
-			  nvl(v.title, i.name)) title,
-    decode(r.item_id, :index_page_id, 't', 'f') is_index_page,
-    nvl(to_char(round(dbms_lob.getlength(v.content) / 1000, 1)), '-') file_size
-  from 
-    cr_resolved_items r, cr_items i, cr_folders f, cr_revisions v, 
-    cr_revisions u, acs_objects o, acs_object_types t
-  where
-    r.parent_id = $parent_var
-  and
-    r.resolved_id = i.item_id
-  and
-    i.item_id = o.object_id
-  and
-    i.content_type = t.object_type
-  and
-    i.latest_revision = v.revision_id (+)
-  and
-    i.live_revision = u.revision_id (+)
-  and
-    i.item_id = f.folder_id (+)
-  order by
-    is_index_page desc "
-
 # sort table by columns
 switch -exact -- $orderby {
   size  {
@@ -207,58 +178,12 @@
   }
 }
 
-
-append id_sql $orderby_clause
-
-
-
-
-set display_sql "
-  select
-    decode(i.content_type, 'content_folder', 't', 'f') is_folder,
-    decode(i.content_type, 'content_template', 't', 'f') is_template,
-    r.item_id, r.resolved_id, r.is_symlink, r.name,
-    NVL(trim(
-      decode(o.object_type, 'content_symlink', r.label,
-			  'content_folder', f.label,
-			  nvl(v.title, i.name))),
-      '-') title,
-    decode(i.publish_status, 'live', 
-      to_char(u.publish_date, 'MM/DD/YYYY'), '-') publish_date,
-    o.object_type, t.pretty_name content_type,
-    to_char(o.last_modified, 'MM/DD/YYYY HH24:MI') last_modified_date,
-    decode(r.item_id, :index_page_id, 't', 'f') is_index_page,
-    nvl(to_char(round(dbms_lob.getlength(v.content) / 1000, 1)), '-') file_size
-  from 
-    cr_resolved_items r, cr_items i, cr_folders f, cr_revisions v, 
-    cr_revisions u, acs_objects o, acs_object_types t
-  where
-    r.parent_id = $parent_var
-  and
-    r.resolved_id = i.item_id
-  and
-    i.item_id = o.object_id
-  and
-    i.content_type = t.object_type
-  and
-    i.latest_revision = v.revision_id (+)
-  and
-    i.live_revision = u.revision_id (+)
-  and
-    i.item_id = f.folder_id (+)
-  and
-    -- paginator sql
-    r.item_id in (CURRENT_PAGE_SET)
-  order by
-    is_index_page desc $orderby_clause"
-
-
-
 # paginator
 set p_name "folder_contents_${mount_point}_$id"
-paginator create $p_name $id_sql -pagesize 10 -groupsize 10 -contextual
+paginator create create_folder $p_name "" -pagesize 10 -groupsize 10 -contextual
 
-paginator get_data $p_name items $display_sql item_id $page
+paginator get_data display_data $p_name items "" item_id $page
+
 paginator get_display_info $p_name info $page
 
 set group [paginator get_group $p_name $page]