Index: openacs-4/packages/ecommerce/ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v
diff -u -r1.37.2.4 -r1.37.2.5
--- openacs-4/packages/ecommerce/ecommerce.info	19 Feb 2005 09:23:43 -0000	1.37.2.4
+++ openacs-4/packages/ecommerce/ecommerce.info	20 Feb 2005 09:33:29 -0000	1.37.2.5
@@ -7,17 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.03" url="http://openacs.org/repository/download/apm/ecommerce-5.03.apm">
+    <version name="5.05" url="http://openacs.org/repository/download/apm/ecommerce-5.05.apm">
         <owner url="mailto:janine@furfly.net">Janine Sisk</owner>
         <owner url="mailto:bart.teeuwisse@7-sisters.com">Bart Teeuwisse</owner>
         <owner url="mailto:alfred@thunderstick.com">Alfred Werner</owner>
         <summary>The ACS 3.x based e-commerce solution ported to OpenACS.</summary>
-        <release-date>2004-03-10</release-date>
+        <release-date>2005-02-10</release-date>
         <vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
         <description format="text/plain">This module implements all that IT needs for a standard business-to-consumer Web service. You can find a feature summary in the documentaion.</description>
 
-        <provides url="ecommerce" version="5.03"/>
-        <requires url="acs-kernel" version="4.1"/>
+        <provides url="ecommerce" version="5.05"/>
+        <requires url="acs-kernel" version="5.0"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="ref-countries" version="0.1d"/>
         <requires url="ref-language" version="0.1d"/>
@@ -69,6 +69,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SystemOwner"  description="email address of owner of shop" section_name="technical"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailHeight"  default="100" description="for thumbnails of products, specify either width or height (whichever is more important, and then the other will be determined based on the original image size, keeping aspect ratio constant) -- if both are specified, the width setting will take precedence, and if neither is specified, the thumbnail will be width default=100" section_name="display"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailWidth"  default="100" description="for thumbnails of products, specify either width or height (whichever is more important, and then the other will be determined based on the original image size, keeping aspect ratio constant) -- if both are specified, the width setting will take precedence, and if neither is specified, the thumbnail will be width default=100" section_name="display"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThumbnailSizeOuterlimits"  default="0" description="0 defaults to 'exclusive or' thumbnail sizing as described by ThumbnailHeight and ThumbnailWidth parameters. Set this to 1 to use both dimensions as outer size limits --handy when product image aspect ratios reach toward the extreme limits." section_name="display"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UserClassAllowSelfPlacement"  default="1" description="whether a user can request to be a member of a user class" section_name="display"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UserClassApproveP"  default="1" description="if a user requests to be in a user class, is approval required before that user becomes a member of the user class" section_name="display"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UserClassUserViewP"  default="1" description="whether users can see what user classes they are in" section_name="display"/>
Index: openacs-4/packages/ecommerce/www/admin/products/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/ecommerce/www/admin/products/add-2.tcl	9 Mar 2004 00:59:51 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/products/add-2.tcl	20 Feb 2005 09:33:29 -0000	1.5.2.1
@@ -182,16 +182,22 @@
     # thumbnails are all jpg files
     
     # set thumbnail dimensions
-    if [catch {set thumbnail_width [ad_parameter -package_id [ec_id] ThumbnailWidth ecommerce]} ] {
-	if [catch {set thumbnail_height [ad_parameter -package_id [ec_id] ThumbnailHeight ecommerce]} ] {
-	    set convert_dimensions "100x10000"
-	} else {
-	    set convert_dimensions "10000x$thumbnail_height"
-	}
+    set use_both_param_dimensions [parameter::get -parameter ThumbnailSizeOuterlimits]
+    set thumbnail_width_is_blank [catch {set thumbnail_width [parameter::get -parameter ThumbnailWidth]} ]
+    set thumbnail_height_is_blank [catch {set thumbnail_height [parameter::get -parameter ThumbnailHeight]} ]
+    if { $use_both_param_dimensions } {
+        set convert_dimensions "${thumbnail_width}x${thumbnail_height}>"
     } else {
-	set convert_dimensions "${thumbnail_width}x10000"
+        if  { $thumbnail_width_is_blank } {
+	    if  { $thumbnail_height_is_blank } {
+	        set convert_dimensions "100x10000"
+	    } else {
+	        set convert_dimensions "10000x${thumbnail_height}"
+	    }
+        } else {
+	    set convert_dimensions "${thumbnail_width}x10000"
+        }
     }
-
     set perm_thumbnail_filename "$full_dirname/product-thumbnail.jpg"
 
     set convert [ec_convert_path]
Index: openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl	31 Oct 2004 10:12:59 -0000	1.6.2.1
+++ openacs-4/packages/ecommerce/www/admin/products/edit-2.tcl	20 Feb 2005 09:33:29 -0000	1.6.2.2
@@ -170,14 +170,21 @@
     # thumbnails are all jpg files
     
     # set thumbnail dimensions
-    if [catch {set thumbnail_width [ad_parameter -package_id [ec_id] ThumbnailWidth ecommerce]} ] {
-	if [catch {set thumbnail_height [ad_parameter -package_id [ec_id] ThumbnailHeight ecommerce]} ] {
-	    set convert_dimensions "100x10000"
-	} else {
-	    set convert_dimensions "10000x$thumbnail_height"
-	}
+    set use_both_param_dimensions [parameter::get -parameter ThumbnailSizeOuterlimits]
+    set thumbnail_width_is_blank [catch {set thumbnail_width [parameter::get -parameter ThumbnailWidth]} ]
+    set thumbnail_height_is_blank [catch {set thumbnail_height [parameter::get -parameter ThumbnailHeight]} ]
+    if { $use_both_param_dimensions } {
+        set convert_dimensions "${thumbnail_width}x${thumbnail_height}>"
     } else {
-	set convert_dimensions "${thumbnail_width}x10000"
+        if  { $thumbnail_width_is_blank } {
+	    if  { $thumbnail_height_is_blank } {
+	        set convert_dimensions "100x10000"
+	    } else {
+	        set convert_dimensions "10000x${thumbnail_height}"
+	    }
+        } else {
+	    set convert_dimensions "${thumbnail_width}x10000"
+        }
     }
 
     set perm_thumbnail_filename "$full_dirname/product-thumbnail.jpg"