Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	14 Sep 2005 16:43:35 -0000	1.28
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	16 Sep 2005 15:43:05 -0000	1.29
@@ -110,7 +110,7 @@
 } {
     this returns the contact's name
 } {
-    if {[contact::person_p -party_id $party_id]} {
+    if {[person::person_p -party_id $party_id]} {
 	return [person::name -person_id $party_id]
     } else {
 	# if there is an org the name is returned otherwise we search for a grou,
@@ -187,9 +187,9 @@
 } {
     if {[contact::user_p -party_id $party_id]} {
         return "user"
-    } elseif {[contact::person_p -party_id $party_id]} {
+    } elseif {[person::person_p -party_id $party_id]} {
 	return "person"
-    } elseif {[contact::organization_p -party_id $party_id]} {
+    } elseif {[organization::organization_p -party_id $party_id]} {
 	return "organization"
     } else {
 	return ""
@@ -202,35 +202,15 @@
     does this contact exist?
 } {
     # persons can be organizations so we need to do the check this way
-    if {[contact::person_p -party_id $party_id]} {
+    if {[person::person_p -party_id $party_id]} {
 	return 1
-    } elseif {[contact::organization_p -party_id $party_id]} {
+    } elseif {[organization::organization_p -party_id $party_id]} {
 	return 1
     } else {
 	return 0
     }
 }
 
-ad_proc -public contact::person_p {
-    {-party_id:required}
-} {
-    is this party a person? Cached
-} {
-    return [util_memoize [list ::contact::person_p_not_cached -party_id $party_id]]
-}
-
-ad_proc -public contact::person_p_not_cached {
-    {-party_id:required}
-} {
-    is this party a person? Cached
-} {
-    if {[db_0or1row contact_person_exists_p {select '1' from persons where person_id = :party_id}]} {
-	return 1
-    } else {
-	return 0
-    }
-}
-
 ad_proc -public contact::user_p {
     {-party_id:required}
 } {
@@ -251,30 +231,6 @@
     }
 }
 
-ad_proc -public contact::organization_p {
-    {-party_id:required}
-} {
-    is this party an organization? Cached
-} {
-    return [util_memoize [list ::contact::organization_p_not_cached -party_id $party_id]]
-}
-
-ad_proc -public contact::organization_p_not_cached {
-    {-party_id:required}
-} {
-    is this party and organization?
-} {
-    if {[contact::person_p -party_id $party_id]} {
-	return 0
-    } else {
-	if {[db_0or1row contact_org_exists_p {select '1' from organizations where organization_id = :party_id}]} {
-	    return 1
-	} else {
-	    return 0
-	}
-    }
-}
-
 ad_proc -public contact::url {
     {-party_id:required}
 } {