Index: openacs-4/packages/acs-admin/www/users/complex-search-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/complex-search-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/users/complex-search-oracle.xql	12 May 2001 05:07:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<partialquery name="registration_before_days">      
-      <querytext>
-
-        creation_date < sysdate - :registration_before_days
-
-      </querytext>
-</partialquery>
-
-<partialquery name="registration_after_days">      
-      <querytext>
-
-        creation_date >= sysdate - :registration_after_days
-
-      </querytext>
-</partialquery>
-
- <partialquery name="last_visit_before_days">      
-      <querytext>
-
-        last_visit < sysdate - :last_visit_before_days
-
-      </querytext>
-</partialquery>
-
-<partialquery name="last_visit_after_days">      
-      <querytext>
-
-        last_visit >= sysdate - :last_visit_after_days
-
-      </querytext>
-</partialquery>
- 
-</queryset>
Index: openacs-4/packages/acs-admin/www/users/complex-search-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/complex-search-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/users/complex-search-postgresql.xql	13 May 2001 04:41:01 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<partialquery name="registration_before_days">      
-      <querytext>
-
-        creation_date < now() - (:registration_before_days || ' days')::interval
-
-      </querytext>
-</partialquery>
-
-<partialquery name="registration_after_days">      
-      <querytext>
-
-        creation_date >= now() - (:registration_after_days || ' days')::interval
-
-      </querytext>
-</partialquery>
-
- <partialquery name="last_visit_before_days">      
-      <querytext>
-
-        last_visit < now() - (:last_visit_before_days || ' days')::interval
-
-      </querytext>
-</partialquery>
-
-<partialquery name="last_visit_after_days">      
-      <querytext>
-
-        last_visit >= now() - (:last_visit_after_days || ' days')::interval
-
-      </querytext>
-</partialquery>
-
-</queryset>
-
Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	7 Aug 2017 23:47:45 -0000	1.16
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	15 Nov 2017 15:37:37 -0000	1.17
@@ -103,11 +103,8 @@
 
 if {$limit_to_users_in_group_id ne "" 
     && ![regexp {[^-0-9]} $limit_to_users_in_group_id] } {
-    set group_name [db_string user_group_name_from_id {
-        select group_name
-        from groups
-        where group_id = :limit_to_users_in_group_id
-    }]
+    
+    set group_name [db_string user_group_name_from_id {}]
     incr rowcount
     set criteria:[set rowcount](data) \
         "Is a member of '$group_name'"
@@ -250,9 +247,6 @@
 
 set export_authorize [export_ns_set_vars {url} {only_authorized_p}]
 
-
-ad_return_template
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-admin/www/users/complex-search.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/complex-search.xql	29 Apr 2001 00:47:48 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/complex-search.xql	15 Nov 2017 15:37:37 -0000	1.4
@@ -1,11 +1,34 @@
 <?xml version="1.0"?>
 <queryset>
+  
+  <partialquery name="registration_before_days">      
+    <querytext>
+      date(creation_date) < current_date - cast(:registration_before_days as integer)
+    </querytext>
+  </partialquery>
 
-<fullquery name="user_group_name_from_id">      
-      <querytext>
-      select group_name from groups where group_id = :limit_to_users_in_group_id
-      </querytext>
-</fullquery>
+  <partialquery name="registration_after_days">      
+    <querytext>
+      date(creation_date) >= current_date - cast(:registration_after_days as integer)
+    </querytext>
+  </partialquery>
 
+  <partialquery name="last_visit_before_days">      
+    <querytext>
+      date(last_visit) < current_date - cast(:last_visit_before_days as integer)
+    </querytext>
+  </partialquery>
+
+  <partialquery name="last_visit_after_days">      
+    <querytext>
+      date(last_visit) >= current_date - cast(:last_visit_after_days as integer)
+    </querytext>
+  </partialquery>
+  
+  <fullquery name="user_group_name_from_id">      
+    <querytext>
+      select group_name from groups where group_id = :limit_to_users_in_group_id
+    </querytext>
+  </fullquery>
  
 </queryset>