Index: openacs-4/packages/acs-admin/www/users/merge.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/merge.xql	4 Jun 2006 00:45:20 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/merge.xql	3 Sep 2024 15:37:29 -0000	1.3
@@ -1,75 +1,108 @@
 <?xml version="1.0"?>
   <queryset>
 
-    <fullquery name="one_user_portrait">      
+    <fullquery name="one_user_portrait">
       <querytext>
 
-	select 
-	  c.item_id
-	from acs_rels a, cr_items c
-	where a.object_id_two = c.item_id
+        select
+          c.item_id
+        from acs_rels a, cr_items c
+        where a.object_id_two = c.item_id
           and a.object_id_one = :user_id
-	  and a.rel_type = 'user_portrait_rel'
+          and a.rel_type = 'user_portrait_rel'
 
       </querytext>
     </fullquery>
 
     <fullquery name="one_get_info">
       <querytext>
-	select 
-	  first_names as one_first_names,
-	  last_name as one_last_name,
-  	  creation_user as one_creation_user,
-	  to_char(creation_date,'month DD, yyyy') as one_creation_date,
-	  creation_ip as one_creation_ip,
-	  to_char(last_modified,'month DD, yyyy') as one_last_modified,
-	  email as one_email,
-	  url as one_url,
-	  modifying_user as one_modifying_user,
-	  modifying_ip as one_modifying_ip,
-	  username as one_username,
-	  screen_name as one_screen_name,
-	  to_char(last_visit,'month DD, yyyy') as one_last_visit,
-	  member_state as one_member_state
-	from cc_users
-	where user_id = :user_id
+        select
+          first_names as one_first_names,
+          last_name as one_last_name,
+          creation_user as one_creation_user,
+          to_char(creation_date,'month DD, yyyy') as one_creation_date,
+          creation_ip as one_creation_ip,
+          to_char(last_modified,'month DD, yyyy') as one_last_modified,
+          email as one_email,
+          url as one_url,
+          modifying_user as one_modifying_user,
+          modifying_ip as one_modifying_ip,
+          username as one_username,
+          screen_name as one_screen_name,
+          to_char(last_visit,'month DD, yyyy') as one_last_visit,
+          member_state as one_member_state
+        from cc_users
+        where user_id = :user_id
       </querytext>
     </fullquery>
 
-    <fullquery name="two_user_portrait">      
+    <fullquery name="two_user_portrait">
       <querytext>
 
-	select 
-	  c.item_id
-	from acs_rels a, cr_items c
-	where a.object_id_two = c.item_id
-	  and a.object_id_one = :user_id_from_search
-	  and a.rel_type = 'user_portrait_rel'
+        select
+          c.item_id
+        from acs_rels a, cr_items c
+        where a.object_id_two = c.item_id
+          and a.object_id_one = :user_id_from_search
+          and a.rel_type = 'user_portrait_rel'
 
       </querytext>
-    </fullquery>    
+    </fullquery>
 
     <fullquery name="two_get_info">
       <querytext>
-	select 
-	first_names as two_first_names,
-	last_name as two_last_name,
-	creation_user as two_creation_user,
-	to_char(creation_date,'month DD, yyyy') as two_creation_date,
-	creation_ip as two_creation_ip,
-	to_char(last_modified,'month DD, yyyy') as two_last_modified,
-	email as two_email,
-	url as two_url,
-	modifying_user as two_modifying_user,
-	modifying_ip as two_modifying_ip,
-	username as two_username,
-	screen_name as two_screen_name,
-	to_char(last_visit,'month DD, yyyy') as two_last_visit,
-	member_state as two_member_state
-	from cc_users
-	where user_id = :user_id_from_search
+        select
+        first_names as two_first_names,
+        last_name as two_last_name,
+        creation_user as two_creation_user,
+        to_char(creation_date,'month DD, yyyy') as two_creation_date,
+        creation_ip as two_creation_ip,
+        to_char(last_modified,'month DD, yyyy') as two_last_modified,
+        email as two_email,
+        url as two_url,
+        modifying_user as two_modifying_user,
+        modifying_ip as two_modifying_ip,
+        username as two_username,
+        screen_name as two_screen_name,
+        to_char(last_visit,'month DD, yyyy') as two_last_visit,
+        member_state as two_member_state
+        from cc_users
+        where user_id = :user_id_from_search
       </querytext>
     </fullquery>
 
-  </queryset>
+    <fullquery name="one_user_contributions">
+      <querytext>
+      select
+        a.object_id,
+        at.pretty_name,
+        at.pretty_plural,
+        to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date,
+        acs_object.name(a.object_id) as object_name
+      from acs_objects a, acs_object_types at
+      where a.object_type = at.object_type
+        and a.creation_user = :user_id
+      order by pretty_name,
+        creation_date desc,
+        object_name
+      </querytext>
+    </fullquery>
 
+    <fullquery name="two_user_contributions">
+      <querytext>
+      select
+        a.object_id,
+        at.pretty_name,
+        at.pretty_plural,
+        to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date,
+        acs_object.name(a.object_id) as object_name
+      from acs_objects a, acs_object_types at
+      where a.object_type = at.object_type
+        and a.creation_user = :user_id_from_search
+      order by pretty_name,
+        creation_date desc,
+        object_name
+      </querytext>
+    </fullquery>
+
+  </queryset>