Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/contacts/www/cadmin/attributes-answer-optional-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/www/cadmin/attributes-answer-optional.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/attributes-answer-optional.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/contacts/www/cadmin/attributes-answer-optional.tcl	19 Aug 2004 01:21:42 -0000	1.1.2.2
+++ openacs-4/packages/contacts/www/cadmin/attributes-answer-optional.tcl	22 Aug 2004 23:39:42 -0000	1.1.2.3
@@ -13,7 +13,6 @@
 
 foreach attribute_id $attribute_id {
     db_dml map_the_attribute {
-        update contact_attribute_object_map set required_p = 'f' where object_id = :object_id and attribute_id = :attribute_id
     }
 }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/contacts/www/cadmin/attributes-answer-required-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/www/cadmin/attributes-answer-required.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/attributes-answer-required.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/contacts/www/cadmin/attributes-answer-required.tcl	19 Aug 2004 01:21:42 -0000	1.1.2.2
+++ openacs-4/packages/contacts/www/cadmin/attributes-answer-required.tcl	22 Aug 2004 23:39:42 -0000	1.1.2.3
@@ -12,9 +12,7 @@
 
 
 foreach attribute_id $attribute_id {
-    db_dml map_the_attribute {
-        update contact_attribute_object_map set required_p = 't' where object_id = :object_id and attribute_id = :attribute_id
-    }
+    db_dml map_the_attribute {}
 }
 
 ad_returnredirect "object-map?object_id=$object_id"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/contacts/www/cadmin/attributes-map-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/www/cadmin/attributes-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/attributes-map.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/contacts/www/cadmin/attributes-map.tcl	19 Aug 2004 01:21:42 -0000	1.1.2.2
+++ openacs-4/packages/contacts/www/cadmin/attributes-map.tcl	22 Aug 2004 23:39:42 -0000	1.1.2.3
@@ -11,16 +11,14 @@
 }
 
 
-db_0or1row get_latest_sort_order {select sort_order from contact_attribute_object_map order by sort_order desc limit 1 }
+db_0or1row get_latest_sort_order {}
 
 if { ![exists_and_not_null sort_order] } {
     set sort_order 0
 }
 foreach attribute_id $attribute_id {
     incr sort_order
-    db_1row map_the_attribute {
-        select contact__attribute_object_map_save(:object_id,:attribute_id,:sort_order,'f',null)
-    }
+    db_1row map_attribute {}
 }
 
 ad_returnredirect "object-map?object_id=$object_id"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/contacts/www/cadmin/attributes-order-update-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/www/cadmin/attributes-order-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/attributes-order-update.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/contacts/www/cadmin/attributes-order-update.tcl	19 Aug 2004 01:21:42 -0000	1.1.2.2
+++ openacs-4/packages/contacts/www/cadmin/attributes-order-update.tcl	22 Aug 2004 23:39:42 -0000	1.1.2.3
@@ -16,14 +16,11 @@
 set count 0
 
 # first we get rid of the old sort order
-db_dml delete_sort_orders { update contact_attribute_object_map set sort_order = '-1' where object_id = :object_id }
-db_foreach get_attributes { select attribute_id from contact_attribute_object_map where object_id = :object_id } {
+db_dml delete_previous_sort_orders {}
+db_foreach get_attributes {} {
     if {[info exists sort_key($attribute_id)]} {
         set sort_order_temp $sort_key($attribute_id)
-        db_dml update_attribute_object_map {
-            update contact_attribute_object_map set sort_order = :sort_order_temp where object_id = :object_id and attribute_id = :attribute_id
-        }
-    } else {
+        db_dml update_sort_order {}
     }
 }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/contacts/www/cadmin/attributes-unmap-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/www/cadmin/attributes-unmap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/attributes-unmap.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/contacts/www/cadmin/attributes-unmap.tcl	19 Aug 2004 01:21:42 -0000	1.1.2.2
+++ openacs-4/packages/contacts/www/cadmin/attributes-unmap.tcl	22 Aug 2004 23:39:42 -0000	1.1.2.3
@@ -11,12 +11,10 @@
 }
 
 
-db_0or1row get_latest_sort_order {select sort_order from contact_attribute_object_map order by sort_order limit 1 }
+db_0or1row get_latest_sort_order {}
 
 foreach attribute_id $attribute_id {
-    db_dml unmap_the_attribute {
-        delete from contact_attribute_object_map where object_id = :object_id and attribute_id = :attribute_id
-    }
+    db_dml unmap_attribute {}
 }
 
 ad_returnredirect "object-map?object_id=$object_id"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/contacts/www/cadmin/object-map-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/contacts/www/cadmin/object-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/object-map.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/contacts/www/cadmin/object-map.tcl	19 Aug 2004 05:58:26 -0000	1.1.2.3
+++ openacs-4/packages/contacts/www/cadmin/object-map.tcl	22 Aug 2004 23:39:42 -0000	1.1.2.4
@@ -20,7 +20,7 @@
 set user_id [ad_maybe_redirect_for_registration]
 permission::require_permission -object_id $object_id -privilege admin
 
-db_1row select_object_name { select acs_object__name(:object_id) as object_name }
+set object_name [db_string get_object_name {}]
 
 set title "Attribute Management"
 set context [list $title]
@@ -108,24 +108,7 @@
 
 set sort_order_key 0
 
-db_foreach get_courses {
-    select ca.attribute_id,
-           ca.attribute,
-           can.name,
-           can.help_text,
-           caom.required_p,
-           caom.sort_order,
-           cw.description as widget_description
-      from contact_attribute_object_map caom,
-           contact_attributes ca left join contact_attribute_names can on (can.attribute_id = ca.attribute_id),
-           contact_widgets cw
-     where caom.attribute_id = ca.attribute_id
-       and cw.widget_id = ca.widget_id
-       and can.locale = :locale
-       and not ca.depreciated_p
-       and caom.object_id = :object_id
-     order by caom.sort_order asc
-} {
+db_foreach get_mapped_courses {} {
     incr sort_order_key 10
     template::multirow append mapped_attributes $attribute_id $attribute $name $help_text $required_p $sort_order $widget_description $sort_order_key
 
@@ -194,20 +177,7 @@
 
 # This query will override the ad_page_contract value entry_id
 
-db_multirow -extend { sort_order_key } -unclobber unmapped_attributes get_courses {
-    select ca.attribute_id,
-           ca.attribute,
-           can.name,
-           can.help_text,
-           cw.description as widget_description
-      from contact_attributes ca left join contact_attribute_names can on (can.attribute_id = ca.attribute_id),
-           contact_widgets cw
-     where cw.widget_id = ca.widget_id
-       and can.locale = :locale
-       and not ca.depreciated_p
-       and ca.attribute_id not in ( select attribute_id from contact_attribute_object_map where object_id = :object_id)
-     order by upper(can.name) asc
-} {
+db_multirow -extend { sort_order_key } -unclobber unmapped_attributes get_unmapped_courses {} {
 }