Index: openacs-4/packages/acs-lang/tcl/locale-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/Attic/locale-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/tcl/locale-procs-postgresql.xql	2 May 2001 20:15:34 -0000	1.1
+++ openacs-4/packages/acs-lang/tcl/locale-procs-postgresql.xql	4 May 2001 19:29:07 -0000	1.2
@@ -6,7 +6,7 @@
 <fullquery name="ad_locale_system_tz_offset.system_offset">      
       <querytext>
       
-	select ( (current_time - timezone_local_to_utc (:system_timezone, current_time)) * 24 )
+	select ( (current_time - timezone__local_to_utc (:system_timezone, current_time)) * 24 )
 	
     
       </querytext>
Index: openacs-4/packages/acs-lang/tcl/localization-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/tcl/localization-procs-postgresql.xql	2 May 2001 20:15:34 -0000	1.1
+++ openacs-4/packages/acs-lang/tcl/localization-procs-postgresql.xql	4 May 2001 19:29:07 -0000	1.2
@@ -6,7 +6,7 @@
 <fullquery name="lc_time_utc_to_local.utc_to_local">      
       <querytext>
 
-	    select to_char(timezone_utc_to_local(:tz, to_date(:time_value, 'YYYY-MM-DD HH24:MI:SS')), 'YYYY-MM-DD HH24:MI:SS');
+	    select to_char(timezone__utc_to_local(:tz, to_date(:time_value, 'YYYY-MM-DD HH24:MI:SS')), 'YYYY-MM-DD HH24:MI:SS');
 	
       </querytext>
 </fullquery>
@@ -15,7 +15,7 @@
 <fullquery name="lc_time_local_to_utc.local_to_utc">      
       <querytext>
 
-	    select  to_char(timezone_local_to_utc(:tz, to_date(:time_value, 'YYYY-MM-DD HH24:MI:SS')), 'YYYY-MM-DD HH24:MI:SS');
+	    select  to_char(timezone__local_to_utc(:tz, to_date(:time_value, 'YYYY-MM-DD HH24:MI:SS')), 'YYYY-MM-DD HH24:MI:SS');
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/clickthrough/tcl/clickthrough-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/tcl/clickthrough-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/clickthrough/tcl/clickthrough-procs-oracle.xql	3 May 2001 21:35:57 -0000	1.2
+++ openacs-4/packages/clickthrough/tcl/clickthrough-procs-oracle.xql	4 May 2001 19:29:55 -0000	1.3
@@ -3,12 +3,24 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="clickthrough_cache_sweeper.update_clickthrough_log_sql">      
+<fullquery name="clickthrough_href.clickthrough_url_sql">
       <querytext>
-      
-			update clickthrough_log 
+      select site_node.url(sn2.node_id)
+          from site_nodes sn1, site_nodes sn2, apm_packages p
+         where sn1.object_id = :package_id
+           and sn2.parent_id = sn1.node_id
+           and sn2.object_id = p.package_id
+           and p.package_key = 'clickthrough'
+      </querytext>
+</fullquery>
+
+
+<fullquery name="clickthrough_cache_sweeper.update_clickthrough_log_sql">
+      <querytext>
+
+			update clickthrough_log
 			   set click_count = click_count + :cached_click_count
-			 where local_url = :cached_local_url 
+			 where local_url = :cached_local_url
 			   and foreign_url = :cached_foreign_url
 			   and package_id = :cached_package_id
 			   and trunc(entry_date) = trunc(sysdate)
Index: openacs-4/packages/clickthrough/tcl/clickthrough-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/tcl/clickthrough-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/clickthrough/tcl/clickthrough-procs-postgresql.xql	3 May 2001 21:35:57 -0000	1.2
+++ openacs-4/packages/clickthrough/tcl/clickthrough-procs-postgresql.xql	4 May 2001 19:29:55 -0000	1.3
@@ -3,16 +3,28 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
+<fullquery name="clickthrough_href.clickthrough_url_sql">
+      <querytext>
+      select site_node__url(sn2.node_id)
+          from site_nodes sn1, site_nodes sn2, apm_packages p
+         where sn1.object_id = :package_id
+           and sn2.parent_id = sn1.node_id
+           and sn2.object_id = p.package_id
+           and p.package_key = 'clickthrough'
+      </querytext>
+</fullquery>
+
+
 <fullquery name="clickthrough_cache_sweeper.update_clickthrough_log_sql">      
       <querytext>
-      
-			update clickthrough_log 
+
+			update clickthrough_log
 			   set click_count = click_count + :cached_click_count
-			 where local_url = :cached_local_url 
+			 where local_url = :cached_local_url
 			   and foreign_url = :cached_foreign_url
 			   and package_id = :cached_package_id
 			   and trunc(entry_date) = trunc(current_time)
-		    
+
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/clickthrough/tcl/clickthrough-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/tcl/clickthrough-procs.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/clickthrough/tcl/clickthrough-procs.xql	3 May 2001 21:35:57 -0000	1.2
+++ openacs-4/packages/clickthrough/tcl/clickthrough-procs.xql	4 May 2001 19:29:55 -0000	1.3
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="clickthrough_href.clickthrough_url_sql">      
-      <querytext>
-      select site_node_url(sn2.node_id) 
-          from site_nodes sn1, site_nodes sn2, apm_packages p 
-         where sn1.object_id = :package_id
-           and sn2.parent_id = sn1.node_id
-           and sn2.object_id = p.package_id
-           and p.package_key = 'clickthrough'
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="clickthrough_parent_package_id.parent_package_id_sql">      
       <querytext>