Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	6 Apr 2007 21:51:32 -0000	1.13
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	7 Apr 2007 12:27:16 -0000	1.14
@@ -174,7 +174,7 @@
     if {![my isobject ::xo::cc]} {
       my create ::xo::cc \
           -package_id $package_id \
-          -parameter_declaration $parameter \
+          [list -parameter_declaration $parameter] \
 	  -user_id $user_id \
 	  -actual_query $actual_query \
           -url $url
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/Attic/test.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/admin/test.tcl	6 Apr 2007 21:55:04 -0000	1.2
+++ openacs-4/packages/xowiki/www/admin/test.tcl	7 Apr 2007 12:27:16 -0000	1.3
@@ -9,6 +9,7 @@
 test proc errmsg msg     {ns_write "ERROR: $msg<BR/>"; test incr failed}
 test proc okmsg msg      {ns_write "OK: $msg<BR/>"; test incr passed}
 test proc code msg       {ns_write "<pre>$msg</pre>"}
+test proc hint msg       {ns_write "$msg<BR/>"}
 test proc reset {} {
   array unset ::xotcl_cleanup
   global af_parts  af_key_name
@@ -57,15 +58,17 @@
 
 test section "Basic Setup"
 
+test hint "Using XOTcl $::xotcl::version$::xotcl::patchlevel"
 ? {expr {$::xotcl::version < 1.4}} 0 "XOTcl Version $::xotcl::version >= 1.4"
+
 set ns_cache_version_old [catch {ns_cache names xowiki_cache xxx}]
 if {$ns_cache_version_old} {
   ? {set x old} new "upgrade ns_cache: cvs -z3 -d:pserver:anonymous@aolserver.cvs.sourceforge.net:/cvsroot/aolserver co nscache"
 } else {
   ? {set x new} new "ns_cache version seems up to date"
 }
 ########################################################################
-test section "New Instance"
+test section "Create New Package Instance of XoWiki"
 #
 # create a fresh instance for testing
 #
@@ -83,6 +86,17 @@
 ? {site_node::exists_p -url /$instance_name} 0 \
     "the test instance does not exist"
 
+set root_id [db_string get_root {select node_id, name from site_nodes where name = ''}]
+if {[db_0or1row check_broken_site_nodes {
+     select node_id, name from site_nodes where name = :instance_name and parent_id = :root_id
+}]} {
+  test hint "... site nodes seem broken, since we have an entry, but site_node::exists_p returns false"
+  test hint "... try to fix anyhow"
+  db_dml fix_broken_entry {
+    delete from site_nodes where name = :instance_name and parent_id = :root_id
+  }
+}
+
 # create a fresh instance
 array set node [site_node::get -url /]
 site_node::instantiate_and_mount \