Index: openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	28 May 2006 01:50:21 -0000	1.18
+++ openacs-4/packages/contacts/tcl/contacts-procs-postgresql.xql	2 Jun 2006 09:18:31 -0000	1.19
@@ -26,22 +26,32 @@
   </querytext>
 </fullquery>
 
-<fullquery name="contacts::create_revisions_sweeper.get_persons_without_items">
+<fullquery name="contacts::sweeper.get_persons_without_items">
   <querytext>
     select person_id
       from persons
      where person_id not in ( select item_id from cr_items )
   </querytext>
 </fullquery>
 
-<fullquery name="contacts::create_revisions_sweeper.get_organizations_without_items">
+<fullquery name="contacts::sweeper.get_organizations_without_items">
   <querytext>
     select organization_id
       from organizations
      where organization_id not in ( select item_id from cr_items )
   </querytext>
 </fullquery>
 
+<fullquery name="contacts::sweeper.insert_privacy_records">
+  <querytext>
+    insert into contact_privacy
+           ( party_id, nomail_p, noemail_p, nophone_p, gone_p )
+    select party_id, 'f'::boolean, 'f'::boolean, 'f'::boolean, 'f'::boolean
+      from parties
+     where party_id not in ( select party_id from contact_privacy )
+  </querytext>
+</fullquery>
+
 <fullquery name="contacts::spouse_sync_attribute_ids.get_valid_attribute_ids">
   <querytext>
     select attribute_id
@@ -60,6 +70,42 @@
   </querytext>
 </fullquery>
 
+<fullquery name="contact::privacy_allows_p.is_type_allowed_p">
+  <querytext>
+    select ${type}_p
+      from contact_privacy
+     where party_id = :party_id
+  </querytext>
+</fullquery>
+
+<fullquery name="contact::privacy_set.record_exists_p">
+  <querytext>
+    select 1
+      from contact_privacy
+     where party_id = :party_id
+  </querytext>
+</fullquery>
+
+<fullquery name="contact::privacy_set.update_privacy">
+  <querytext>
+    update contact_privacy
+       set email_p = :email_p,
+           mail_p = :mail_p,
+           phone_p = :phone_p,
+           gone_p = :gone_p
+     where party_id = :party_id
+  </querytext>
+</fullquery>
+
+<fullquery name="contact::privacy_set.insert_privacy">
+  <querytext>
+    insert into contact_privacy
+           ( party_id, email_p, mail_p, phone_p, gone_p )
+           values
+           ( :party_id, :email_p, :mail_p, :phone_p, :gone_p )
+  </querytext>
+</fullquery>
+
 <fullquery name="contact::util::generate_filename.get_parties_existing_filenames">
   <querytext>
     select name