Index: openacs-4/packages/ecommerce/www/product-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/product-search.tcl	21 Feb 2002 21:07:15 -0000	1.3
+++ openacs-4/packages/ecommerce/www/product-search.tcl	26 May 2002 04:36:50 -0000	1.4
@@ -1,4 +1,3 @@
-#  www/ecommerce/product-search.tcl
 ad_page_contract {
     @param search_text
     @param combocategory_id:optional
@@ -9,9 +8,10 @@
 
     @author Eve Andersson (eveander@arsdigita.com)
     @creation-date Summer 1999
-    @cvs-id product-search.tcl,v 3.3.2.4 2000/07/21 03:59:29 ron Exp
     @author ported by Jerry Asher (jerry@theashergroup.com)
     @author Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date April 2002
+
 } {
     search_text
     {combocategory_id ""}
@@ -49,7 +49,7 @@
     db_dml insert_search_text_to_session_info "insert into ec_user_session_info (user_session_id, category_id, search_text) values (:user_session_id, :category_id, :search_text)"
 }
 
-if { ![empty_string_p $subcategory_id] } {
+if { ![empty_string_p $subcategory_id] && $subcategory_id > 0} {
     set category_name "[ec_system_name] > [db_string get_subcategory_name "select category_name || ' > ' || subcategory_name from ec_categories c, ec_subcategories s where s.subcategory_id=:subcategory_id and c.category_id=s.category_id"] search results for '$search_text'"
 } else {
     if { ![empty_string_p $category_id] } {
@@ -59,7 +59,7 @@
     }
 }
 
-if { ![empty_string_p $subcategory_id] } {
+if { ![empty_string_p $subcategory_id] && $subcategory_id > 0} {
     set query_string [db_map search_subcategory] 
     # select p.product_name, p.product_id, p.dirname, p.one_line_description,pseudo_contains(p.product_name || p.one_line_description || p.detailed_description || p.search_keywords, :search_text) as score
     # from ec_products_searchable p, ec_subcategory_product_map c
@@ -110,4 +110,4 @@
     set search_results " $search_count item[ec_decode $search_count "1" "" "s"] found.<p>$search_string"
 }
 db_release_unused_handles
-ec_return_template
+ad_return_template