Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/application-data-link-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/application-data-link-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl 26 Jul 2005 16:43:57 -0000 1.1.2.2 +++ openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl 14 Dec 2005 22:12:51 -0000 1.1.2.3 @@ -12,16 +12,11 @@ -this_object_id:required -target_object_id:required } { - if {[catch {ad_conn user_id} user_id]} { - set user_id 0 - } - - if {[catch {ad_conn peeraddr} id_addr]} { - set id_addr 127.0.0.1 - } + set forward_rel_id [db_nextval acs_data_links_seq] + set backward_rel_id [db_nextval acs_data_links_seq] - db_exec_plsql create_forward_link {} - db_exec_plsql create_backward_link {} + db_dml create_forward_link {} + db_dml create_backward_link {} } ad_proc -public application_data_link::delete_links { @@ -30,7 +25,7 @@ set rel_ids [db_list linked_objects {}] foreach rel_id $rel_ids { - relation_remove $rel_id + dm_dml delete_link {} } } Index: openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql 26 Jul 2005 16:43:57 -0000 1.1.2.2 +++ openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql 14 Dec 2005 22:12:51 -0000 1.1.2.3 @@ -1,44 +1,61 @@ + + + insert into acs_data_links (rel_id, object_id_one, object_id_two) + values (:forward_rel_id, :this_object_id, :target_object_id) + + + + + + insert into acs_data_links (rel_id, object_id_one, object_id_two) + values (:backward_rel_id, :target_object_id, :this_object_id) + + + select rel_id - from acs_rels - where rel_type = 'application_data_link' - and (object_id_one = :object_id + from acs_data_links + where (object_id_one = :object_id or object_id_two = :object_id) + + + delete from acs_data_links + where rel_id = :rel_id + + + select object_id_two - from acs_rels + from acs_data_links where object_id_one = :package_id - and rel_type = 'application_data_link' select o.object_id - from acs_rels r, acs_objects o + from acs_data_links r, acs_objects o where r.object_id_one = :from_object_id and r.object_id_two = o.object_id and o.object_type = :to_object_type - and r.rel_type = 'application_data_link' select i.item_id - from acs_rels r, cr_items i + from acs_data_links r, cr_items i where r.object_id_one = :from_object_id and r.object_id_two = i.item_id and i.content_type = :to_content_type - and r.rel_type = 'application_data_link'