Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	23 Oct 2001 20:13:10 -0000	1.2
@@ -12,12 +12,12 @@
     }
 
     db_foreach all_states {
-	select state_name, usps_abbrev from states order by state_name
+	select state_name, abbrev from us_states order by state_name
     } {
-        if { $default == $usps_abbrev } {
-            append widget_value "<option value=\"$usps_abbrev\" SELECTED>$state_name</option>\n" 
+        if { $default == $abbrev } {
+            append widget_value "<option value=\"$abbrev\" SELECTED>$state_name</option>\n" 
         } else {            
-            append widget_value "<option value=\"$usps_abbrev\">$state_name</option>\n"
+            append widget_value "<option value=\"$abbrev\">$state_name</option>\n"
         }
     }
     append widget_value "</select>\n"
@@ -36,12 +36,12 @@
 	}
     }
     db_foreach all_countries {
-	select country_name, iso from country_codes order by country_name 
+	select default_name, iso from countries order by default_name 
     } {
         if { $default == $iso } {
-            append widget_value "<option value=\"$iso\" SELECTED>$country_name</option>\n" 
+            append widget_value "<option value=\"$iso\" SELECTED>$default_name</option>\n" 
         } else {            
-            append widget_value "<option value=\"$iso\">$country_name</option>\n"
+            append widget_value "<option value=\"$iso\">$default_name</option>\n"
         }
     }
     append widget_value "</select>\n"
Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.xql	24 Apr 2001 06:02:27 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.xql	23 Oct 2001 20:13:10 -0000	1.2
@@ -4,7 +4,7 @@
 <fullquery name="all_states">      
       <querytext>
       
-	select state_name, usps_abbrev from states order by state_name
+	select state_name, abbrev from states order by state_name
     
       </querytext>
 </fullquery>
@@ -13,7 +13,7 @@
 <fullquery name="all_countries">      
       <querytext>
       
-	select country_name, iso from country_codes order by country_name 
+	select default_name, iso from countries order by default_name 
     
       </querytext>
 </fullquery>