Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.121 -r1.122
--- openacs-4/packages/xowiki/xowiki.info	5 Nov 2009 12:34:16 -0000	1.121
+++ openacs-4/packages/xowiki/xowiki.info	6 Nov 2009 12:26:18 -0000	1.122
@@ -10,11 +10,11 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.120" url="http://openacs.org/repository/download/apm/xowiki-0.120.apm">
+    <version name="0.121" url="http://openacs.org/repository/download/apm/xowiki-0.121.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2009-11-05</release-date>
+        <release-date>2009-11-06</release-date>
         <vendor>Gustaf Neumann, WU Wien</vendor>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
@@ -56,18 +56,18 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.120"/>
+        <provides url="xowiki" version="0.121"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.108"/>
+        <requires url="xotcl-core" version="0.109"/>
 
         <callbacks>
-            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
             <callback type="after-install"  proc="::xowiki::after-install"/>
-            <callback type="before-uninstantiate"  proc="::xowiki::before-uninstantiate"/>
+            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
+            <callback type="before-uninstantiate"  proc="::xowiki::before-uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PackagePath"  description="Space delimited names of local URL paths pointing to xowiki instances from where this instance should inherit pages (example: /xowiki /public/wiki)"/>
@@ -86,7 +86,6 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="subst_blank_in_name"  default="1" description="normalize names of pages in a media wiki style. Most dominantly, spaces are turned into blanks." section_name="URL"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="template_file"  default="view-default" description="Name of the ADP file to be used for viewing xowiki pages. The default value is 'view-default'. Alternatively, one can use 'view-book' to view pages in book style (needs page_ordering) or e.g. 'oacs-view' for providing a view with the category-tree on the left, or any other tailored view"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="top_includelet"  default="presence -interval &quot;10 minutes&quot;" description="Specify an xowiki includelet (defined in ::xowiki::includelet::*) to be included on top over every pages. In order or add e.g. on each page of this wiki instance a listing of the users currently active in this xowiki instance, set the value of this parameter e.g. to 'presence -interval &quot;10 minutes&quot;'. The valid parameters are defined by the xowiki includlets."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="top_portlet"  default="presence -interval &quot;10 minutes&quot;" description="Specify an xowiki portlet (defined in ::xowiki::portlet::*) to be included on top over every pages. In order or add e.g. on each page of this wiki instance a listing of the users currently active in this xowiki instance, set the value of this parameter e.g. to 'presence -interval &quot;10 minutes&quot;'. The valid parameters are defined by the xowiki portlets."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="use_connection_locale"  default="0" description="When this flag is set, per-user specific information is used to determine the default language. Users with different language preferences will see under the same url different content. Per default this flag is turned off, and the package or system wide locale is used." section_name="URL"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="weblog_page"  default="en:weblog" description="name of the page to show weblog (when clicking on tags)" section_name="Pages"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="with_delicious"  default="0" description="Add a delicious button to the page" section_name="Options"/>
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.69 -r1.70
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	5 Nov 2009 12:34:16 -0000	1.69
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	6 Nov 2009 12:26:18 -0000	1.70
@@ -63,7 +63,7 @@
     if {![my exists label]}      {my label $name}
     if {![my exists parent_id]}  {my parent_id [$page parent_id]}
     if {![my exists package_id]} {my package_id [$page package_id]}
-    #my msg "--L link has class [my info class] // $class"
+    #my msg "--L link has class [my info class] // $class // [my type] // [my parent_id]"
   }
   Link instproc link_name {-lang -stripped_name} {
     return $lang:$stripped_name
@@ -104,16 +104,7 @@
         set object_type ::xowiki::Page
       }
     }
-    set parent_id [$package_id get_parent_and_name -path [my stripped_name] \
-                       -lang [my lang] -folder_id [$package_id folder_id] \
-                       parent local_name]
-    if {$parent eq ""} {
-      set parent_id ""
-      set name [my name]
-    } else {
-      set name [my lang]:$local_name
-    }
-    return [$page new_link -name $name -title [my label] -parent_id $parent_id \
+    return [$page new_link -name [my name] -title [my label] -parent_id [my parent_id] \
                 -nls_language [$page nls_language] $package_id]
   }
 
@@ -160,28 +151,17 @@
   }
   ::xowiki::Link::folder instproc pretty_link {item_id} {
     my instvar package_id
-    set folder [::xo::db::CrFolder get_instance_from_db -item_id $item_id]
     return [::$package_id pretty_link \
-                -anchor [my anchor] -parent_id [$folder parent_id] -query [my query] [$folder name] ]
+                -anchor [my anchor] -parent_id [my parent_id] -query [my query] [my name] ]
   }
   ::xowiki::Link::folder instproc new_link {} {
     my instvar package_id
-    set page [my page]
-    set parent_id [$package_id get_parent_and_name \
-                       -path [my name] -folder_id [$page parent_id] -lang [my lang] \
-                       parent local_name]
-    if {$parent eq ""} {
-      set parent_id [my parent_id]
-      set name [my name]
-    } else {
-      set name $local_name
-    }
     return [$package_id make_link -with_entities 0 \
                 $package_id \
                 edit-new \
                 [list object_type ::xo::db::CrFolder] \
-                [list name $local_name] \
-                [list parent_id $parent_id] \
+                [list name [my name]] \
+                [list parent_id [my parent_id]] \
                 [list return_url [::xo::cc url]] \
                 autoname]
   }
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.184 -r1.185
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	5 Nov 2009 12:34:16 -0000	1.184
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	6 Nov 2009 12:26:18 -0000	1.185
@@ -956,16 +956,11 @@
 
   Package instproc require_folder_object { } {
     my instvar id folder_id
-    #my msg "--f [my isobject ::$folder_id] folder_id=$folder_id"
+    # TODO: we should make a parameter allowed_page_types (see content_types), 
+    # but the package admin should not have necessarily the rights to change it
+    set folder_id [my require_root_folder -name "xowiki: $id" \
+                       -content_types ::xowiki::Page* ]
 
-    if {$folder_id == 0} {
-      # TODO: we should make a parameter allowed_page_types (see content_types), 
-      # but the package admin should not have necessarily the rights to change it
-      set folder_id [::xowiki::Page require_folder \
-			 -name xowiki -package_id $id \
-			 -content_types ::xowiki::Page* ]
-    }
-
     if {![::xotcl::Object isobject ::$folder_id]} {
       # if we can't get the folder from the cache, create it
       if {[catch {eval [nsv_get xotcl_object_cache ::$folder_id]}]} {
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.368 -r1.369
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	5 Nov 2009 12:34:16 -0000	1.368
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	6 Nov 2009 12:26:18 -0000	1.369
@@ -1440,8 +1440,8 @@
     # set name file:$stripped_name
     #  } 
 
-
     array set "" [my get_anchor_and_query $link]
+    if {$label eq $arg} {set label $(link)}
 
     if {[regexp {^:(..):(.+)$} $(link) _ lang stripped_name]} {
       # language link (it starts with a ':')
@@ -1450,9 +1450,8 @@
     } else {
       array set "" [my item_ref -default_lang [my lang] -parent_id [my parent_id] $(link)]
     }
-
+    #my msg [array get ""]
     set item_name [string trimleft $(prefix):$(stripped_name) :]
-    if {$label eq $arg} {set label $item_name}
 
     Link create [self]::link \
         -page [self] \
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.239 -r1.240
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	5 Nov 2009 12:34:16 -0000	1.239
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	6 Nov 2009 12:26:19 -0000	1.240
@@ -275,7 +275,7 @@
   Page instproc new_link {-name -title -nls_language -parent_id page_package_id} {
     if {[info exists parent_id] && $parent_id eq ""} {unset parent_id}
     return [$page_package_id make_link -with_entities 0 $page_package_id \
-		edit-new object_type name title nls_language return_url autoname]
+		edit-new object_type name title nls_language return_url parent_id autoname]
   }
 
   Page instproc edit_set_default_values {} {
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.21 -r1.22
--- openacs-4/packages/xowiki/www/admin/test.tcl	5 Nov 2009 13:09:57 -0000	1.21
+++ openacs-4/packages/xowiki/www/admin/test.tcl	6 Nov 2009 12:26:19 -0000	1.22
@@ -1030,27 +1030,27 @@
   set l "parentpage"
   set test [label "link" "existing simple page" $l]
   set link [p create_link $l]
-  ? {$link render} "<a   href='/$instance_name/de/parentpage'>de:parentpage</a>" "\n$test\n "
+  ? {$link render} "<a   href='/$instance_name/de/parentpage'>parentpage</a>" "\n$test\n "
 
   set l "parentpage1"
   set test [label "link" "not existing simple page" $l]
   set link [p create_link $l]
-? {$link render} [subst -nocommands {<a  href='/$instance_name/?nls%5flanguage=de%5fDE&edit%2dnew=1&name=de%3aparentpage1&title=de%3aparentpage1'> [ </a>de:parentpage1 <a  href='/$instance_name/?nls%5flanguage=de%5fDE&edit%2dnew=1&name=de%3aparentpage1&title=de%3aparentpage1'> ] </a>}] "\n$test\n "
+? {$link render} [subst -nocommands {<a  href='/$instance_name/?nls_language=de_DE&edit-new=1&name=de%3aparentpage1&parent_id=$folder_id&title=parentpage1'> [ </a>parentpage1 <a  href='/$instance_name/?nls_language=de_DE&edit-new=1&name=de%3aparentpage1&parent_id=$folder_id&title=parentpage1'> ] </a>}] "\n$test\n "
 
   set l "parentpage#a"
   set test [label "link" "existing simple with anchor" $l]
   set link [p create_link $l]
-? {$link render} [subst -nocommands {<a   href='/$instance_name/de/parentpage#a'>de:parentpage</a>}] "\n$test\n "
+? {$link render} [subst -nocommands {<a   href='/$instance_name/de/parentpage#a'>parentpage</a>}] "\n$test\n "
 
   set l "image:image.png"
   set test [label "link" "existing image" $l]
   set link [p create_link $l]
-? {$link render} [subst -nocommands {<img class='image' src='/$instance_name/download/file/image.png' alt='file:image.png' title='file:image.png' >}] "\n$test\n "
+? {$link render} [subst -nocommands {<img class='image' src='/$instance_name/download/file/image.png' alt='image:image.png' title='image:image.png' >}] "\n$test\n "
 
   set l "image.png"
   set test [label "link" "existing image short" $l]
   set link [p create_link $l]
-? {$link render} [subst -nocommands {<img class='image' src='/$instance_name/download/file/image.png' alt='file:image.png' title='file:image.png' >}] "\n$test\n "
+? {$link render} [subst -nocommands {<img class='image' src='/$instance_name/download/file/image.png' alt='image.png' title='image.png' >}] "\n$test\n "
 
   set l ":de:parentpage"
   set test [label "link" "existing language link" $l]