Index: openacs-4/packages/acs-api-browser/www/package-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/package-view.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-api-browser/www/package-view.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-api-browser/www/package-view.tcl 19 Apr 2001 14:52:47 -0000 1.2 @@ -119,7 +119,11 @@ file_type = 'data_model_upgrade') order by path } { - multirow append sql_files $file_id $path [file tail $path] "" + # Set relative path to everything after sql/ (just using + # file tail breaks when you've got subdirs of sql) + regexp {^sql/(.*)} $path match relative_path + + multirow append sql_files $file_id $path $relative_path "" } } content { Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 17 Apr 2001 23:41:36 -0000 1.10 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 19 Apr 2001 14:52:47 -0000 1.11 @@ -582,12 +582,12 @@ -- function permission_p -create function acs_permission__permission_p () +create function acs_permission__permission_p (integer,integer,varchar) returns boolean as ' declare - permission_p__object_id integer; - permission_p__party_id integer; - permission_p__privilege integer; + permission_p__object_id alias for $1; + permission_p__party_id alias for $2; + permission_p__privilege alias for $3; exists_p boolean; begin -- We should question whether we really want to use the Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.1 @@ -0,0 +1,14 @@ + + +postgresql7.1 + + + + select count(*) + from dual + where acs_permission__permission_p(:object_id, :user_id, :privilege) = +'t' + + + + Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 17 Apr 2001 22:59:51 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.3 @@ -6,7 +6,7 @@ select acs__add_user( :user_id, - 'person', + 'user', now(), NULL, :peeraddr, Index: openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/navigation-procs-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-tcl/tcl/navigation-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.1 @@ -0,0 +1,17 @@ + + +postgresql7.1 + + + + select site_node__url(node_id) as url, object_id, + acs_object__name(object_id) as object_name, + tree_level(tree_sortkey) as level + from site_nodes + where tree_sortkey like (select tree_sortkey from site_nodes where +node_id = :node_id) || '%' + order by level desc + + + + Index: openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql 18 Apr 2001 15:28:19 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.5 @@ -21,4 +21,13 @@ where token_id >= r.first and r.first+15 > token_id; + + + update users + set second_to_last_visit = last_visit, + last_visit = now(), + n_sessions = n_sessions + 1 + where user_id = :user_id + + Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 18 Apr 2001 03:57:58 -0000 1.1 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 19 Apr 2001 14:52:47 -0000 1.2 @@ -2,14 +2,14 @@ postgresql7.1 - + - select site_node.url(n.node_id) as url, n.node_id, n.directory_p, + select site_node__url(n.node_id) as url, n.node_id, n.directory_p, n.pattern_p, n.object_id, o.object_type, n.package_key, n.package_id - from acs_objects o, (select n.node_id, n.directory_p, n.pattern_p, n.object_id, p.package_key, p.package_id + from acs_objects o left outer join (select n.node_id, n.directory_p, n.pattern_p, n.object_id, p.package_key, p.package_id from site_nodes n, apm_packages p where n.object_id = p.package_id) n - where n.object_id = o.object_id (+) + on n.object_id = o.object_id