Index: openacs-4/packages/ams/ams.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/ams.info,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/ams/ams.info	4 Dec 2005 17:52:11 -0000	1.18
+++ openacs-4/packages/ams/ams.info	30 Jan 2006 22:44:58 -0000	1.19
@@ -29,6 +29,7 @@
         <parameters>
             <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="DefaultStreetLines"  default="3" description="Maximum number of lines of text the street address may have" 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"/>
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.9 -r1.10
--- openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	4 Jan 2006 09:48:24 -0000	1.9
+++ openacs-4/packages/ams/catalog/ams.de_DE.ISO-8859-1.xml	30 Jan 2006 22:44:59 -0000	1.10
@@ -59,4 +59,5 @@
   <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>
+  <msg key="Your_delivery_address_is_too_many_lines">Ihre Strasse hat zu viele Linien</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.19 -r1.20
--- openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	4 Jan 2006 09:48:24 -0000	1.19
+++ openacs-4/packages/ams/catalog/ams.en_US.ISO-8859-1.xml	30 Jan 2006 22:44:59 -0000	1.20
@@ -440,4 +440,5 @@
   <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>
+  <msg key="Your_delivery_address_is_too_many_lines">Your delivery address contains too many lines</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.12 -r1.13
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	4 Dec 2005 17:52:12 -0000	1.12
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	30 Jan 2006 22:44:59 -0000	1.13
@@ -174,7 +174,11 @@
     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]"
     }
+    if { [::llength [::split $delivery_address "\n"]] > [parameter::get_from_package_key -parameter "DefaultStreetLines" -package_key "ams" -default "3"] } {
+	lappend message "[_ ams.Your_delivery_address_is_too_many_lines]"
+    }
 
+
     # Country Specific Validation
     switch $country_code {
         CA {
@@ -219,7 +223,7 @@
         }
     }
     set message [join $message " "]
-    ns_log notice "MESSAGE: $message"
+    # ns_log notice "MESSAGE: $message"
     if { [exists_and_not_null message] } {
         return 0
     } else {