Index: openacs-4/packages/ams/ams.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/ams.info,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/ams/ams.info	22 Nov 2005 16:56:33 -0000	1.17
+++ openacs-4/packages/ams/ams.info	4 Dec 2005 17:52:11 -0000	1.18
@@ -8,14 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>ams</auto-mount>
 
-    <version name="1.1d10" url="http://openacs.org/repository/download/apm/ams-1.1d10.apm">
+    <version name="1.1d12" url="http://openacs.org/repository/download/apm/ams-1.1d12.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>Store attributes via the Content Repository, and auto generate input forms</summary>
         <release-date>2005-11-21</release-date>
         <description format="text/html">AMS (Attribute Management System) helps in customizing your website. It lets you adjust what information is collected and displayed for any package that is integrated with it. AMS allows you to easily and dynamically add attributes to forms and display pages, using a Tcl API or an admin interface. AMS uses the content repository to store attribute history for any object on the system.</description>
         <maturity>0</maturity>
 
-        <provides url="ams" version="1.1d10"/>
+        <provides url="ams" version="1.1d12"/>
         <requires url="acs-lang" version="5.1.5d1"/>
         <requires url="postal-address" version="0.1d"/>
         <requires url="ref-countries" version="0.1d"/>
@@ -27,9 +27,9 @@
             <callback type="after-upgrade"  proc="ams::install::after_upgrade"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="1DefaultAdressLayoutP"  default="1" description="Especify the default template for input and display layout for the address. Set to 1 for { street, city, state, zip, country } or 0 for { street, zip, city, state, country }" section_name="address-widget"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultAdressLayoutP"  default="1" description="Especify the default template for input and display layout for the address. Set to 1 for { street, city, state, zip, country } or 0 for { street, zip, city, state, country }" section_name="address-widget"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultISOCountryCode"  description="Specify the default ISO Country Code(s) to be used for all address widgets. The first country that will show up is the first entry in this list. The countries specified here will be be at the top of the country list seperated from all other country codes. If left blank it will default to whatever country is alphabetically first in the language used. For a complete list of codes look at the countries table in the database." section_name="address-widget"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultStreetSize"  default="100" description="Maximum number of characters the street address might have" section_name="address-widget"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ForceCountryCodeOneFormatting"  default="0" description="If set to &quot;1&quot; AMS will force phone numbers to follow the country zone code 1 rules (US, Canada, etc.), all phone numbers will need to follow the 'three digit area code'-'three digits - 4 digits'x'Extension' format. All &quot;international&quot; numbers will need to have the format &quot;011-'Country_Code'-'Area_Code'-'Subscriber_number'x'Extension' format. If set to &quot;0&quot; telecom numbers will not be seperated into these elements, and the whole number will be entered in the DB as the subscriber number just as input in the form." section_name="telecom-number-widget"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PhoneURL"  description="If this is set, all phone numbers will be underlined with a URL, so you could click on the phone number and your Windows application starts a Phone Connection to the number you clicked on. Usually this is done using the phone protocol, so a save value is 'phone:$telecom_number'" section_name="telecom-number-widget"/>
         </parameters>
Index: openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	21 Oct 2005 14:06:55 -0000	1.7
+++ openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	4 Dec 2005 17:52:12 -0000	1.8
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="ams" package_version="1.1d5" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="ams" package_version="1.1d10" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Action">Aktion</msg>
   <msg key="Add_an_AMS_Attribute">Ein AMS Attribut hinzuf�gen</msg>
@@ -58,4 +58,5 @@
   <msg key="Update_Ordering">Update Reihenfolge</msg>
   <msg key="Url">Website URL</msg>
   <msg key="Widget_1">Widget</msg>
+  <msg key="Your_delivery_address_is_too_long">Ihre Strasse ist zu lange</msg>
 </message_catalog>
Index: openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	22 Nov 2005 16:57:04 -0000	1.17
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	4 Dec 2005 17:52:12 -0000	1.18
@@ -438,4 +438,5 @@
   <msg key="wk_permit_plural">Work Permits</msg>
   <msg key="you_must_provide_list_id">You must provide either &lt;b&gt;list_id&lt;/b&gt; or &lt;b&gt;list_name&lt;/b&gt;</msg>
   <msg key="you_must_provide_list_name">You must provide either &lt;b&gt;list_name&lt;/b&gt; or &lt;b&gt;list_names&lt;/b&gt;</msg>
+  <msg key="Your_delivery_address_is_too_long">Your delivery address is too long</msg>
 </message_catalog>
Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	13 Sep 2005 09:22:05 -0000	1.11
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	4 Dec 2005 17:52:12 -0000	1.12
@@ -171,6 +171,9 @@
         # to deal with this change
         lappend message "[_ ams.Your_entry_must_not_contain_the_following_characters]: \{ \}."
     }
+    if {[::string length $delivery_address] > [parameter::get_from_package_key -parameter "DefaultStreetSize" -package_key "ams" -default "100"] } {
+	lappend message "[_ ams.Your_delivery_address_is_too_long]"
+    }
 
     # Country Specific Validation
     switch $country_code {
@@ -456,7 +459,7 @@
       append output "
 <table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" class=\"address-widget\">
   <tr>
-    <td colspan=\"3\"><textarea name=\"$element(id).delivery_address\" rows=\"2\" cols=\"50\" wrap=\"virtual\" class=\"address-widget-delivery-address\" >[ad_quotehtml $delivery_address]</textarea></td>
+    <td colspan=\"3\"><textarea name=\"$element(id).delivery_address\" rows=\"2\" cols=\"50\" wrap=\"virtual\" maxlength=\"100\" class=\"address-widget-delivery-address\" >[ad_quotehtml $delivery_address]</textarea></td>
   </tr>
   <tr>
     <td colspan=\"3\"><small>[_ ams.delivery_address]</small><br></td>
@@ -476,9 +479,9 @@
         </tr>"
       } else {
 	  append output "
-            <td><input type=\"text\" name=\"$element(id).postal_code\" value=\"[ad_quotehtml $postal_code]\" size=\"7\" class=\"address-widget-postal_code\" ></td>
-            <td><input type=\"text\" name=\"$element(id).municipality\" value=\"[ad_quotehtml $municipality]\" size=\"20\" class=\"address-widget-municipality\" ></td>
-            <td><input type=\"text\" name=\"$element(id).region\" value=\"[ad_quotehtml $region]\" size=\"10\" class=\"address-widget-region\" ></td>
+            <td><input type=\"text\" name=\"$element(id).postal_code\" value=\"[ad_quotehtml $postal_code]\" size=\"7\" maxlength=\"38\" class=\"address-widget-postal_code\" ></td>
+            <td><input type=\"text\" name=\"$element(id).municipality\" value=\"[ad_quotehtml $municipality]\" size=\"20\" maxlength=\"38\" class=\"address-widget-municipality\" ></td>
+            <td><input type=\"text\" name=\"$element(id).region\" value=\"[ad_quotehtml $region]\" size=\"10\" maxlength=\"38\" class=\"address-widget-region\" ></td>
         </tr>
         <tr>
            <td align=\"left\"><small>[_ ams.postal_code]</small></td>