Index: openacs-4/packages/cms/www/modules/items/content-download-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-download-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/content-download-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/content-download-postgresql.xql	25 Jul 2001 03:53:11 -0000	1.2
@@ -7,7 +7,7 @@
       <querytext>
 
   select
-    r.content, i.storage_type 
+    '[cr_fs_path]' || r.content as content, i.storage_type 
   from 
     cr_revisions r, cr_items i
   where
Index: openacs-4/packages/cms/www/modules/items/create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/create-2.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/create-2.tcl	25 Jul 2001 03:53:11 -0000	1.3
@@ -81,6 +81,13 @@
 	-content_type $content_type \
 	-content_method $content_method
 
+# added to support content storage selection (OpenACS - DanW)
+element create create_item storage_type \
+	-datatype keyword \
+	-widget radio \
+	-label "Content Storage Type" \
+        -options { {{Lob Storage} lob } {{File Storage} file} {{Text Storage} text}} \
+	-values [list "file"]
 
 if { [wizard exists] } {
   set is_wizard t
@@ -100,9 +107,9 @@
 	return
     }
 
-    form get_values create_item return_url item_id
+    form get_values create_item return_url item_id storage_type
     
-    set item_id [content::new_item create_item]
+    set item_id [content::new_item create_item $storage_type]
 
     # do wizard forward or forward to return_url
     if { ![wizard exists] } { 
Index: openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl	8 Jun 2001 01:44:53 -0000	1.4
+++ openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl	25 Jul 2001 03:53:11 -0000	1.5
@@ -89,6 +89,9 @@
 if { [string equal $physical_path "../"] } {
     set display_path "/"
 } else {
+    if {[string equal [string index $physical_path 0] "/"]} {
+        set physical_path [string range $physical_path 1 end]
+    }
     set display_path "/$physical_path"
 }
 
Index: openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql	8 Jun 2001 01:44:53 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/index-postgresql.xql	25 Jul 2001 03:53:11 -0000	1.4
@@ -13,7 +13,7 @@
          else coalesce(v.title, i.name) end as title,
     case when r.item_id = :index_page_id then 't' 
                                          else 'f' end as is_index_page,
-    coalesce(round(v.content_length / 1000, 1)::float8::text, '-') as file_size
+    coalesce(round(v.content_length::float8 / 1000.0, 2)::float8::text, '-') as file_size
   from 
     cr_items i 
         LEFT OUTER JOIN 
@@ -53,7 +53,7 @@
     o.object_type, t.pretty_name as content_type,
     to_char(o.last_modified, 'MM/DD/YYYY HH24:MI') as last_modified_date,
     case when r.item_id = :index_page_id then 't' else 'f' end as is_index_page,
-    coalesce(round(v.content_length / 1000, 1)::float8::text, '-') as file_size
+    coalesce(round(v.content_length::float8 / 1000.0, 2)::float8::text, '-') as file_size
   from 
     cr_items i
         LEFT OUTER JOIN