Index: openacs-4/packages/ecommerce/www/product-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/product-oracle.xql	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/product-oracle.xql	10 Aug 2008 11:57:28 -0000	1.3
@@ -11,7 +11,7 @@
       select *
       from ec_products p, ec_custom_product_field_values v
       where p.product_id = :product_id
-      and p.product_id = v.product_id(+)
+      and p.product_id = v.product_id(+)  and present_p = 't'
     </querytext>
   </fullquery>
 
Index: openacs-4/packages/ecommerce/www/product.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ecommerce/www/product.tcl	27 Apr 2008 01:38:23 -0000	1.11
+++ openacs-4/packages/ecommerce/www/product.tcl	10 Aug 2008 11:57:28 -0000	1.12
@@ -79,12 +79,13 @@
     select *
     from ec_products p, ec_custom_product_field_values v
     where p.product_id = :product_id
-    and p.product_id = v.product_id(+)"] == 0 } {
+    and p.product_id = v.product_id(+) and present_p = 't'"] == 0 } {
 
-    doc_return  200 text/html "
+    doc_return  404 text/html "
 	[ad_header "Product Not Found"]
-	<p>The product you have requested was not found in the database.</p>
-	<p>Please contact <a href=\"mailto:[ec_system_owner]\">[ec_system_owner]</a> to report the error.</p>"
+	<p>The product you have requested was not found in the system.</p>
+	<p>Please contact <a href=\"mailto:[ec_system_owner]\">[ec_system_owner]</a> if you think this is an error.</p>
+    <p><a href=\"index\">Continue browsing</a>.</p>"
     ns_log Warning "product.tcl,line88: product_id $product_id_temp requested, not found."
     return
 }
Index: openacs-4/packages/ecommerce/www/product.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/product.xql	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/product.xql	10 Aug 2008 11:57:28 -0000	1.4
@@ -52,7 +52,7 @@
       select *
       from ec_products p
       left join ec_custom_product_field_values v on (p.product_id = v.product_id)
-      where p.product_id = :product_id
+      where p.product_id = :product_id and  and p.present_p = 't'
     </querytext>
   </fullquery>