Index: openacs-4/packages/contacts/tcl/attribute-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/attribute-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/contacts/tcl/attribute-procs.tcl	26 Dec 2005 18:55:30 -0000	1.10
+++ openacs-4/packages/contacts/tcl/attribute-procs.tcl	26 Dec 2005 20:33:46 -0000	1.11
@@ -184,24 +184,24 @@
 
             # Set the townline
 	    # Different formats depending on the country
-	    switch $country_code {
+	    switch $row(country_code) {
 		"US" {
-		    set row(town_line) "$municipality, $region $postal_code"
+		    set row(town_line) "$row(municipality), $row(region) $row(postal_code)"
 		}
 		"DE" {
-		    set row(town_line) "$postal_code $municipality"
+		    set row(town_line) "$row(postal_code) $row(municipality)"
 		}
                 "UK" {
-		    set row(town_line) "$municipality, $region $postal_code"
+		    set row(town_line) "$row(municipality), $row(region) $row(postal_code)"
                 }
                 "CH" {
-		    set row(town_line) "$postal_code $municipality"
+		    set row(town_line) "$row(postal_code) $row(municipality)"
                 }                    
 		default {
 		    if { [parameter::get_from_package_key -package_key "ams" -parameter "DefaultAdressLayoutP" -default 1] } {
-			set row(town_line) "$municipality $region $postal_code"
+			set row(town_line) "$row(municipality) $row(region) $row(postal_code)"
 		    } else {
-			set row(town_line) "$postal_code $municipality $region"
+			set row(town_line) "$row(postal_code) $row(municipality) $row(region)"
 		    }
 		}
 	    }