Fisheye: Tag 1.2.16.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.16.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
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.2.16.1
--- 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 2019 10:52:23 -0000	1.2.16.1
@@ -71,5 +71,39 @@
       </querytext>
     </fullquery>
 
+    <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>