Index: openacs-4/packages/address-book/www/address-delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-delete-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/address-book/www/address-delete-postgresql.xql	22 Aug 2001 23:11:49 -0000	1.1
+++ openacs-4/packages/address-book/www/address-delete-postgresql.xql	28 Aug 2001 23:51:53 -0000	1.2
@@ -5,39 +5,17 @@
 
 <fullquery name="delete_location_rel">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
 
-	begin
-	  location_rel__delete(:rel_id);
-	end;
+	select location_rel__delete(:rel_id);
     
       </querytext>
 </fullquery>
 
  
 <fullquery name="delete_orphan_address">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
 
-	    declare
-	      v_rel_id subplace_rels.rel_id%TYPE;
-	      cursor subplace_rel_cursor is
-	        select sr.rel_id
-	          from subplace_rels sr,
-	               acs_rels ar
-	         where ar.rel_id = sr.rel_id
-	           and ar.object_id_two = :address_id;
-	    begin
-	      open subplace_rel_cursor;
-	      fetch subplace_rel_cursor into v_rel_id;
-	      if not subplace_rel_cursor%NOTFOUND then
-	        subplace_rel__delete(v_rel_id);
-	      end if;
-	      close subplace_rel_cursor;
-	      pl_address__delete(:address_id);
-	    end;
+          select pl_address__delete_orphan_address(:address_id);
 	
       </querytext>
 </fullquery>