Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.80 -r1.81
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 1 Mar 2007 10:25:10 -0000 1.80
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 4 Mar 2007 17:18:47 -0000 1.81
@@ -375,7 +375,7 @@
if {[catch {set page_name [lindex $arg 0]} errMsg]} {
#my log "--S arg='$arg'"
# there is something syntactically wrong
- return "
$Error in '{{$arg}}' in [my set name]
\n\
+ return "
Error in '{{$arg}}' in [my set name] ($errMsg)
\n\
Syntax: <name of portlet> {<argument list>}
\n
Invalid argument list: '$arg'; must be attribute value pairs (attribues with dashes)
"
}
@@ -431,7 +431,7 @@
if {[regexp {^adp (.*)$} $arg _ adp]} {
if {[catch {lindex $adp 0} errMsg]} {
# there is something syntactically wrong
- return "${ch}
Error in '{{$arg}}' in [my set name]
\n\
+ return "${ch}
Error in '{{$arg}}' in [my set name] ($errMsg)
\n\
Syntax: adp <name of adp-file> {<argument list>}
\n
Invalid argument list: '$adp'; must be attribute value pairs (even number of elements)
"
}
@@ -596,10 +596,10 @@
}
set template_code [template::adp_compile -string $content]
set my_parse_level [template::adp_level]
- if {[catch {set template_value [template::adp_eval template_code]} errmsg]} {
+ if {[catch {set template_value [template::adp_eval template_code]} errMsg]} {
set ::template::parse_level $my_parse_level
#my log "--adp after adp_eval '[template::adp_level]' mpl=$my_parse_level"
- return "
Error in Page $name: $errmsg
$content
Possible values are$__template_variables__"
+ return "
Error in Page $name: $errMsg
$content
Possible values are$__template_variables__"
}
return $template_value
}