Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.52 -r1.53 --- openacs-4/packages/xowiki/xowiki.info 25 Jun 2007 12:18:56 -0000 1.52 +++ openacs-4/packages/xowiki/xowiki.info 26 Jun 2007 11:57:02 -0000 1.53 @@ -8,11 +8,11 @@ f xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) - 2007-06-25 + 2007-06-26 <pre> XoWiki is a wiki implementation for OpenACS in XOTcl. Instead of trying to implement the full set of wiki markup commands of systems @@ -120,11 +120,13 @@ constraints, unnamed instances, some podcast improvements improved localization, new includelet "unread-items", export renaming for unnamed entries + +0.54: FormField classes, more internationalization, recursive inclusion bug fixed </pre> BSD-Style 0 - + Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v diff -u -r1.15 -r1.16 --- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 25 Jun 2007 12:18:56 -0000 1.15 +++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 26 Jun 2007 11:57:02 -0000 1.16 @@ -1,5 +1,5 @@ - + Verwalten Zur�ck Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v diff -u -r1.20 -r1.21 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 25 Jun 2007 12:18:56 -0000 1.20 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 26 Jun 2007 11:57:02 -0000 1.21 @@ -1,12 +1,24 @@ - + Admin Back Create this page in a different language Delete Edit edit tags + Syntax: adp &lt;name of adp-file&gt; {&lt;argument list&gt;}<br/> + +Invalid argument list: '%adp%'; must be of form: attribute value pairs (even number of elements) + <pre>%errMsg%</pre> + +Argument list must contain attribute value pairs (attributes with dashes) + evaluation of adp file returned error message: %errorMsg% + Error in includelet '%page_name%': +<pre>%::errorInfo%</pre> + Nesting of includelets is to deep + Error: includelet '%page_name%' unknown + Error in includelet '{{%arg%}}' of page %name%: Can be obtained from the name of the uploaded file Form Form Constraints Index: openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml,v diff -u -r1.2 -r1.3 --- openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml 25 Jun 2007 12:18:56 -0000 1.2 +++ openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml 26 Jun 2007 11:57:02 -0000 1.3 @@ -1,5 +1,5 @@ - + Administrar Volver 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 -r1.121 -r1.122 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 26 Jun 2007 10:51:27 -0000 1.121 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 26 Jun 2007 11:57:02 -0000 1.122 @@ -454,6 +454,15 @@ "\[$cmd\]"] } + Page instproc error_during_render {msg} { + return "
$msg
" + } + + Page instproc error_in_includelet {arg msg} { + my instvar name + return [my error_during_render "[_ xowiki.error_in_includelet]
\n$msg"] + } + Page instproc include_portlet {arg} { # we want to use package_id as proc-local variable, since the # cross package reference might alter it locally @@ -463,9 +472,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] ($errMsg)
\n\ - Syntax: <name of portlet> {<argument list>}
\n - Invalid argument list: '$arg'; must be attribute value pairs (attribues with dashes)
" + return [my error_in_includelet $arg [_ xowiki.error-includelet-dash_syntax_invalid]] } # the include is either a portlet class, or a wiki page @@ -509,51 +516,46 @@ } if {[catch {set html [$page render]} errorMsg]} { - set html "

Error in includelet '$page_name' $errorMsg\ - 

$::errorInfo
\n" + set html [my error_during_render [_ xowiki.error-includelet-error_during_render]] } #my log "--include portlet returns $html" return $html } else { - return "

Error: includelet '$page_name' unknown

\n" + return [my error_during_render [_ xowiki.error-includelet-unknown]] } } Page instproc include {ch arg ch2} { # make recursion depth a global variable to ease the deletion etc. - if {[catch {incr ::xowiki_recursion_depth}]} { - set ::xowiki_recursion_depth 1 + if {[catch {incr ::xowiki_inclusion_depth}]} { + set ::xowiki_inclusion_depth 1 } - if {$::xowiki_recursion_depth > 10} { - return "${ch}
Error in includelet '{{$arg}}' in page [my set name]:
\n\ - Nesting of pages is to deep
" + if {$::xowiki_inclusion_depth > 10} { + return ${ch}[my error_in_includelet $arg [_ xowiki.error-includelet-nesting_to_deep]] } if {[regexp {^adp (.*)$} $arg _ adp]} { if {[catch {lindex $adp 0} errMsg]} { # there is something syntactically wrong - incr ::xowiki_recursion_depth -1 - 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)
" + incr ::xowiki_inclusion_depth -1 + return ${ch}[my error_in_includelet $arg [_ xowiki.error-includelet-adp_syntax_invalid]] } set adp [string map {  " "} $adp] set adp_fn [lindex $adp 0] if {![string match "/*" $adp_fn]} {set adp_fn /packages/xowiki/www/$adp_fn} set adp_args [lindex $adp 1] if {[llength $adp_args] % 2 == 1} { - incr ::xowiki_recursion_depth -1 - return "${ch}
Error in '{{$arg}}'
\n\ - Syntax: adp <name of adp-file> {<argument list>}
\n - Invalid argument list: '$adp_args'; must be attribute value pairs (even number of elements)
" + incr ::xowiki_inclusion_depth -1 + set adp $adp_args + return ${ch}[my error_in_includelet $arg [_ xowiki.error-includelet-adp_syntax_invalid]] } lappend adp_args __including_page [self] set including_page_level [template::adp_level] if {[catch {set page [template::adp_include $adp_fn $adp_args]} errorMsg]} { # in case of error, reset the adp_level to the previous value set ::template::parse_level $including_page_level - incr ::xowiki_recursion_depth -1 - return "${ch}
Error during evaluation of '{{$arg}}' in [my set name]
\n\ - adp_include returned error message: $errorMsg
\n" + incr ::xowiki_inclusion_depth -1 + return ${ch}[my error_in_includelet $arg \ + [_ xowiki.error-includelet-error_during_adp_evaluation]] } return $ch$page$ch2 @@ -564,7 +566,7 @@ regsub -all {([^\\])"} $arg "\\1\"" arg set html [my include_portlet $arg] #my log "--include portlet returns $html" - incr ::xowiki_recursion_depth -1 + incr ::xowiki_inclusion_depth -1 return $ch$html$ch2 } }