Index: openacs-4/packages/download/www/admin/approve-or-reject-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/approve-or-reject-oracle.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/approve-or-reject-oracle.xql 22 May 2001 04:17: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,
+ round(dbms_lob.getlength(dar.content)/1024) as file_size,
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-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql 16 May 2001 09:41:05 -0000 1.3
+++ openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql 22 May 2001 04:17:45 -0000 1.4
@@ -12,7 +12,7 @@
dar.revision_id,
dar.file_name,
dar.version_name,
- dar.file_size as file_size,
+ dar.file_size / 1024 as file_size,
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/export-csv.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/export-csv.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/export-csv.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/export-csv.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -1,4 +1,4 @@
-# /packages/download/www/admin/export-cvs.tcl
+# /packages/download/www/admin/export-csv.tcl
ad_page_contract {
returns a comma-separated values file where each row is one
user in a class (designated by the args); this CSV file is
@@ -24,7 +24,7 @@
}
if { $count == 0 } {
- doc_return 200 text/plain "There is no user meet your criteria"
+ doc_return 200 text/plain "No users meet your criteria"
} else {
doc_return 200 text/plain $csv_rows
}
Index: openacs-4/packages/download/www/admin/report-by-ip-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-by-ip-oracle.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,48 @@
+
+ oracle8.1.6
+
+
+
+
+ select min(u.last_name || ', ' || u.first_names) as user_name,
+ min(u.email) as email,
+ min(d.user_id) as user_id,
+ d.download_ip,
+ nvl(min(d.download_hostname),'unavailable') as download_hostname,
+ count(*) as num_downloads,
+ min('$downloaded') as downloaded
+ from download_downloads_repository d, cc_users u
+ where d.repository_id = $repository_id and
+ d.user_id = u.user_id
+ [ad_dimensional_sql $dimensional where]
+ group by d.download_ip
+ order by 2 desc
+
+
+
+
+
+
+
+ d.download_date + 1 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 7 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 30 > SYSDATE
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-by-ip-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-by-ip-postgresql.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,50 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select min(u.last_name || ', ' || u.first_names) as user_name,
+ min(u.email) as email,
+ min(d.user_id) as user_id,
+ d.download_ip,
+ coalesce(min(d.download_hostname),'unavailable') as download_hostname,
+ count(*) as num_downloads,
+ min('$downloaded'::varchar) as downloaded
+ from download_downloads_repository d, cc_users u
+ where d.repository_id = $repository_id and
+ d.user_id = u.user_id
+ [ad_dimensional_sql $dimensional where]
+ group by d.download_ip
+ order by 2 desc
+
+
+
+
+
+
+
+ d.download_date + '1 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '7 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '30 days'::interval > current_timestamp
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-by-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-by-ip.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-by-ip.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -13,9 +13,9 @@
##TODO: Add support for other
set dimensional {
{downloaded "Download Period" 1m {
- {1d "last 24hrs" {where "d.download_date + 1 > SYSDATE"}}
- {1w "last week" {where "d.download_date + 7 > SYSDATE"}}
- {1m "last month" {where "d.download_date + 30 > SYSDATE"}}
+ {1d "last 24hrs" {where "[db_map date_clause_1]"}}
+ {1w "last week" {where "[db_map date_clause 7]"}}
+ {1m "last month" {where "[db_map date_clause_30]"}}
{all "all" {}}}}
}
Index: openacs-4/packages/download/www/admin/report-by-user-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-by-user-oracle.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,46 @@
+
+ oracle8.1.6
+
+
+
+
+ select min(u.last_name || ', ' || u.first_names) as user_name,
+ min(u.email) as email,
+ d.user_id,
+ count(*) as num_downloads,
+ min('$downloaded') as downloaded
+ from download_downloads_repository d, cc_users u
+ where d.repository_id = $repository_id and
+ d.user_id = u.user_id
+ [ad_dimensional_sql $dimensional where]
+ group by d.user_id
+ order by 2 desc
+
+
+
+
+
+
+
+ d.download_date + 1 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 7 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 30 > SYSDATE
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-by-user-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-by-user-postgresql.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,48 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select min(u.last_name || ', ' || u.first_names) as user_name,
+ min(u.email) as email,
+ d.user_id,
+ count(*) as num_downloads,
+ min('$downloaded'::varchar) as downloaded
+ from download_downloads_repository d, cc_users u
+ where d.repository_id = $repository_id and
+ d.user_id = u.user_id
+ [ad_dimensional_sql $dimensional where]
+ group by d.user_id
+ order by 2 desc
+
+
+
+
+
+
+
+ d.download_date + '1 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '7 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '30 days'::interval > current_timestamp
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-by-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-by-user.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-by-user.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -10,11 +10,15 @@
set repository_id [download_repository_id]
##TODO: Add support for other
+
+# vinodk: put in the full query name so that when I
+# pass this var to spam-users, it can find
+# the right query
set dimensional {
{downloaded "Download Period" 1m {
- {1d "last 24hrs" {where "d.download_date + 1 > SYSDATE"}}
- {1w "last week" {where "d.download_date + 7 > SYSDATE"}}
- {1m "last month" {where "d.download_date + 30 > SYSDATE"}}
+ {1d "last 24hrs" {where "[db_map dbqd.download.www.admin.report-by-user.date_clause_1]"}}
+ {1w "last week" {where "[db_map dbqd.download.www.admin.report-by-user.date_clause_7]"}}
+ {1m "last month" {where "[db_map dbqd.download.www.admin.report-by-user.date_clause_30]"}}
{all "all" {}}}}
}
@@ -39,7 +43,8 @@
order by 2 desc
"
-set export_sql_query [export_vars -url -sign {sql_query}]
+#set export_sql_query [export_vars -url -sign {sql_query}]
+set export_sql_query [export_vars -url -sign {downloaded repository_id dimensional}]
set dimensional [ad_dimensional $dimensional]
set table [ad_table \
Index: openacs-4/packages/download/www/admin/report-one-ip-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-one-ip-oracle.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,54 @@
+
+ oracle8.1.6
+
+
+
+
+ select da.archive_name,
+ da.archive_id,
+ dar.revision_id,
+ dar.version_name,
+ d.download_date,
+ u.last_name || ', ' || u.first_names as user_name,
+ u.user_id,
+ u.email,
+ nvl(d.download_hostname,'unavailable') as download_hostname,
+ nvl2(d.reason_id, d.reason, dr.reason) as reason
+ from download_archives_obj da, download_arch_revisions_obj dar, download_downloads d, download_reasons dr, cc_users u
+ where da.repository_id = $repository_id
+ and da.archive_id = dar.archive_id
+ and d.revision_id = dar.revision_id
+ and d.download_ip = '$download_ip'
+ and dr.download_reason_id(+) = d.reason_id
+ and u.user_id = d.user_id
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+
+
+
+
+
+
+
+ d.download_date + 1 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 7 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 30 > SYSDATE
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-one-ip-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-one-ip-postgresql.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,60 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select da.archive_name,
+ da.archive_id,
+ dar.revision_id,
+ dar.version_name,
+ d.download_date,
+ u.last_name || ', ' || u.first_names as user_name,
+ u.user_id,
+ u.email,
+ coalesce(d.download_hostname,'unavailable') as download_hostname,
+ case when d.reason_id is null then d.reason else dr.reason end as reason
+ from download_downloads d left join download_reasons dr
+ on (d.reason_id=dr.download_reason_id),
+ download_archives_obj da,
+ download_arch_revisions_obj dar,
+ cc_users u
+ where da.repository_id = $repository_id
+ and da.archive_id = dar.archive_id
+ and d.revision_id = dar.revision_id
+ and d.download_ip = '$download_ip'
+ and u.user_id = d.user_id
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+
+
+
+
+
+
+
+ d.download_date + '1 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '7 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '30 days'::interval > current_timestamp
+
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-one-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-ip.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-one-ip.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -14,12 +14,11 @@
set repository_id [download_repository_id]
set dimensional {
{downloaded "Download Period" 1m {
- {1d "last 24hrs" {where "d.download_date + 1 > SYSDATE"}}
- {1w "last week" {where "d.download_date + 7 > SYSDATE"}}
- {1m "last month" {where "d.download_date + 30 > SYSDATE"}}
- {all "all" {}}
-} }
-
+ {1d "last 24hrs" {where "[db_map date_clause_1]"}}
+ {1w "last week" {where "[db_map date_clause_7]"}}
+ {1m "last month" {where "[db_map date_clause_30]"}}
+ {all "all" {}}}
+ }
}
Index: openacs-4/packages/download/www/admin/report-one-user-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-one-user-oracle.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,52 @@
+
+ oracle8.1.6
+
+
+
+
+ select da.repository_id,
+ da.archive_name,
+ da.archive_id,
+ dar.revision_id,
+ dar.version_name,
+ d.download_date,
+ d.download_ip,
+ nvl(d.download_hostname,'unavailable') as download_hostname,
+ nvl2(d.reason_id, d.reason, dr.reason) as reason
+ from download_archives_obj da, download_arch_revisions_obj dar, download_downloads d, download_reasons dr
+ where da.repository_id = $repository_id
+ and da.archive_id = dar.archive_id
+ and d.revision_id = dar.revision_id
+ and d.user_id = $user_id
+ and dr.download_reason_id(+) = d.reason_id
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+
+
+
+
+
+
+
+ d.download_date + 1 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 7 > SYSDATE
+
+
+
+
+
+
+
+ d.download_date + 30 > SYSDATE
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-one-user-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-one-user-postgresql.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,57 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select da.repository_id,
+ da.archive_name,
+ da.archive_id,
+ dar.revision_id,
+ dar.version_name,
+ d.download_date,
+ d.download_ip,
+ coalesce(d.download_hostname,'unavailable') as download_hostname,
+ case when d.reason_id is null then d.reason else dr.reason end as reason
+ from download_downloads d left join download_reasons dr
+ on (d.reason_id = dr.download_reason_id),
+ download_archives_obj da,
+ download_arch_revisions_obj dar
+ where da.repository_id = :repository_id
+ and da.archive_id = dar.archive_id
+ and d.revision_id = dar.revision_id
+ and d.user_id = $user_id
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+
+
+
+
+
+
+
+ d.download_date + '1 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '7 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '30 days'::interval > current_timestamp
+
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-one-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-user.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-one-user.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -13,12 +13,11 @@
set repository_id [download_repository_id]
set dimensional {
{downloaded "Download Period" 1m {
- {1d "last 24hrs" {where "d.download_date + 1 > SYSDATE"}}
- {1w "last week" {where "d.download_date + 7 > SYSDATE"}}
- {1m "last month" {where "d.download_date + 30 > SYSDATE"}}
- {all "all" {}}
-} }
-
+ {1d "last 24hrs" {where "[db_map date_clause_1]"}}
+ {1w "last week" {where "[db_map date_clause_7]"}}
+ {1m "last month" {where "[db_map date_clause_30]"}}
+ {all "all" {}}}
+ }
}
Index: openacs-4/packages/download/www/admin/report-one-user.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-user.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-one-user.xql 22 May 2001 04:17:45 -0000 1.2
@@ -9,5 +9,4 @@
-
Index: openacs-4/packages/download/www/admin/report-version-downloads-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-version-downloads-oracle.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,61 @@
+
+
+
+ oracle8.1.6
+
+
+
+
+ select u.last_name || ', ' || u.first_names as user_name,
+ d.download_date,
+ d.download_ip,
+ nvl(d.download_hostname,'unavailable') as download_hostname,
+ nvl(dar.version_name, 'unnamed') as version_name,
+ dar.revision_id,
+ u.user_id,
+ u.email,
+ nvl2(d.reason_id, d.reason, dr.reason) as reason
+ from download_arch_revisions_obj dar, download_downloads d, download_reasons dr, cc_users u
+ where d.user_id = u.user_id
+ and dar.archive_id = $archive_id
+ and dar.revision_id = d.revision_id
+ and dr.download_reason_id(+) = d.reason_id
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+
+
+
+
+
+
+
+ dar.revision_id = content_item.get_live_revision(dar.archive_id)
+
+
+
+
+
+
+
+ d.download_date + 1 > sysdate
+
+
+
+
+
+
+
+ d.download_date + 7 > sysdate
+
+
+
+
+
+
+
+ d.download_date + 30 > sysdate
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-version-downloads-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/download/www/admin/report-version-downloads-postgresql.xql 22 May 2001 04:17:45 -0000 1.1
@@ -0,0 +1,63 @@
+
+
+
+ postgresql7.1
+
+
+
+
+ select u.last_name || ', ' || u.first_names as user_name,
+ d.download_date,
+ d.download_ip,
+ coalesce(d.download_hostname,'unavailable') as download_hostname,
+ coalesce(dar.version_name, 'unnamed') as version_name,
+ dar.revision_id,
+ u.user_id,
+ u.email,
+ case when d.reason_id is not null then d.reason else dr.reason end as reason
+ from download_downloads d left join download_reasons
+ on (d.reason_id=dr.download_reason_id),
+ download_arch_revisions_obj dar,
+ cc_users u
+ where d.user_id = u.user_id
+ and dar.archive_id = :archive_id
+ and dar.revision_id = d.revision_id
+ [ad_dimensional_sql $dimensional where]
+ [ad_order_by_from_sort_spec $orderby $table_def]
+
+
+
+
+
+
+
+ dar.revision_id = content_item__get_live_revision(dar.archive_id)
+
+
+
+
+
+
+
+ d.download_date + '1 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '7 days'::interval > current_timestamp
+
+
+
+
+
+
+
+ d.download_date + '30 days'::interval > current_timestamp
+
+
+
+
+
Index: openacs-4/packages/download/www/admin/report-version-downloads.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-version-downloads.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-version-downloads.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -15,14 +15,14 @@
set dimensional {
{versions "Versions" current {
- {current "current" {where "dar.revision_id = content_item.get_live_revision(dar.archive_id)" }}
+ {current "current" {where "[db_map version_clause]" }}
{all "all" ""}
}}
{downloaded "Download Period" 1m {
- {1d "last 24hrs" {where "d.download_date + 1 > SYSDATE"}}
- {1w "last week" {where "d.download_date + 7 > SYSDATE"}}
- {1m "last month" {where "d.download_date + 30 > SYSDATE"}}
+ {1d "last 24hrs" {where "[db_map date_clause_1]"}}
+ {1w "last week" {where "[db_map date_clause_7]"}}
+ {1m "last month" {where "[db_map date_clause_30]"}}
{all "all" {}}
}}
}
@@ -68,6 +68,11 @@
[ad_dimensional_sql $dimensional where]
"]
+#FIXME
+# what is temp_downloaded for?
+# why are count and total_count the same query?
+# do we need version_str above?
+
set temp_downloaded $downloaded
set total_count [db_string count_select "select count(*)
Index: openacs-4/packages/download/www/admin/report-version-downloads.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-version-downloads.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/report-version-downloads.xql 22 May 2001 04:17:45 -0000 1.2
@@ -22,16 +22,4 @@
-
-
- select count(*)
-from download_downloads d, download_arch_revisions_obj dar
-where dar.archive_id = :archive_id and
- d.revision_id = dar.revision_id
- [ad_dimensional_sql $dimensional where]
-
-
-
-
-
Index: openacs-4/packages/download/www/admin/repository-metadata-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata-edit.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/repository-metadata-edit.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/repository-metadata-edit.xql 22 May 2001 04:17:45 -0000 1.2
@@ -3,7 +3,6 @@
- FIX ME OUTER JOIN
select
dam.metadata_id,
@@ -17,10 +16,10 @@
dam.linked_p,
dam.mainpage_p,
dam.computed_p
- from download_archive_metadata dam, download_archive_types dat
- where dam.repository_id = :repository_id and
- dam.metadata_id = :metadata_id and
- dam.archive_type_id = dat.archive_type_id(+)
+ from download_archive_metadata dam left join download_archive_types dat
+ using archive_type_id
+ where dam.repository_id = :repository_id and
+ dam.metadata_id = :metadata_id
order by archive_type_id
@@ -75,8 +74,8 @@
- insert into download_metadata_choices (choice_id, metadata_id, label, sort_order)
- values (download_md_choice_id_sequence.nextval, :metadata_id, :choice, :count)
+insert into download_metadata_choices (choice_id, metadata_id, label, sort_order)
+values (download_md_choice_id_sequence.nextval, :metadata_id, :choice, :count)
Index: openacs-4/packages/download/www/admin/repository-metadata.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/repository-metadata.xql 10 May 2001 20:51:30 -0000 1.1
+++ openacs-4/packages/download/www/admin/repository-metadata.xql 22 May 2001 04:17:45 -0000 1.2
@@ -51,7 +51,6 @@
- FIX ME OUTER JOIN
select
dam.metadata_id,
@@ -65,9 +64,9 @@
dam.linked_p,
dam.mainpage_p,
dam.computed_p
- from download_archive_metadata dam, download_archive_types dat
- where dam.repository_id = :repository_id and
- dam.archive_type_id = dat.archive_type_id(+)
+ from download_archive_metadata dam left join download_archive_types dat
+ using archive_type_id
+ where dam.repository_id = :repository_id
order by archive_type_id, sort_key
Index: openacs-4/packages/download/www/admin/spam-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/spam-users.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/spam-users.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/download/www/admin/spam-users.tcl 22 May 2001 04:17:45 -0000 1.2
@@ -5,12 +5,25 @@
@creation-date Mon Jan 8 17:33:15 2001
@cvs-id
} {
- sql_query:verify
+ downloaded:verify
+ repository_id:verify
+ dimensional:verify
}
ad_require_permission [ad_conn package_id] "admin"
set user_id [ad_verify_and_get_user_id]
+# ACS version passed sql_query as a query variable
+# I changed it to pass the important parameters
+# and then build the query by grabbing the
+# appropriate query using the query dispatcher
+# -- vinodk
+
+set sql_query [subst [db_fullquery_get_querytext [db_qd_fetch dbqd.download.www.admin.report-by-user.download_table]]]
+
+ns_log notice "vinodk: $sql_query"
+ns_log notice "vinodk: $dimensional"
+
set userlist_str ""
set email_list [list]
set old_userid 0
@@ -19,8 +32,8 @@
#TODO: Add where clause that checks from no_spam pref.
db_foreach user_select "select u.email, u.user_id, u.user_name from ($sql_query) u" {
if { $user_id != $old_userid } {
- append userlist_str "$user_name ($email)"
- lappend userid_list $user_id
+ append userlist_str "$user_name ($email)"
+ lappend userid_list $user_id
}
set old_userid $user_id
incr count
@@ -33,4 +46,4 @@
set userid_list_export [export_vars -form -sign {userid_list}]
-ad_return_template
\ No newline at end of file
+ad_return_template