Index: openacs-4/packages/contacts/www/import-csv-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/import-csv-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/import-csv-3.tcl	23 Jan 2007 18:23:20 -0000	1.1
+++ openacs-4/packages/contacts/www/import-csv-3.tcl	11 Jul 2007 19:49:08 -0000	1.2
@@ -6,7 +6,7 @@
 } {
     file_name:notnull
     file_path:notnull
-    {organization:array,multiple}
+    {organization:array,multiple,optional}
     {person:array,multiple}
     {contact_rels_employment:array,multiple,optional}
     person_elements
@@ -144,4 +144,4 @@
 append html "</table>"
 set context "$file_name"
 append html "<a href=\"[export_vars -base import-csv-4.tcl  {file_name file_path organization:array,multiple,optional person:array,multiple,optional contact_rels_employment:array,multiple,optional person_elements organization_elements contact_rels_employment_elements group_ids} ]\">OK</a>"
-        
\ No newline at end of file
+        
Index: openacs-4/packages/contacts/www/import-csv-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/import-csv-4.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/import-csv-4.tcl	2 Feb 2007 11:24:57 -0000	1.2
+++ openacs-4/packages/contacts/www/import-csv-4.tcl	11 Jul 2007 19:49:08 -0000	1.3
@@ -6,7 +6,7 @@
 } {
     file_name:notnull
     file_path:notnull
-    {organization:array,multiple}
+    {organization:array,multiple,optional}
     {person:array,multiple}
     {contact_rels_employment:array,multiple,optional}
     person_elements
@@ -228,7 +228,7 @@
 		    }
 		    
 		    # Now make the country a country code
-		    if {![exists_and_not_null country_code]} {
+ 		    if {![exists_and_not_null country_code]} {
 			if {[exists_and_not_null country]} {
 			    # We do have the country, so let's figure
 			    # out the code for it.
@@ -240,6 +240,7 @@
 
 		    # Now save it
 		    if {$country_code ne ""} {
+			set country_code [string toupper $country_code]
 			append html "postal:: $country_code $municipality<br />"
 			ams::attribute::save::postal_address -object_id [set ${object_type}_revision_id] \
 			    -attribute_id $attribute_id -object_type $object_type  -delivery_address $delivery_address \