Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -N -r1.69 -r1.70
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	15 Mar 2006 09:33:15 -0000	1.69
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	24 Mar 2006 13:18:04 -0000	1.70
@@ -4,6 +4,8 @@
   <msg key="--_select_a_group_--">-- select a group --</msg>
   <msg key="--Create_New_Message--">-- Create New Message --</msg>
   <msg key="--none--">-- None --</msg>
+  <msg key="--select_a_person--">-- select a person --</msg>
+  <msg key="--select_an_organization--">-- select an organization --</msg>
   <msg key="--select_one--">--select one--</msg>
   <msg key="Action">Action</msg>
   <msg key="Actions">Actions</msg>
@@ -23,6 +25,7 @@
   <msg key="Add_new_in_Group">Add new %object_type% selected groups</msg>
   <msg key="Add_Organization">Add Organization</msg>
   <msg key="Add_Person">Add Person</msg>
+  <msg key="Add_Relationship">Add Relationship</msg>
   <msg key="Add_Search">Add Search</msg>
   <msg key="Add_Signature">Add Signature</msg>
   <msg key="Add_the_selected_contacts_to_a_category">Add the selected contacts to a category</msg>
@@ -131,6 +134,7 @@
   <msg key="Default_attributes">Default attributes</msg>
   <msg key="Delete">Delete</msg>
   <msg key="Delete_from">Delete</msg>
+  <msg key="dependent_on_role_of_related_contact">dependent on role of related contact</msg>
   <msg key="Description">Description:</msg>
   <msg key="description_help">A short description of what the subquery does.</msg>
   <msg key="Details">Details</msg>
@@ -220,6 +224,7 @@
   <msg key="lt_-contact_link-_was_upgraded_to_a_user">%contact_link% was upgraded to a user</msg>
   <msg key="lt_Add_new_in_Selected_Groups">Add new %object_type% and insert into selected groups</msg>
   <msg key="lt_Add_new_relsrelations">Add new %rels.relationship%</msg>
+  <msg key="lt_Add_relationship_to_sel">Add relathionship to the select contacts</msg>
   <msg key="lt_Add_relationship_type">Add relationship type</msg>
   <msg key="lt_Add_to_Selected_Group">Add to Selected Group(s)</msg>
   <msg key="lt_Advanced_searches_are">Advanced searches are very powerful but in return they require very specific input...</msg>
@@ -328,9 +333,13 @@
   <msg key="lt_remember_that_you_can">remember that you can use mail merge substitutions. The most common wildcards are {name} {first_names}, {last_name}, {salutation}, {mailing_address}, {directphone} and {date}</msg>
   <msg key="lt_Remove_from_Selected_">Remove from Selected Group(s)</msg>
   <msg key="lt_Remove_from_this_Grou">Remove from this Group</msg>
+  <msg key="lt_Remove_others_of_this_role_from_these_contacts">Remove all other relationships of this type for these contacts</msg>
+  <msg key="lt_Remove_others_of_this_role_from_this_related_contact">Remove all other relationships of this type for the related contact</msg>
   <msg key="lt_role_exists">%role% exists</msg>
   <msg key="lt_role_in_the_search_search_link">%role% in the search %search_link%</msg>
   <msg key="lt_role_not_in_the_search_search_link">%role% not in the search %search_link%</msg>
+  <msg key="lt_Search_again_over_50_orgs">Search again - over 50 organizations found...</msg>
+  <msg key="lt_Search_again_over_50_people">Search again - over 50 people found...</msg>
   <msg key="lt_Some_of_the_required_">Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included in the default group's form for this object type:</msg>
   <msg key="lt_Some_of_the_required__1">Some of the required elements for this form are missing. Please contact an administrator and make sure that the following attributes are included:</msg>
   <msg key="lt_stateprovince_is_not_">state/province is not -&gt;</msg>
@@ -366,6 +375,9 @@
   <msg key="lt_This_user_is_awaiting">This user is awaiting administrator approval</msg>
   <msg key="lt_This_users_has_not_be">This users has not been approved</msg>
   <msg key="lt_Title_is_not_shown_in_the_message">Title is not shown in the message, it is used to select the appropriate message.</msg>
+  <msg key="lt_To_many_contacts_found_search_again">To many search results please search again to select a person or an organization</msg>
+  <msg key="lt_To_many_orgs_found_search_again">To many search results please search again to select an organization</msg>
+  <msg key="lt_To_many_people_found_search_again">To many search results please search again to select a person</msg>
   <msg key="lt_Unable_to_retrieve_gr">Unable to retrieve group_id</msg>
   <msg key="lt_update_contact_if_needed">If needed please update this contact's information.</msg>
   <msg key="lt_updated_in_the_last_-">updated in the last -&gt;</msg>
@@ -462,6 +474,7 @@
   <msg key="Person">Person</msg>
   <msg key="person">person</msg>
   <msg key="Person_Form">Person Form</msg>
+  <msg key="Please_choose_a_contact">Please choose a contact</msg>
   <msg key="pp">pp.</msg>
   <msg key="Pretty_name">Pretty Name</msg>
   <msg key="pretty_name_help">The Pretty Name to use in the list label.</msg>
@@ -483,6 +496,7 @@
   <msg key="READ_THESE">READ THESE</msg>
   <msg key="Recipients">Recipients</msg>
   <msg key="Refund">Refund</msg>
+  <msg key="Related_contact">Related contact</msg>
   <msg key="Relationship">Relationship</msg>
   <msg key="Relationship_Added">Relationship Added</msg>
   <msg key="Relationship_Deleted">Relationship Deleted</msg>
@@ -500,7 +514,9 @@
   <msg key="Return_to_history">Return to history</msg>
   <msg key="Return_to_title">Return to %title%</msg>
   <msg key="Role">Role</msg>
+  <msg key="Role_for_these_contacts">Role for these contacts</msg>
   <msg key="Role_Name">Role Name</msg>
+  <msg key="Role_of_related_contact">Role of related contact</msg>
   <msg key="Role_One">Role One</msg>
   <msg key="Role_Singular">Role Singular</msg>
   <msg key="Role_Two">Role Two</msg>
@@ -512,6 +528,7 @@
   <msg key="save_this_search_">Save this Search</msg>
   <msg key="Saved_Searches">Saved Searches</msg>
   <msg key="Search">Search</msg>
+  <msg key="Search_again">Search again...</msg>
   <msg key="search_contact">Search contact</msg>
   <msg key="Search_Existing">Search Existing</msg>
   <msg key="Search_for">Search for</msg>
@@ -557,6 +574,8 @@
   <msg key="The_search_-title-_was_copied_to_your_searches">The search &quot;%title%&quot; was copied to your searches</msg>
   <msg key="The_search_-title-_was_deleted">The search &quot;%title%&quot; was deleted</msg>
   <msg key="The_search_-title-_was_made_public">The search &quot;%title%&quot; was made public</msg>
+  <msg key="The_selected_relationship_requires_related_org">The selected relationship requires that the related contact be an organization</msg>
+  <msg key="The_selected_relationship_requires_related_person">The selected relationship requires that the related contact be a person</msg>
   <msg key="This_contact_doesnt"> This contact doesn't have an email, you are going to use it's employer email (%emp_addr%)</msg>
   <msg key="this_var_name">This &quot;Variable Name&quot; is already present</msg>
   <msg key="Times">times</msg>
Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -N -r1.48 -r1.49
--- openacs-4/packages/contacts/lib/contacts.tcl	14 Mar 2006 07:14:44 -0000	1.48
+++ openacs-4/packages/contacts/lib/contacts.tcl	24 Mar 2006 13:18:04 -0000	1.49
@@ -150,6 +150,7 @@
 template::multirow create bulk_acts pretty link detailed
 template::multirow append bulk_acts "[_ contacts.Add_to_Group]" "${base_url}group-parties-add" "[_ contacts.Add_to_group]"
 template::multirow append bulk_acts "[_ contacts.Remove_From_Group]" "${base_url}group-parties-remove" "[_ contacts.lt_Remove_from_this_Grou]"
+template::multirow append bulk_acts "[_ contacts.Add_Relationship]" "${base_url}relationship-bulk-add" "[_ contacts.lt_Add_relationship_to_sel]"
 template::multirow append bulk_acts "[_ contacts.Mail_Merge]" "${base_url}message" "[_ contacts.lt_E-mail_or_Mail_the_se]"
 if { [permission::permission_p -object_id $package_id -privilege "admin"] } {
     set admin_p 1
Index: openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql	24 Mar 2006 13:18:04 -0000	1.1
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_valid_object_types">
+      <querytext>
+select primary_object_type
+  from contact_rel_types
+ where primary_role = :role_two 
+      </querytext>
+</fullquery>
+
+<fullquery name="get_rels">
+      <querytext>
+select acs_rel_type__role_pretty_name(primary_role) as pretty_name,
+       primary_role as role
+  from contact_rel_types
+ where secondary_object_type in ([template::util::tcl_to_sql_list $object_types])
+ group by primary_role
+ order by upper(acs_rel_type__role_pretty_name(primary_role))
+      </querytext>
+</fullquery>
+
+<fullquery name="get_rel_info">
+      <querytext>
+select *
+  from contact_rel_types
+ where primary_role = :role_one
+   and secondary_role = :role_two
+   and primary_object_type in ([template::util::tcl_to_sql_list $object_types])
+      </querytext>
+</fullquery>
+
+<fullquery name="get_secondary_object_type">
+      <querytext>
+select secondary_role
+  from contact_rel_types
+ where primary_role = :role_one
+   and secondary_role = :role_two
+   and primary_object_type in ([template::util::tcl_to_sql_list $object_types])
+      </querytext>
+</fullquery>
+
+<fullquery name="get_role_one_pretty">
+      <querytext>
+select acs_rel_type__role_pretty_name(:role_one)
+      </querytext>
+</fullquery>
+
+<fullquery name="get_rel_types">
+      <querytext>
+select acs_rel_type__role_pretty_name(primary_role),
+       primary_role
+  from contact_rel_types
+ where secondary_role = :role_two
+   and primary_object_type in ([template::util::tcl_to_sql_list $object_types])
+      </querytext>
+</fullquery>
+
+<fullquery name="delete_rel">
+      <querytext>
+select acs_object__delete(rel_id)
+  from acs_rels
+ where (
+         ( object_id_one = :object_id_one and object_id_two = :object_id_two )
+       ) or (
+         ( object_id_one = :object_id_two and object_id_two = :object_id_one )
+       )
+   and rel_type = :rel_type
+      </querytext>
+</fullquery>
+
+<fullquery name="delete_all_rels">
+      <querytext>
+select acs_object__delete(rel_id)
+  from acs_rels
+ where ( object_id_one = :party_id or object_id_two = :party_id )
+   and rel_type = :rel_type
+      </querytext>
+</fullquery>
+
+<fullquery name="rel_exists_p">
+      <querytext>
+select rel_id
+  from acs_rels 
+ where rel_type = :rel_type
+   and object_id_one = :object_id_one
+   and object_id_two = :object_id_two
+      </querytext>
+</fullquery>
+
+<fullquery name="create_rel">
+      <querytext>
+select acs_rel__new (
+                     :rel_id,
+                     :rel_type,
+                     :object_id_one,
+                     :object_id_two,
+                     :context_id,
+                     :creation_user,
+                     :creation_ip  
+                    )
+      </querytext>
+</fullquery>
+
+<fullquery name="insert_contact_rel">
+      <querytext>
+insert into contact_rels
+       (rel_id)
+values 
+       (:rel_id)
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/contacts/www/relationship-bulk-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-add.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/relationship-bulk-add.adp	24 Mar 2006 13:18:04 -0000	1.1
@@ -0,0 +1,5 @@
+<master src="/packages/contacts/lib/contacts-master" />
+<property name="context">@context@</property>
+<property name="title">@title@</property>
+
+<formtemplate id="add_edit"></formtemplate>
Index: openacs-4/packages/contacts/www/relationship-bulk-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-add.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/relationship-bulk-add.tcl	24 Mar 2006 13:18:04 -0000	1.1
@@ -0,0 +1,180 @@
+ad_page_contract {
+
+    @author Matthew Geddert (openacs@geddert.com)
+    @creation-date 2006-03-12
+    @cvs-id $Id: relationship-bulk-add.tcl,v 1.1 2006/03/24 13:18:04 matthewg Exp $
+
+} {
+    {party_id:integer,multiple ""}
+    {party_ids ""}
+    {return_url}
+    {role_one ""}
+    {role_two ""}
+}
+
+set title [_ contacts.Add_Relationship]
+set context [list $title]
+set names [list]
+set contact_type [list]
+if { ![exists_and_not_null party_ids] } {
+    set party_ids $party_id
+}
+set organizations [list]
+set organization_ids [list]
+set people [list]
+set person_ids [list]
+foreach party $party_ids {
+    contact::require_visiblity -party_id $party
+    if { [contact::type -party_id $party] eq "organization" } {
+	lappend organizations [contact::link -party_id $party]
+	lappend organization_ids $party
+    } else {
+	lappend people [contact::link -party_id $party]
+	lappend person_ids $party
+    }
+}
+
+if { [llength $organization_ids] > 0 && [llength $person_ids] > 0 } {
+    ad_complain "babab"
+} elseif { [llength $person_ids] > 0 } {
+    set contact_type "person"
+} elseif { [llength $organization_ids] > 0 } {
+    set contact_type "organization"
+}
+set organizations [join $organizations ", "]
+set people [join $people ", "]
+
+
+set object_types [list "party" $contact_type]
+set rel_two_options [db_list_of_lists get_rels {}]
+set rel_two_options [ams::util::localize_and_sort_list_of_lists -list $rel_two_options]
+set rel_two_options [concat [list [list "" ""]] $rel_two_options]
+
+if { $role_two ne "" && $role_one ne "" } {
+    # we verify that the role still exists
+    # if not we set role_one to zero
+    # this also gets values needed by the validation block
+    if { ![db_0or1row get_rel_info {}] } {
+	set role_one ""
+    }
+}
+if { $role_two ne "" } {
+    set role_one_options [ams::util::localize_and_sort_list_of_lists -list [db_list_of_lists get_rel_types {}]]
+    if { [llength $role_one_options] == "0" } {
+	ad_return_error "[_ contacts.Error]" "[_ contacts.lt_There_was_a_problem_w]"
+    } elseif { [llength $role_one_options] == "1" } {
+	set role_one [lindex [lindex $role_one_options 0] 1]
+	set role_one_pretty [lindex [lindex $role_one_options 0] 2]
+    } else {
+	set role_one_options [concat [list [list "" ""]] $role_one_options]
+	set role_one ""
+    }
+}
+
+
+ad_form -name "add_edit" -method "GET" -export {party_ids return_url} -form {
+    {remove_role_one:boolean(checkbox),optional
+	{label ""}
+	{options {{"[_ contacts.lt_Remove_others_of_this_role_from_these_contacts]" 1}}}
+    }
+    {people:text(inform) {label "[_ tasks.lt_Add_relationship_to_these_people]"}}
+    {organizations:text(inform) {label "[_ tasks.lt_Add_relationship_to_these_orgs]"}}
+}
+
+if { $role_two ne "" && $role_one eq "" } {
+    ad_form -extend -name "add_edit" -form {
+	{role_one:text(select)
+	    {label "[_ contacts.Role_for_these_contacts]"}
+	    {options $role_one_options}
+	}
+    }
+} elseif { $role_two ne "" && $role_one ne "" } {
+    ad_form -extend -name "add_edit" -form {
+	{role_one:text(hidden)
+	    {label ""}
+	    {value "$role_one"}
+	}
+	{role_one_pretty:text(inform)
+	    {label "[_ contacts.Role_for_these_contacts]"}
+	}
+    }
+    # value has to be set this way to override on refreshes
+    template::element::set_value add_edit role_one $role_one
+    template::element::set_value add_edit role_one_pretty [lang::util::localize [db_string get_role_one_pretty {}]]
+} else {
+    ad_form -extend -name "add_edit" -form {
+	{role_one:text(hidden),optional}
+	{role_one_pretty:text(inform)
+	    {label "[_ contacts.Role_for_these_contacts]"}
+	    {value "[_ contacts.dependent_on_role_of_related_contact]"}
+	}
+    }
+
+}
+
+ad_form -extend -name "add_edit" -form {
+    {role_two:text(select)
+	{label "[_ contacts.Role_of_related_contact]"}
+	{options $rel_two_options}
+	{section "[_ contacts.Related_contact]"}
+    }
+    {object_id_two:contact_search(contact_search) {label "[_ contacts.Related_contact]"}}
+    {remove_role_two:boolean(checkbox),optional
+	{label ""}
+	{options {{"[_ contacts.lt_Remove_others_of_this_role_from_this_related_contact]" 1}}}
+    }
+    {add:text(submit) {label "[_ contacts.Add_Relationship]"}}
+} -on_request {
+} -edit_request {
+} -on_refresh {
+} -validate {
+} -on_submit {
+
+    if { ![db_0or1row get_rel_info {}] } {
+	break
+    }
+    set object_type_two [contact::type -party_id $object_id_two]
+    if { $object_type_two eq "organization" && [lsearch [list person party] $secondary_object_type] >= 0 } {
+	template::element::set_error add_edit object_id_two [_ contacts.The_selected_relationship_requires_related_person]
+    }
+    if { $object_type_two ne "organization" && [lsearch [list organization party] $secondary_object_type] >= 0 } { 
+	template::element::set_error add_edit object_id_two [_ contacts.The_selected_relationship_requires_related_org]
+    }
+    if { ![template::form::is_valid add_edit] } {
+	break
+    }
+    if { $remove_role_two eq "1" } {
+	set party_id $object_id_two
+	db_list delete_all_rels {}
+    }
+    set context_id {}
+    set creation_user [ad_conn user_id]
+    set creation_ip [ad_conn peeraddr]
+    foreach object_id_one $party_ids {
+	if { $remove_role_one eq "1" } {
+	    set party_id $object_id_one
+	    db_list delete_all_rels {}
+	}
+	set existing_rel_id [db_string rel_exists_p {} -default {}]
+	if { [empty_string_p $existing_rel_id] } {
+	    set rel_id {}
+	    set rel_id [db_exec_plsql create_rel {}]
+	    db_dml insert_contact_rel {}
+	}
+	contact::flush -party_id $object_id_one
+    }
+    contact::flush -party_id $object_id_two
+
+} -after_submit {
+    ad_returnredirect $return_url
+}
+
+
+if { [template::element::get_value add_edit organizations] eq "" } {
+    template::element::set_properties add_edit organizations widget hidden
+}
+if { [template::element::get_value add_edit people] eq "" } {
+    template::element::set_properties add_edit people widget hidden
+}
+
+ad_return_template