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.2 -r1.3
--- openacs-4/packages/download/www/admin/approve-or-reject-oracle.xql	22 May 2001 04:17:45 -0000	1.2
+++ openacs-4/packages/download/www/admin/approve-or-reject-oracle.xql	23 May 2001 16:35:03 -0000	1.3
@@ -4,16 +4,17 @@
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
 <fullquery name="revision_info_select">      
-      <querytext>
+<querytext>
       
 select da.repository_id as repository_id,
+       da.archive_id,
        da.archive_name,
        da.summary,
        dar.revision_id,
        dar.file_name,
        dar.version_name,
        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,
+       decode(da.latest_revision, dar.revision_id, 't', 'f') as current_version_p,
        dar.creation_user,
        dar.creation_date,
        u.last_name || ', ' || u.first_names as creation_user_name
@@ -24,7 +25,7 @@
        dar.revision_id = :revision_id and
        u.user_id = dar.creation_user
 
-      </querytext>
+</querytext>
 </fullquery>
 
  
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.4 -r1.5
--- openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql	22 May 2001 04:17:45 -0000	1.4
+++ openacs-4/packages/download/www/admin/approve-or-reject-postgresql.xql	23 May 2001 16:35:03 -0000	1.5
@@ -4,16 +4,18 @@
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
 <fullquery name="revision_info_select">      
-      <querytext>
+<querytext>
       
 select da.repository_id as repository_id,
+       da.archive_id,
        da.archive_name,
        da.summary,
        dar.revision_id,
        dar.file_name,
        dar.version_name,
        dar.file_size / 1024 as file_size,
-       case when da.latest_revision = dar.revision_id then 't' else 'f' end as current_version_p,
+       case when da.latest_revision = dar.revision_id then 't' else 'f' end 
+         as current_version_p,
        dar.creation_user,
        dar.creation_date,
        u.last_name || ', ' || u.first_names as creation_user_name
@@ -24,7 +26,7 @@
        dar.revision_id = :revision_id and
        u.user_id = dar.creation_user
 
-      </querytext>
+</querytext>
 </fullquery>
 
  
Index: openacs-4/packages/download/www/admin/approve-or-reject.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/approve-or-reject.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/download/www/admin/approve-or-reject.adp	23 May 2001 16:35:03 -0000	1.2
@@ -5,10 +5,10 @@
   <form action=approve-or-reject-2.tcl>
   <%=  [export_form_vars return_url action revision_id] %>
   <tr><td colspan=2 align=right>
-      [<a href=revision-audit?revision_id=@revision_id@>Version History</a>]</td>
+      [<a href=../one-archive?archive_id=@archive_id@>Version History</a>]</td>
   </tr>
   <tr><th colspan=2>
-      <font size=+1><a href=../download-verify?revision_id=@revision_id@>@archive_name@</a></font> 
+      <font size=+1><a href=../one-revision?revision_id=@revision_id@>@archive_name@</a></font> 
       <if @current_version_p@ eq "t"> (current version)
       </if>
   <tr><td colspane=2></td>
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.3 -r1.4
--- openacs-4/packages/download/www/admin/approve-or-reject.tcl	16 May 2001 09:41:05 -0000	1.3
+++ openacs-4/packages/download/www/admin/approve-or-reject.tcl	23 May 2001 16:35:03 -0000	1.4
@@ -20,6 +20,7 @@
 
 if ![db_0or1row revision_info_select {
 select da.repository_id as repository_id,
+       da.archive_id,
        da.archive_name,
        da.summary,
        dar.revision_id,
Index: openacs-4/packages/download/www/admin/report-by-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-by-ip.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-by-ip.adp	23 May 2001 16:35:03 -0000	1.2
@@ -6,5 +6,5 @@
 <a href=spam-users.tcl?@export_sql_query@>Spam Downloaders</a>
 </p>
 
-@dimensional@
+@dimensional_html@
 @table@
\ No newline at end of file
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.2 -r1.3
--- openacs-4/packages/download/www/admin/report-by-ip.tcl	22 May 2001 04:17:45 -0000	1.2
+++ openacs-4/packages/download/www/admin/report-by-ip.tcl	23 May 2001 16:35:03 -0000	1.3
@@ -14,7 +14,7 @@
 set dimensional {
     {downloaded "Download Period" 1m {
         {1d "last 24hrs" {where "[db_map date_clause_1]"}}
-        {1w "last week"  {where "[db_map date_clause 7]"}}
+        {1w "last week"  {where "[db_map date_clause_7]"}}
         {1m "last month" {where "[db_map date_clause_30]"}}
         {all "all" {}}}}
 }
@@ -45,7 +45,7 @@
 
 set export_sql_query [export_vars -url -sign {sql_query}]
 
-set dimensional [ad_dimensional $dimensional]
+set dimensional_html [ad_dimensional $dimensional]
 set table [ad_table \
         -Ttable_extra_html { width= 90% align=center} \
         -bind [ad_tcl_vars_to_ns_set repository_id downloaded] \
Index: openacs-4/packages/download/www/admin/report-by-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-by-user.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-by-user.adp	23 May 2001 16:35:03 -0000	1.2
@@ -5,5 +5,5 @@
 <p>
 <a href=spam-users?@export_sql_query@>Spam Downloaders</a>
 </p>
-@dimensional@
+@dimensional_html@
 @table@
\ No newline at end of file
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.2 -r1.3
--- openacs-4/packages/download/www/admin/report-by-user.tcl	22 May 2001 04:17:45 -0000	1.2
+++ openacs-4/packages/download/www/admin/report-by-user.tcl	23 May 2001 16:35:03 -0000	1.3
@@ -46,7 +46,7 @@
 #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 dimensional_html [ad_dimensional $dimensional]
 set table [ad_table \
         -Ttable_extra_html { width= 90% align=center} \
         -bind [ad_tcl_vars_to_ns_set repository_id downloaded] \
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 -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-ip-oracle.xql	22 May 2001 04:17:45 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-one-ip-oracle.xql	23 May 2001 16:35:03 -0000	1.2
@@ -13,7 +13,7 @@
            u.user_id,
            u.email,
            nvl(d.download_hostname,'unavailable') as download_hostname,
-           nvl2(d.reason_id, d.reason, dr.reason) as reason
+           nvl2(d.reason_id, dr.reason, d.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
Index: openacs-4/packages/download/www/admin/report-one-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-ip.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-one-ip.adp	23 May 2001 16:35:03 -0000	1.2
@@ -5,5 +5,5 @@
 <p>
 <a href=spam-users.tcl?@export_sql_query@>Spam Downloaders</a>
 </p>
-@dimensional@
+@dimensional_html@
 @table@
\ No newline at end of file
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.2 -r1.3
--- openacs-4/packages/download/www/admin/report-one-ip.tcl	22 May 2001 04:17:45 -0000	1.2
+++ openacs-4/packages/download/www/admin/report-one-ip.tcl	23 May 2001 16:35:03 -0000	1.3
@@ -64,7 +64,7 @@
 
 set export_sql_query [export_vars -url -sign {sql_query}]
 
-set dimensional [ad_dimensional $dimensional]
+set dimensional_html [ad_dimensional $dimensional]
 set table [ad_table \
         -Ttable_extra_html { width= 90% align=center} \
         -bind [ad_tcl_vars_to_ns_set repository_id download_ip] \
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 -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-user-oracle.xql	22 May 2001 04:17:45 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-one-user-oracle.xql	23 May 2001 16:35:03 -0000	1.2
@@ -12,7 +12,7 @@
            d.download_date,
            d.download_ip,
            nvl(d.download_hostname,'unavailable') as download_hostname,
-           nvl2(d.reason_id, d.reason, dr.reason) as reason
+           nvl2(d.reason_id, dr.reason, d.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
Index: openacs-4/packages/download/www/admin/report-one-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-one-user.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-one-user.adp	23 May 2001 16:35:03 -0000	1.2
@@ -2,5 +2,5 @@
 <property name="title">Downloads by User @first_names@ @last_name@</property>
 <property name="context_bar">@context_bar@</property>
 
-@dimensional@
+@dimensional_html@
 @table@
\ No newline at end of file
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.2 -r1.3
--- openacs-4/packages/download/www/admin/report-one-user.tcl	22 May 2001 04:17:45 -0000	1.2
+++ openacs-4/packages/download/www/admin/report-one-user.tcl	23 May 2001 16:35:03 -0000	1.3
@@ -63,7 +63,7 @@
                      from cc_users u
                      where u.user_id = :user_id "
 
-set dimensional [ad_dimensional $dimensional]
+set dimensional_html [ad_dimensional $dimensional]
 set table [ad_table \
         -Ttable_extra_html { width= 90% align=center} \
         -bind [ad_tcl_vars_to_ns_set repository_id user_id] \
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 -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-version-downloads-oracle.xql	22 May 2001 04:17:45 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-version-downloads-oracle.xql	23 May 2001 16:35:03 -0000	1.2
@@ -14,7 +14,7 @@
            dar.revision_id,
            u.user_id,
            u.email,
-           nvl2(d.reason_id, d.reason, dr.reason) as reason
+           nvl2(d.reason_id, dr.reason, d.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
Index: openacs-4/packages/download/www/admin/report-version-downloads.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/download/www/admin/report-version-downloads.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/download/www/admin/report-version-downloads.adp	23 May 2001 16:35:03 -0000	1.2
@@ -8,7 +8,7 @@
 <li><a href=export-csv?@export_sql_query@>Export CSV File</a>
 </ul>
 
-@dimensional@
+@dimensional_html@
 <center><b>Total downloads listed: @count@; Overall Total for @archive_name@: @total_count@</b>
 </center>
 @table@
\ No newline at end of file
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.2 -r1.3
--- openacs-4/packages/download/www/admin/report-version-downloads.tcl	22 May 2001 04:17:45 -0000	1.2
+++ openacs-4/packages/download/www/admin/report-version-downloads.tcl	23 May 2001 16:35:03 -0000	1.3
@@ -104,7 +104,7 @@
 
 set export_sql_query [export_vars -url -sign {sql_query}]
 
-set dimensional [ad_dimensional $dimensional]
+set dimensional_html [ad_dimensional $dimensional]
 set table [ad_table \
         -Ttable_extra_html { width= 90% align=center} \
         -bind [ad_tcl_vars_to_ns_set archive_id] \