Index: openacs-4/packages/adserver/tcl/adserver-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/tcl/adserver-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/adserver/tcl/adserver-procs-postgresql.xql	30 Jan 2002 11:25:25 -0000	1.1
+++ openacs-4/packages/adserver/tcl/adserver-procs-postgresql.xql	6 Nov 2003 17:26:55 -0000	1.2
@@ -21,7 +21,7 @@
         update adv_log 
            set display_count = display_count + 1 
          where adv_key = :adv_key 
-           and entry_date = trunc (current_timestamp)
+           and entry_date = current_date
       </querytext>
 </fullquery>
 
@@ -32,12 +32,12 @@
                 insert into adv_log 
                        (adv_key, entry_date, display_count) 
                 values (:adv_key,
-                        trunc (current_timestamp),
+                        current_date,
                         (select 1  
                                  where 0 = (select count (*) 
                                               from adv_log 
                                              where adv_key = :adv_key 
-                                               and entry_date = trunc (current_timestamp))))
+                                               and entry_date = current_date)))
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/adserver/tcl/adserver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/tcl/adserver-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/adserver/tcl/adserver-procs.tcl	18 Sep 2002 14:54:56 -0000	1.3
+++ openacs-4/packages/adserver/tcl/adserver-procs.tcl	6 Nov 2003 17:26:55 -0000	1.4
@@ -229,20 +229,20 @@
     ###             or spit out doubleclickish url
     ######################################################
 
+        set s_url [adserver_src_attr \
+                      -suppress_logging=$suppress_logging_p \
+                      -adv_key $adv_key]
+
     if {[string equal $track_clickthru_p t]} {
 
         set h_url [adserver_href_attr \
                 -suppress_logging=$suppress_logging_p \
                 -adv_key $adv_key $target_url]
 
-        set s_url [adserver_src_attr \
-                      -suppress_logging=$suppress_logging_p \
-                      -adv_key $adv_key]
-
         set result \
                 "<a href='$h_url'><img src='$s_url' $extra_img_tags></a>"
     } else {
-        set result $target_url
+        set result "<a href=\"$target_url\"><img src='$s_url' $extra_img_tags></a>"
 
         # update the impressions since this won't get called
         # through adimg.tcl
Index: openacs-4/packages/adserver/www/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/default.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/adserver/www/default.adp	22 May 2003 14:19:36 -0000	1.4
+++ openacs-4/packages/adserver/www/default.adp	6 Nov 2003 17:26:56 -0000	1.5
@@ -2,4 +2,4 @@
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-@page_content@
+@page_content;noquote@
Index: openacs-4/packages/adserver/www/admin/add-adv-to-group.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/add-adv-to-group.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/adserver/www/admin/add-adv-to-group.tcl	10 Sep 2002 22:22:20 -0000	1.2
+++ openacs-4/packages/adserver/www/admin/add-adv-to-group.tcl	6 Nov 2003 17:26:56 -0000	1.3
@@ -14,6 +14,7 @@
 }
 
 set title "Add an ad to a group"
+set context "Add an ad to a group"
 set admin_link "
 <table align=right>
 <tr>
Index: openacs-4/packages/adserver/www/admin/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/default.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/adserver/www/admin/default.adp	22 May 2003 14:19:50 -0000	1.4
+++ openacs-4/packages/adserver/www/admin/default.adp	6 Nov 2003 17:26:56 -0000	1.5
@@ -2,4 +2,4 @@
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-@page_content@
+@page_content;noquote@
Index: openacs-4/packages/adserver/www/admin/one-adv-group.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/one-adv-group.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/adserver/www/admin/one-adv-group.tcl	10 Sep 2002 22:22:20 -0000	1.2
+++ openacs-4/packages/adserver/www/admin/one-adv-group.tcl	6 Nov 2003 17:26:56 -0000	1.3
@@ -13,6 +13,7 @@
 }
 
 set title "Adserver Administration One Group"
+set context {one ad group}
 set admin_link "
 <table align=right>
 <tr>
Index: openacs-4/packages/adserver/www/admin/one-adv.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/one-adv.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/adserver/www/admin/one-adv.tcl	10 Sep 2002 22:22:20 -0000	1.2
+++ openacs-4/packages/adserver/www/admin/one-adv.tcl	6 Nov 2003 17:26:56 -0000	1.3
@@ -13,6 +13,8 @@
     admin_link:onevalue
 }
 
+set context {one ad}
+
 set title "One Ad: $adv_key"
 set admin_link "
 <table align=right>
@@ -114,7 +116,7 @@
     db_0or1row adv_info_select "
        select sum (display_count) as n_displays, 
               sum (click_count) as n_clicks, 
-              round (100 * (sum (click_count) /sum (display_count)), 2) as clickthrough_percent, 
+              round (100.0 * (sum(click_count) / sum(display_count)), 2) as clickthrough_percent, 
               min (entry_date) as first_display, 
               max (entry_date) as last_display 
        from adv_log 
Index: openacs-4/packages/adserver/www/admin/one-adv.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/one-adv.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/adserver/www/admin/one-adv.xql	30 Jan 2002 11:27:38 -0000	1.1
+++ openacs-4/packages/adserver/www/admin/one-adv.xql	6 Nov 2003 17:26:56 -0000	1.2
@@ -27,7 +27,7 @@
       
        select sum (display_count) as n_displays, 
               sum (click_count) as n_clicks, 
-              round (100 * (sum (click_count) /sum (display_count)), 2) as clickthrough_percent, 
+              round(100 * sum (click_count) /sum (display_count),1) as clickthrough_percent, 
               min (entry_date) as first_display, 
               max (entry_date) as last_display 
        from adv_log