Index: openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql,v diff -u -r1.6.2.4 -r1.6.2.5 --- openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql 15 Feb 2003 22:30:32 -0000 1.6.2.4 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql 23 Jun 2003 18:47:02 -0000 1.6.2.5 @@ -430,6 +430,8 @@ procedure update_last_modified ( object_id in acs_objects.object_id%TYPE, + modifying_user in acs_objects.modifying_user%TYPE, + modifying_ip in acs_objects.modifying_ip%TYPE, last_modified in acs_objects.last_modified%TYPE default sysdate ); @@ -1047,13 +1049,15 @@ procedure update_last_modified ( object_id in acs_objects.object_id%TYPE, + modifying_user in acs_objects.modifying_user%TYPE, + modifying_ip in acs_objects.modifying_ip%TYPE, last_modified in acs_objects.last_modified%TYPE default sysdate ) is v_parent_id acs_objects.context_id%TYPE; begin update acs_objects - set acs_objects.last_modified = acs_object.update_last_modified.last_modified + set acs_objects.last_modified = acs_object.update_last_modified.last_modified, acs_objects.modifying_user = acs_object.update_last_modified.modifying_user, acs_objects.modifying_ip = acs_object.update_last_modified.modifying_ip where acs_objects.object_id in (select ao.object_id from acs_objects ao connect by prior ao.context_id = ao.object_id Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-4.6.4-4.6.5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v diff -u -r1.35.2.4 -r1.35.2.5 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 2 Mar 2003 22:33:33 -0000 1.35.2.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 23 Jun 2003 18:47:02 -0000 1.35.2.5 @@ -1340,21 +1340,25 @@ end;' language 'plpgsql'; -create function acs_object__update_last_modified (integer) +create function acs_object__update_last_modified (integer, integer, integer) returns integer as ' declare - acs_object__update_last_modified__object_id alias for $1; + acs_object__update_last_modified__object_id alias for $1; + acs_object__update_last_modified__modifying_user alias for $2; + acs_object__update_last_modified__modifying_ip alias for $3; begin - return acs_object__update_last_modified(acs_object__update_last_modified__object_id, now()); + return acs_object__update_last_modified(acs_object__update_last_modified__object_id, acs_object__update_last_modified__modifying_user, acs_object__update_last_modified__modifying_ip, now()); end;' language 'plpgsql'; -create function acs_object__update_last_modified (integer, timestamptz) +create function acs_object__update_last_modified (integer, integer, integer, timestamptz) returns integer as ' declare - acs_object__update_last_modified__object_id alias for $1; - acs_object__update_last_modified__last_modified alias for $2; -- default now() - v_parent_id integer; - v_last_modified timestamptz; + acs_object__update_last_modified__object_id alias for $1; + acs_object__update_last_modified__modifying_user alias for $2; + acs_object__update_last_modified__modifying_ip alias for $3; + acs_object__update_last_modified__last_modified alias for $4; -- default now() + v_parent_id integer; + v_last_modified timestamptz; begin if acs_object__update_last_modified__last_modified is null then v_last_modified := now(); @@ -1363,7 +1367,9 @@ end if; update acs_objects - set last_modified = v_last_modified + set last_modified = v_last_modified, + modifying_user = acs_object__update_last_modified__modifying_user, + modifying_ip = acs_object__update_last_modified__modifying_ip where object_id = acs_object__update_last_modified__object_id; select context_id @@ -1372,7 +1378,7 @@ where object_id = acs_object__update_last_modified__object_id; if v_parent_id is not null and v_parent_id != 0 then - perform acs_object__update_last_modified(v_parent_id, v_last_modified); + perform acs_object__update_last_modified(v_parent_id, acs_object__update_last_modified__modifying_user, acs_object__update_last_modified__modifying_ip, v_last_modified); end if; return acs_object__update_last_modified__object_id; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6.4-4.6.5.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql,v diff -u -r1.4.2.3 -r1.4.2.4 --- openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql 21 Mar 2003 14:49:32 -0000 1.4.2.3 +++ openacs-4/packages/file-storage/sql/oracle/file-storage-package-create.sql 23 Jun 2003 18:47:02 -0000 1.4.2.4 @@ -75,7 +75,9 @@ -- Move a file, and all its versions, to a new folder -- file_id in cr_items.item_id%TYPE, - target_folder_id in cr_items.parent_id%TYPE + target_folder_id in cr_items.parent_id%TYPE, + creation_user in acs_objects.creation_user%TYPE, + creation_ip in acs_objects.creation_ip%TYPE ); function get_title( @@ -305,7 +307,7 @@ ); end if; - acs_object.update_last_modified(file_storage.new_file.folder_id); + acs_object.update_last_modified(file_storage.new_file.folder_id,new_file.creation_user,new_file.creation_ip); return v_item_id; end new_file; @@ -400,7 +402,7 @@ content_length = v_content_length where revision_id = v_new_version_id; - acs_object.update_last_modified(file_storage.copy_file.target_folder_id); + acs_object.update_last_modified(file_storage.copy_file.target_folder_id,file_storage.copy_file.creation_user,file_storage.copy_file.creation_ip); return v_new_version_id; end copy_file; @@ -410,7 +412,9 @@ -- Move a file, and all its versions, to a new folder -- file_id in cr_items.item_id%TYPE, - target_folder_id in cr_items.parent_id%TYPE + target_folder_id in cr_items.parent_id%TYPE, + creation_user in acs_objects.creation_user%TYPE, + creation_ip in acs_objects.creation_ip%TYPE ) is begin @@ -419,7 +423,7 @@ target_folder_id => file_storage.move_file.target_folder_id ); - acs_object.update_last_modified(file_storage.move_file.target_folder_id); + acs_object.update_last_modified(file_storage.move_file.target_folder_id,file_storage.move_file.creation_user,file_storage.move_file.creation_ip); end; @@ -457,7 +461,7 @@ from cr_items where cr_items.item_id = file_storage.new_version.item_id; - acs_object.update_last_modified(v_folder_id); + acs_object.update_last_modified(v_folder_id,new_version.creation_user,new_version.creation_ip); return v_revision_id; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-4.6.2-4.6.3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql,v diff -u -r1.8.2.3 -r1.8.2.4 --- openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql 21 Mar 2003 14:50:17 -0000 1.8.2.3 +++ openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql 23 Jun 2003 18:47:03 -0000 1.8.2.4 @@ -225,7 +225,7 @@ end if; - perform acs_object__update_last_modified(new_file__folder_id); + perform acs_object__update_last_modified(new_file__folder_id,new_file__user_id,new_file__creation_ip); return v_item_id; @@ -392,7 +392,7 @@ end if; - perform acs_object__update_last_modified(copy_file__target_folder_id); + perform acs_object__update_last_modified(copy_file__target_folder_id,copy_file__creation_user,copy_file__creation_ip); return v_new_version_id; @@ -410,14 +410,16 @@ declare move_file__file_id alias for $1; move_file__target_folder_id alias for $2; + move_file__creation_user alias for $3; + move_file__creation_ip alias for $4; begin perform content_item__move( move_file__file_id, -- item_id move_file__target_folder_id -- target_folder_id ); - perform acs_object__update_last_modified(move_file__target_folder_id); + perform acs_object__update_last_modified(move_file__target_folder_id,move_file__creation_user,move_file__creation_ip); return 0; end;' language 'plpgsql'; @@ -554,7 +556,7 @@ from cr_items where cr_items.item_id = new_version__item_id; - perform acs_object__update_last_modified(v_folder_id); + perform acs_object__update_last_modified(v_folder_id,new_version__creation_user,new_version__creation_ip); return v_revision_id; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/file-storage/www/file-move-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-2-oracle.xql,v diff -u -r1.2 -r1.2.4.1 --- openacs-4/packages/file-storage/www/file-move-2-oracle.xql 25 Sep 2001 16:52:03 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-move-2-oracle.xql 23 Jun 2003 18:47:03 -0000 1.2.4.1 @@ -9,7 +9,9 @@ begin file_storage.move_file ( file_id => :file_id, - target_folder_id => :parent_id + target_folder_id => :parent_id, + creation_user => :user_id, + creation_ip => :address ); end; Index: openacs-4/packages/file-storage/www/file-move-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-2-postgresql.xql,v diff -u -r1.2 -r1.2.4.1 --- openacs-4/packages/file-storage/www/file-move-2-postgresql.xql 25 Sep 2001 16:52:16 -0000 1.2 +++ openacs-4/packages/file-storage/www/file-move-2-postgresql.xql 23 Jun 2003 18:47:03 -0000 1.2.4.1 @@ -8,7 +8,9 @@ select file_storage__move_file ( :file_id, -- file_id - :parent_id -- target_folder_id + :parent_id, -- target_folder_id + :user_id, -- creation_user + :address -- creation_ip ); Index: openacs-4/packages/file-storage/www/file-move-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-2.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/file-storage/www/file-move-2.tcl 18 Sep 2002 12:09:59 -0000 1.6 +++ openacs-4/packages/file-storage/www/file-move-2.tcl 23 Jun 2003 18:47:03 -0000 1.6.2.1 @@ -26,13 +26,18 @@ ad_require_permission $file_id write ad_require_permission $parent_id write +set user_id [ad_conn user_id] +set address [ad_conn peeraddr] + db_transaction { db_exec_plsql file_move " begin file_storage.move_file ( file_id => :file_id, - target_folder_id => :parent_id + target_folder_id => :parent_id, + creation_user => :user_id, + creation_ip => :address: ); end;"