Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.119 -r1.120
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	8 Mar 2002 21:04:24 -0000	1.119
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	11 Mar 2002 23:06:41 -0000	1.120
@@ -123,7 +123,7 @@
         set layout_name_list [list "Simple 2-Column"]
 
         if {![empty_string_p $csv_list]} {
-            set page_name_and_layout_list [split $csv_list ";"]
+            set page_name_and_layout_list [split [string trimright $csv_list ";"] ";"]
             set page_name_list [list]
             set layout_name_list [list]
 
@@ -702,6 +702,8 @@
         @return the id of the page
         @param portal_id 
     } {
+        ns_log notice "aks91 $pretty_name, $layout_name"
+
         # get the layout_id
         if {![empty_string_p $layout_name]} {
             set layout_id [get_layout_id -layout_name $layout_name]
@@ -1135,9 +1137,16 @@
                 errmsg \
              ] \
             } {
-                ns_log error "aks86 *** portal::render_element show callback Error! ***\n\n $errmsg\n\n"        
-                ad_return_complaint 1 "*** portal::render_element show callback Error! *** <P> $errmsg\n\n"
-        }
+        
+        ns_log error "aks86 *** portal::render_element show callback Error! ***\n\n $errmsg\n\n"        
+        # ad_return_complaint 1 "*** portal::render_element show callback Error! *** <P> $errmsg\n\n"
+        
+        set element(content)  " You have found a bug in our code. <P>Please notify the webmaster and include the following text. Thank You.<P> <pre><small>*** portal::render_element show callback Error! ***\n\n $errmsg</small></pre>\n\n" 
+        
+    }
+    
+    # trim the element's content
+    set element(content) [string trim $element(content)]
 
         # We use the actual pretty name from the DB (ben)
         # FIXME: this is not as good as it should be
Index: openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl	19 Jan 2002 21:59:48 -0000	1.1
+++ openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl	11 Mar 2002 23:06:41 -0000	1.2
@@ -10,22 +10,13 @@
     region:onevalue
 }
 
-# get the complete, evaluated element.
-# if there's an error, report it.
-# (note: here we just show the portal element)
-if { [catch {set element_data [portal::evaluate_element_raw $element_id] } errmsg ] } {
-    
-    ns_log Error "aks18 render-element.tcl (after eval): $errmsg"
-    return -code error "in render-element: $errmsg"
-    
-    if { [ad_parameter show_datasource_errors_p] == 1} {
-	set element(content) "<div class=portal_alert>$errmsg</div>"
-    } else {
-	return
-    }
+if { [catch {set element_data [portal::evaluate_element_raw $element_id] }  errmsg ]  } { 
+    # An uncaught error happened when trying to evaluate the element.
+    # If the error is in the element's "show" proc, the error will
+    # be shown in the content of the portlet. This is for errors other
+    # than with the "show" proc. 
+    ns_log error "\n\n *** Error in portal/www/render_sytles/all_in_one/render-element.tcl \n Uncaught exception when calling portal::evaluate_element \n with element_id $element_id\n\n"
 } else {
+    # all is ok
     array set element $element_data
 }
-
-ad_return_template
-
Index: openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl	6 Mar 2002 05:14:08 -0000	1.4
+++ openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl	11 Mar 2002 23:06:41 -0000	1.5
@@ -10,31 +10,24 @@
     region:onevalue
 }
 
-if { [catch {set element_data [portal::evaluate_element $element_id $theme_id] } errmsg ] } {
-    if { [ad_parameter show_datasource_errors_p] == 1} {
-	
-        set element(content) "<div class=portal_alert>$errmsg</div>"
-    } else {
-	return
-    }
+if { [catch {set element_data [portal::evaluate_element $element_id $theme_id] }  errmsg ]  } { 
+    # An uncaught error happened when trying to evaluate the element.
+    # If the error is in the element's "show" proc, the error will
+    # be shown in the content of the portlet. This is for errors other
+    # than with the "show" proc. It hides the entire PE
+    ns_log error "\n\n *** Error in portal/www/render_sytles_/indiviudal/render-element.tcl \n Uncaught exception when calling portal::evaluate_element \n with element_id $element_id\n\n"
+    array set element {content {}}
+
 } else {
+    # all is ok
     array set element $element_data
 }
 
-ns_log notice "aks85 [array get element]"
-
-set bar $element(content)
-# odd workaround needed here or else empty_string_p dies sometimes
-set foo [string trim $bar]
-
 # Added by Ben to bypass rendering if there's nada"
-if {[empty_string_p $foo]} {
+if {[empty_string_p $element(content)]} {
     ns_log Notice "BMA-debug: empty!"
     set empty_p 1
 } else {
     set empty_p 0
 } 
 
-ad_return_template
-
-