Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/complex-search-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/complex-search-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? 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 -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 -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 @@ + + + + date(creation_date) < current_date - cast(:registration_before_days as integer) + + - - - select group_name from groups where group_id = :limit_to_users_in_group_id - - + + + date(creation_date) >= current_date - cast(:registration_after_days as integer) + + + + + date(last_visit) < current_date - cast(:last_visit_before_days as integer) + + + + + + date(last_visit) >= current_date - cast(:last_visit_after_days as integer) + + + + + + select group_name from groups where group_id = :limit_to_users_in_group_id + +