Index: openacs-4/packages/cms/www/modules/items/content-download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-download.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/content-download.tcl	2 Sep 2001 12:26:05 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/content-download.tcl	31 Oct 2001 20:42:07 -0000	1.4
@@ -1,71 +1,29 @@
 # download.tcl
 #
 # see if this person is authorized to read the file in question
-# guess the MIME type from the original client filename
-# have the Oracle driver grab the BLOB and write it to the connection
+# and if so, write it to the connection.
 
-
 template::request create
 template::request set_param revision_id -datatype integer
 
 set user_id [User::getID]
 
 template::query get_iteminfo iteminfo onerow "
   select
-    item_id, mime_type, content_revision.is_live( revision_id ) is_live
+    item_id, content_revision.is_live( revision_id ) is_live
   from
     cr_revisions
   where
     revision_id = :revision_id
 "
 
 template::util::array_to_vars iteminfo
-# item_id, mime_type, is_live
 
+# item_id, is_live
+
 # check cm permissions on file
 if { ![string equal $is_live t] } {
   content::check_access $item_id cm_read -user_id $user_id
 }
 
-db_1row get_filename "
-  select
-    name as file_name,
-    storage_type,
-  from
-    cr_items
-  where
-    item_id = ( select
-                  item_id
-                from
-                  cr_revisions
-                where
-                  revision_id = :revision_id )
-"
-
-
-
-set headers_so_far "HTTP/1.0 200 OK
-MIME-Version: 1.0
-Content-Type: $mime_type\n"
-
-set set_headers_i 0
-set set_headers_limit [ns_set size [ns_conn outputheaders]]
-while {$set_headers_i < $set_headers_limit} {
-    append headers_so_far \
-	    "[ns_set key [ns_conn outputheaders] $set_headers_i]: [ns_set value [ns_conn outputheaders] $set_headers_i]\n"
-    incr set_headers_i
-}
-append entire_string_to_write $headers_so_far "\n"
-ns_write $entire_string_to_write
-
-db_write_blob write_content "
-  select
-    content 
-  from 
-    cr_revisions
-  where
-    revision_id = $revision_id
-"
-
-
-
+cr_write_content -revision_id $revision_id