Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.99 -r1.100
--- openacs-4/packages/xowiki/xowiki.info	8 Oct 2008 11:03:13 -0000	1.99
+++ openacs-4/packages/xowiki/xowiki.info	9 Oct 2008 11:01:43 -0000	1.100
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.101" url="http://openacs.org/repository/download/apm/xowiki-0.101.apm">
+    <version name="0.102" url="http://openacs.org/repository/download/apm/xowiki-0.102.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>2008-10-08</release-date>
+        <release-date>2008-10-09</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
@@ -54,12 +54,12 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.101"/>
+        <provides url="xowiki" version="0.102"/>
         <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.96"/>
+        <requires url="xotcl-core" version="0.97"/>
 
         <callbacks>
             <callback type="after-install"  proc="::xowiki::after-install"/>
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.141 -r1.142
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Oct 2008 19:49:14 -0000	1.141
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Oct 2008 11:01:44 -0000	1.142
@@ -100,7 +100,7 @@
     download 1
   }
   
-  Package instproc get_lang_and_name {-path -name -default_lang vlang vlocal_name} {
+  Package instproc get_lang_and_name {-path -name {-default_lang ""} vlang vlocal_name} {
     my upvar $vlang lang $vlocal_name local_name 
     if {[info exists path]} {
       # 
@@ -112,7 +112,7 @@
       } elseif {[regexp {^(file|image|swf|download/file|tag)/(.*)$} $path _ lang local_name]} {
       } else {
         set local_name $path
-        if {![info exists default_lang]} {set default_lang [my default_language]}
+        if {$default_lang eq ""} {set default_lang [my default_language]}
         set lang $default_lang
       }
     } elseif {[info exists name]} {
@@ -122,7 +122,7 @@
       if {![regexp {^(..):(.*)$} $name _ lang local_name]} {
         if {![regexp {^(file|image|swf):(.*)$} $name _ lang local_name]} {
           set local_name $name
-          if {![info exists default_lang]} {set default_lang [my default_language]}
+          if {$default_lang eq ""} {set default_lang [my default_language]}
           set lang $default_lang
         }
       }
@@ -164,12 +164,14 @@
     @param name name of the wiki page
   } {
     if {[regexp {^::[0-9]+$} $name]} {
-      # special rule for folder objects. Will be most probably
-      # removed...
+      # Special rule for folder objects. Folder object will be most
+      # probably removed in future releases.
       return $name
     } 
     set folder [my folder_path -parent_id $parent_id]
     if {$folder ne ""} {
+      # Return the stripped name for sub-items, the parent has already
+      # the language prefix
       my get_lang_and_name -name $name lang stripped_name
       return $folder$stripped_name
     }
@@ -545,18 +547,37 @@
     if {$object eq ""} {
       # we have no object, but as well no method callable on the package
       set object [$id get_parameter index_page "index"]
+      #my log "--o object is now '$object'"
     }
     #
     # second, resolve object level methods
     #
     #my log "--o try '$object'"
-    set page [my resolve_request -simple $simple -path $object method]
+    set page [my resolve_request -default_lang [::xo::cc lang] -simple $simple -path $object method]
     #my log "--o page is '$page' simple=$simple"
     if {$simple || $page ne ""} {
       if {$page ne ""} {
       }
       return $page
     }
+    #
+    # Make a second attempt in the default language, if it is diffent
+    # from the connection language. This is not optimal, since it is
+    # just relevant for the cases, where the language was not
+    # explicitely given. It would be nice to have e.g. a list of
+    # language preferences which could be checked, but this would
+    # require a different structure. The underlying methods are used
+    # for two different cases: (a) complete an non-fully specified
+    # entry, and (b) search whether such an entry exists. Not
+    # undoable, but this should wait for the next release.
+    if {[::xo::cc lang] ne [my default_language]} {
+      set page [my resolve_request -default_lang [my default_language] -simple $simple -path $object method]
+      if {$simple || $page ne ""} {
+        if {$page ne ""} {
+        }
+        return $page
+      }
+    }
 
     # stripped object is the object without a language prefix
     set stripped_object $object
@@ -566,7 +587,7 @@
     set standard_page [$id get_parameter ${object}_page]
     #my log "--o standard_page '$standard_page'"
     if {$standard_page ne ""} {
-      set page [my resolve_request -path $standard_page method]
+      set page [my resolve_request -default_lang [::xo::cc lang] -path $standard_page method]
       if {$page ne ""} {
         return $page
       }
@@ -575,7 +596,7 @@
       set standard_page "en:$stripped_object"
       # maybe we are calling from a different language, but the
       # standard page with en: was already instantiated
-      set page [my resolve_request -path $standard_page method]
+      set page [my resolve_request -default_lang [::xo::cc lang] -path $standard_page method]
       if {$page ne ""} {
         return $page
       }
@@ -653,7 +674,7 @@
   }
   Package instforward check_permissions {%my set policy} %proc
 
-  Package instproc resolve_request {{-simple false} -path method_var} {
+  Package instproc resolve_request {{-default_lang ""} {-simple false} -path method_var} {
     my instvar folder_id
     #my log "--u [self args]"
     [self class] instvar queryparm
@@ -672,13 +693,13 @@
         return ""
       }
 
-      my log "--try $path ($folder_id/$parent_id) -> $item_id"
+      #my log "--try $path ($folder_id/$parent_id) -> $item_id"
       if {$item_id == 0} {
         set nname [my normalize_name $path]
         
-        my get_lang_and_name -path $nname lang stripped_name
+        my get_lang_and_name -default_lang $default_lang -path $nname lang stripped_name
         set name ${lang}:$stripped_name
-        my log "--setting name to '$name', stripped_name='$stripped_name'"
+        #my log "--setting name to '$name', stripped_name='$stripped_name'"
 
         if {$lang eq "download/file" || $lang eq "file"} { 
           # handle subitems, currently only for files
@@ -697,7 +718,7 @@
 	  set popular [::xo::cc query_parameter popular 0]
 	  set tag_kind [expr {$popular ? "ptag" :"tag"}]
 	  set weblog_page [my get_parameter weblog_page]
-	  my get_lang_and_name -path $weblog_page lang stripped_name
+	  my get_lang_and_name -default_lang $default_lang -path $weblog_page lang stripped_name
 	  set name $lang:$stripped_name
 	  my set object $weblog_page
 	  ::xo::cc set actual_query $tag_kind=$tag&summary=$summary
@@ -707,14 +728,14 @@
           set parent_id [my get_parent_and_name \
                              -path $name -folder_id $folder_id \
                              parent local_name]
-          my get_lang_and_name -path $local_name lang stripped_name
+          my get_lang_and_name -default_lang $default_lang -path $local_name lang stripped_name
           set item_id [::xo::db::CrClass lookup -name ${lang}:$stripped_name -parent_id $parent_id]
-          my log "--try  ${lang}:$stripped_name ($folder_id/$parent_id) -> $item_id"
+          #my log "--try  ${lang}:$stripped_name ($folder_id/$parent_id) -> $item_id"
         }
 
         if {$item_id == 0} {
           set item_id [::xo::db::CrClass lookup -name $stripped_name -parent_id $parent_id]
-          my log "--try $stripped_name ($folder_id/$parent_id) -> $item_id"
+          #my log "--try $stripped_name ($folder_id/$parent_id) -> $item_id"
         }
        
       }