Index: openacs-4/packages/download/tcl/download-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/tcl/download-procs-oracle.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/tcl/download-procs-oracle.xql 11 May 2001 05:20:45 -0000 1.2
@@ -35,7 +35,7 @@
<querytext>
select content
from cr_revisions
- where revision_id = $revision_id
+ where revision_id = :revision_id
</querytext>
</fullquery>
Index: openacs-4/packages/download/tcl/download-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/tcl/download-procs-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/tcl/download-procs-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -33,33 +33,36 @@
<fullquery name="download_file_downloader.version_write">
<querytext>
- FIX ME LOB
-select content
+select '[cr_fs_path]' || content as content, storage_type
from cr_revisions
- where revision_id = $revision_id
+ where revision_id = :revision_id
</querytext>
</fullquery>
<fullquery name="download_insert_revision.revision_new">
<querytext>
- FIX ME PLSQL
declare
v_revision_id integer;
begin
v_revision_id := content_revision__new(
- item_id => :archive_id,
- title => :filename,
- description => :version_name,
- revision_id => :revision_id,
- mime_type => :mime_type,
- creation_user => :user_id,
- creation_ip => :creation_ip
- );
+ :filename,
+ :version_name,
+ now(),
+ :mime_type,
+ null,
+ ' ',
+ :archive_id,
+ :revision_id,
+ now(),
+ :user_id,
+ :creation_ip
+ );
insert into download_archive_revisions (revision_id, approved_p) values
(v_revision_id, :approved_p);
+ return v_revision_id;
end;
</querytext>
@@ -68,23 +71,22 @@
<fullquery name="download_insert_revision.content_add">
<querytext>
- FIX ME LOB
update cr_revisions
- set content = empty_blob()
+ set content = '[cr_create_content_file $item_id $revision_id $tmp_filename]'
where revision_id = :revision_id
- returning content into :1
</querytext>
</fullquery>
<fullquery name="download_insert_revision.make_live">
<querytext>
- FIX ME PLSQL
begin
- content_item__set_live_revision(:revision_id);
+ content_item__set_live_revision(:revision_id);
+
+ return 0;
end;
</querytext>
Index: openacs-4/packages/download/tcl/download-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/tcl/download-procs.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/tcl/download-procs.tcl 11 May 2001 05:20:45 -0000 1.2
@@ -179,7 +179,7 @@
db_write_blob version_write "select content
from cr_revisions
- where revision_id = $revision_id"
+ where revision_id = :revision_id"
Index: openacs-4/packages/download/www/archive-add-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/archive-add-2-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/archive-add-2-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -8,38 +8,65 @@
FIX ME PLSQL
declare
- v_archive_id integer;
- v_archive_desc_id integer;
- v_name cr_items.name%TYPE;
+ v_archive_id integer;
+ v_archive_desc_id integer;
+ v_live_archive_desc_id integer;
+ v_name cr_items.name%TYPE;
begin
v_name := 'Download Archive Desc for ' || :archive_id;
v_archive_desc_id := content_item__new (
- content_type => 'cr_download_archive_desc',
- item_id => :archive_desc_id,
- name => v_name,
- title => :summary,
- description => :description,
- mime_type => :description_format,
- parent_id => :repository_id,
- context_id => :repository_id,
- creation_user => :user_id,
- creation_ip => :creation_ip,
- is_live => 't'
+ v_name,
+ :repository_id,
+ :archive_desc_id,
+ null,
+ now(),
+ :user_id,
+ :repository_id,
+ :creation_ip,
+ 'content_item',
+ 'cr_download_archive_desc',
+ :summary,
+ :description,
+ :description_format,
+ null,
+ null,
+ 'file'
);
- insert into download_archive_descs (archive_desc_id) values (content_item__get_live_revision(v_archive_desc_id));
+ select content_item__get_live_revision(v_archive_desc_id)
+ into v_live_archive_desc_id;
+
+ insert into download_archive_descs
+ (archive_desc_id)
+ values
+ (v_live_archive_desc_id);
+
v_archive_id := content_item__new(
- content_type => 'cr_download_archive',
- item_id => :archive_id,
- name => :archive_name,
- parent_id => :repository_id,
- context_id => :repository_id,
- creation_user => :user_id,
- creation_ip => :creation_ip
- );
+ :archive_name,
+ :repository_id,
+ :archive_id,
+ null,
+ now(),
+ :user_id,
+ :repository_id,
+ :creation_ip,
+ 'content_item',
+ 'cr_download_archive',
+ null,
+ null,
+ 'text/plain',
+ null,
+ null,
+ 'file'
+ );
- insert into download_archives (archive_id, archive_type_id, archive_desc_id) values (v_archive_id, :archive_type_id, content_item__get_live_revision(v_archive_desc_id));
+ insert into download_archives
+ (archive_id, archive_type_id, archive_desc_id)
+ values
+ (v_archive_id, :archive_type_id, v_live_archive_desc_id);
+
+ return 0;
end;
</querytext>
Index: openacs-4/packages/download/www/download-verify-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/download-verify-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/download-verify-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/download-verify-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -13,7 +13,7 @@
dar.revision_id,
dar.file_name,
dar.version_name,
- dbms_lob__getlength(dar.content) as file_size
+ dar.content as content_path
from download_archives_obj da,
download_arch_revisions_obj dar
where da.archive_id = dar.archive_id and
Index: openacs-4/packages/download/www/download-verify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/download-verify.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/download-verify.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/download-verify.tcl 11 May 2001 05:20:45 -0000 1.2
@@ -39,6 +39,15 @@
return
}
+# oracle version gets file_size from the blob
+# postgres version can't (content is in fs, not db),
+# so it gets content_path
+# and we can calculate file_size here
+
+if { ![info exists file_size] } {
+ set file_size [cr_file_size $content_path]
+}
+
set context_bar [list [list "one-archive?archive_id=$archive_id" $archive_name] "Download $archive_name $version_name"]
##TODO Get version name
Index: openacs-4/packages/download/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/index-oracle.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/index-oracle.xql 11 May 2001 05:20:45 -0000 1.2
@@ -22,5 +22,31 @@
</querytext>
</fullquery>
+<fullquery name="download_index_query">
+ <querytext>
+select da.archive_id,
+ dat.pretty_name as archive_type,
+ da.archive_type_id,
+ da.archive_name,
+ da.summary,
+ dar.revision_id,
+ dar.file_name,
+ dar.version_name,
+ dbms_lob.getlength(dar.content) as file_size,
+ (select count(*) from download_downloads where revision_id = dar.revision_id) as downloads,
+ dar.approved_p
+ $metadata_selects
+from download_archives_obj da,
+ download_archive_types dat,
+ download_arch_revisions_obj dar
+where da.repository_id = :repository_id and
+ dat.archive_type_id = da.archive_type_id and
+ da.archive_id = dar.archive_id and
+ acs_permission.permission_p(dar.revision_id, :user_id, 'read') = 't'
+ $approval
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+ </querytext>
+</fullquery>
</queryset>
Index: openacs-4/packages/download/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/index-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/index-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -10,7 +10,7 @@
dar.version_name,
dar.revision_id,
dar.approved_p,
- coalesce(dar.approved_comment, 'No comment') approved_comment,
+ coalesce(dar.approved_comment, 'No comment') as approved_comment,
to_char(dar.creation_date,'Mon DD, YYYY') as creation_date
from download_arch_revisions_obj dar, download_archives_obj da
where da.repository_id = :repository_id and
@@ -22,5 +22,32 @@
</querytext>
</fullquery>
+<fullquery name="download_index_query">
+ <querytext>
+select da.archive_id,
+ dat.pretty_name as archive_type,
+ da.archive_type_id,
+ da.archive_name,
+ da.summary,
+ dar.revision_id,
+ dar.file_name,
+ dar.version_name,
+ dar.content as file_size,
+ (select count(*) from download_downloads where revision_id = dar.revision_id) as downloads,
+ dar.approved_p
+ $metadata_selects
+from download_archives_obj da,
+ download_archive_types dat,
+ download_arch_revisions_obj dar
+where da.repository_id = :repository_id and
+ dat.archive_type_id = da.archive_type_id and
+ da.archive_id = dar.archive_id and
+ acs_permission__permission_p(dar.revision_id, :user_id, 'read') = 't'
+ $approval
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+ </querytext>
+</fullquery>
+
</queryset>
Index: openacs-4/packages/download/www/one-revision-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-revision-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/one-revision-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/one-revision-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -17,7 +17,7 @@
dar.file_name,
dar.version_name,
dar.version_name,
- dbms_lob__getlength(dar.content) as file_size,
+ dar.content as content_path,
(select count(*) from download_downloads where revision_id = dar.revision_id) as downloads,
dar.approved_p,
u.last_name || ', ' || u.first_names as creation_user_name,
Index: openacs-4/packages/download/www/one-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-revision.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/one-revision.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/one-revision.tcl 11 May 2001 05:20:45 -0000 1.2
@@ -68,6 +68,15 @@
return
}
+# oracle version gets file_size from the blob
+# postgres version can't (content is in fs, not db),
+# so it gets content_path
+# and we can calculate file_size here
+
+if { ![info exists file_size] } {
+ set file_size [cr_file_size $content_path]
+}
+
set description [acs_messaging_format_as_html $description_type $description]
set context_bar [list [list "one-archive?archive_id=$archive_id" $archive_name] "$archive_name $version_name"]
Index: openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/approve-or-reject-2-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -19,15 +19,19 @@
<fullquery name="sendmail">
<querytext>
- FIX ME PLSQL
+ FIX ME PLSQL - need acs-notification
+ declare
+ v_id integer;
begin
- :1 := nt__post_request(
+ v_id := nt__post_request(
party_from => :user_id,
party_to => :creation_user,
expand_group => 'f',
subject => :subject,
message => :body);
+
+ return v_id;
end;
</querytext>
Index: openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -12,7 +12,7 @@
dar.revision_id,
dar.file_name,
dar.version_name,
- dbms_lob__getlength(dar.content) as file_size,
+ dar.content as content_path,
case when da.latest_revision = dar.revision_id then 't' else 'f' end as current_version_p,
dar.creation_user,
dar.creation_date,
Index: openacs-4/packages/download/www/admin/approve-or-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/approve-or-reject.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/approve-or-reject.tcl 11 May 2001 05:20:45 -0000 1.2
@@ -41,6 +41,16 @@
return
}
+# oracle version gets file_size from the blob
+# postgres version can't (content is in fs, not db),
+# so it gets content_path
+# and we can calculate file_size here
+
+if { ![info exists file_size] } {
+ set file_size [cr_file_size $content_path]
+}
+
+
if { $action == "approve" } {
set pretty_action "Approve"
set pretty_noun "Approval"
Index: openacs-4/packages/download/www/admin/repository-ae-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-ae-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/repository-ae-postgresql.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/repository-ae-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -5,34 +5,38 @@
<fullquery name="todo_insert">
<querytext>
- FIX ME PLSQL
+ begin;
+ select download_rep__new(
+ :repository_id,
+ :title,
+ :description,
+ :help_text,
+ now(),
+ :user_id,
+ :package_id,
+ :package_id,
+ null
+ );
- declare
- the_id integer;
- begin
- the_id := download_rep__new(repository_id => :repository_id,
- title => :title,
- description => :description,
- help_text => :help_text,
- creation_user => :user_id,
- parent_id => :package_id,
- context_id => :package_id);
- end;
+ end;
</querytext>
</fullquery>
<fullquery name="repository_edit">
<querytext>
-
- begin
- download_rep__edit(repository_id => :repository_id,
- title => :title,
- description => :description,
- help_text => :help_text,
- modifying_user => :user_id
+ begin;
+ select download_rep__edit(
+ :repository_id,
+ :title,
+ :description,
+ :help_text,
+ now(),
+ :user_id,
+ null
);
+
end;
</querytext>
Index: openacs-4/packages/download/www/admin/spam-users-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/Attic/spam-users-2-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/spam-users-2-postgresql.xql 10 May 2001 20:51:31 -0000 1.1
+++ openacs-4/packages/download/www/admin/spam-users-2-postgresql.xql 11 May 2001 05:20:45 -0000 1.2
@@ -5,7 +5,7 @@
<fullquery name="sendmail">
<querytext>
- FIX ME PLSQL
+ FIX ME PLSQL - need acs_notification
begin
:1 := nt__post_request(