Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/contacts/lib/contacts.tcl	15 Feb 2006 10:06:36 -0000	1.43
+++ openacs-4/packages/contacts/lib/contacts.tcl	20 Feb 2006 09:06:26 -0000	1.44
@@ -143,11 +143,11 @@
 }
 append name_label [join $page_size_list " | "]
 
-################
-# disabled csv download here
-################
-# append name_label "&nbsp;&nbsp;&nbsp;[_ contacts.Get]: <a href=\"[export_vars -base $base_url -url {{format csv} search_id query page orderby page_size}]\">[_ contacts.CSV]</a>"
-set format normal
+if { [string is true [parameter::get -parameter "DisableCSV" -default "0"]] } {
+    set format normal
+} else {
+    append name_label "&nbsp;&nbsp;&nbsp;[_ contacts.Get]: <a href=\"[export_vars -base $base_url -url {{format csv} search_id query page orderby attr_val_name page_size}]\">[_ contacts.CSV]</a>"
+}
 
 template::multirow create bulk_acts pretty link detailed
 template::multirow append bulk_acts "[_ contacts.Add_to_Group]" "${base_url}group-parties-add" "[_ contacts.Add_to_group]"
@@ -201,10 +201,19 @@
 		  organization [list display_col organization] \
 		  email [list display_col email]]
 
-set row_list [list \
+if { $format == "csv" } {
+    set row_list [list \
+		      contact_id {} \
+		      first_names {} \
+		      last_name {} \
+		      email {} \
+		      ]
+    
+} else {
+    set row_list [list \
 		  checkbox {} \
 		  contact {}]
-
+}
 if { [exists_and_not_null search_id] } {
     # We get all the default values for that are mapped to this search_id
     set default_values [db_list_of_lists get_default_extends { }]
@@ -332,13 +341,9 @@
 	csv {
 	    label "[_ contacts.CSV]"
 	    output csv
-            page_size 0
+            page_size 64000
             row {
-		contact_id {}
-                first_names {}
-                last_name {}
-                organization {}
-                email {}
+		$row_list
 	    }
 	}
     }