Index: openacs-4/packages/xowiki/lib/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/lib/view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/lib/view.tcl	9 Aug 2006 00:37:52 -0000	1.3
+++ openacs-4/packages/xowiki/lib/view.tcl	17 Aug 2006 01:44:25 -0000	1.4
@@ -1,28 +1,21 @@
+set parameter [subst {
+  {-m view}
+  {-return_url "[ns_conn url]"}
+  {-template_file "view-links"}
+  {-folder_id 0}
+}]
 
 if {[info exists url]} {
   # new style, the url is sufficient
-  regexp {^(/[^/]+)/?(.*)$} $url _ instance path
-  array set node_info [site_node::get -url $instance]
-  ns_log notice "--package_id = $node_info(package_id) instance=$instance path=$path"
-  set package_id $node_info(package_id)
-  set Package [::xowiki::Package create ::$package_id -folder_id 0 -use_ns_conn false]
-  $Package set_url -url $url
+  ::xowiki::Package initialize -parameter $parameter -url $url
 } else {
   # old style, use item_id
-  set m view
-  set page [::xowiki::Package instantiate_page_from_id -item_id $item_id]
-  $page instvar package_id
-  set Package ::$package_id
+  set page [::xowiki::Package instantiate_page_from_id \
+                -item_id $item_id -parameter $parameter]
+  ::xo::cc export_vars
 }
-::xowiki::Package process_query \
-    -defaults [list m view \
-		   edit_return_url [ns_conn url] \
-		   template_file "view-links" \
-		   folder_id 0 \
-		   package_id $package_id]
 
-set html [$Package invoke -method $m]
-
+set html [::$package_id invoke -method $m]
 set fn [get_server_root]/packages/xowiki/www/resources/xowiki.css
 set F [open $fn]; set css [read $F]; close $F
 set css "<style type='text/css'>$css</style>"