Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/xowiki.info	26 Jan 2006 12:29:45 -0000	1.7
+++ openacs-4/packages/xowiki/xowiki.info	30 Jan 2006 02:04:50 -0000	1.8
@@ -8,27 +8,27 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.19" url="http://openacs.org/repository/download/apm/xowiki-0.19.apm">
+    <version name="0.20" url="http://openacs.org/repository/download/apm/xowiki-0.20.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
-        <summary>A more generic xotcl-based wikis example with object types
+        <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2006-01-26</release-date>
-        <description format="text/html">XoWiki is a wiki implementation for OpenACS in xotcl. Instead of trying to
-implement the full set of wiki markup commands of systems like MediaWiki,
-XoWiki is based on a rich text editor and focuses more on integration
-with oacs (e.g categories, general comments, adp-includes).  XoWiki
-combines aspects of wikis (ease of page-creation) with aspects of a
-content management system (revisions, re-usable items, multiple
-languages). Furthermore, XoWiki allows to define different types of links such
-one could define book-structures (where a navigation structure could be built on the fly) or glossaries with differnt kind of word relationships (like synonyms, etc.). XoWiki supports pages in multiple languages and is localized (currently only for English and German). Currently, richtext and plaintext type entries are supported. Included support for adp-substitution in wiki pages and a file-selector. 0.13  supports page templates and uses the new generic form interface. Use of the oo layer for the content repository, reduced number of database interactions.0.18 supports text/enhanced, nice page names, import/export. Support for search (::xowiki::Page and ::xowiki::PlainPage)
+        <release-date>2006-01-30</release-date>
+        <description format="text/html">XoWiki is a wiki implementation for OpenACS in xotcl. Instead of trying to
+implement the full set of wiki markup commands of systems like MediaWiki,
+XoWiki is based on a rich text editor and focuses more on integration
+with oacs (e.g categories, general comments, adp-includes).  XoWiki
+combines aspects of wikis (ease of page-creation) with aspects of a
+content management system (revisions, re-usable items, multiple
+languages). Furthermore, XoWiki allows to define different types of links such
+one could define book-structures (where a navigation structure could be built on the fly) or glossaries with differnt kind of word relationships (like synonyms, etc.). XoWiki supports pages in multiple languages and is localized (currently only for English and German). Currently, richtext and plaintext type entries are supported. Included support for adp-substitution in wiki pages and a file-selector. 0.13  supports page templates and uses the new generic form interface. Use of the oo layer for the content repository, reduced number of database interactions.0.18 supports text/enhanced, nice page names, import/export. Support for search (::xowiki::Page and ::xowiki::PlainPage); 0.20 support ::xowiki::Object, directory object, rss generation into syndication table, improved admin pages
 </description>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.19"/>
+        <provides url="xowiki" version="0.20"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.1.0"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.32"/>
+        <requires url="xotcl-core" version="0.33"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::sc::unregister_implementations"/>
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.9 -r1.10
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	28 Jan 2006 23:28:22 -0000	1.9
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Jan 2006 02:04:51 -0000	1.10
@@ -160,7 +160,7 @@
 	{validate 
 	  {{title {\[::xowiki::validate_title\]} {correcting locale}}}}
 	{with_categories true}
-	{submit_link view}
+	{submit_link "view"}
       }
 
   WikiForm instproc folderspec {value} {
@@ -222,19 +222,19 @@
   }
   WikiForm instproc update_references {} {
     my instvar data
-    $data render_adp false
-    $data render -update_references
-  }
-
-  WikiForm instproc new_data {} {
-    my handle_enhanced_text_from_form
-    set item_id [next]
     if {![my istype PageInstanceForm]} {
       ### danger: update references does an ad_eval, which breaks the  [template::adp_level] 
       ### ad_form! don't do it here. 
-      my update_references
+      $data render_adp false
+      $data render -update_references
     }
+    my set submit_link pages/[ad_urlencode [$data set title]]?
+  }
 
+  WikiForm instproc new_data {} {
+    my handle_enhanced_text_from_form
+    set item_id [next]
+    my update_references
     return $item_id
   }
 
@@ -263,18 +263,38 @@
 
   Class create ObjectForm -superclass PlainWikiForm \
       -parameter {
- 	{f.title          {title:text(inform)}}
 	{f.text 
 	  {text:text(textarea),nospell,optional 
 	    {label #xowiki.content#} 
 	    {html {cols 80 rows 15}}}}
-	{validate 
-	  {}}
 	{with_categories  false}
       }
 
+  ObjectForm instproc init {} {
+    my instvar data
+    if {[$data exists title]} {
+      # don't call vaidate on the folder object, don't let people change its name
+      set title [$data set title]
+      if {$title eq "::[$data set parent_id]"} {
+	my f.title  {title:text(inform) {label #xowiki.name#}}
+	my validate {{title {1} {correcting locale}}}
+	#my log "--e don't validate folder id - parent_id = [$data set parent_id]"
+      }
+    }
+    next
+  }
+  ObjectForm instproc new_request {} {
+    my instvar data
+    permission::require_permission \
+	-party_id [ad_conn user_id] -object_id [$data set parent_id] \
+	-privilege "admin"
+    next
+  }
+
   ObjectForm instproc edit_request {item_id} {
     my instvar data
+    my log "--e setting f.title"
+    my f.title {{title:text {label #xowiki.name#}}}
     permission::require_permission \
 	-party_id [ad_conn user_id] -object_id [$data set parent_id] \
 	-privilege "admin"
@@ -283,7 +303,7 @@
       
   ObjectForm instproc edit_data {} {
     my instvar data
-    $data package_info [$data set text]
+    $data set_payload [$data set text]
     next
   }
 
@@ -415,15 +435,14 @@
 	my log "--f fetch folder object"
 	set o [::xowiki::Object create ::$folder_id]
 	::xowiki::Object fetch_object -object $o -item_id $item_id
-	$o package_info [$o set text]
       } else {
 	my log "--f save new folder object"
 	set o [::xowiki::Object create ::$folder_id]
-	$o set text "set package_id $package_id\nset index_page {}\n"
+	$o set text "# this is the payload of the folder object\n\nset index_page \"\"\n"
 	$o set parent_id $folder_id
 	$o set title ::$folder_id
 	$o save_new
-	$o package_info [$o set text]
+	$o initialize_loaded_object
       }
       $o proc destroy {} {my log "--f "; next}
       my log "--f exists $o -> [::xotcl::Object isobject $o]"
@@ -487,16 +506,11 @@
   Page instproc div arg {
     if {$arg eq "content"} {
       return "<div id='content' class='column'>"
-    } elseif {$arg eq "sidebar"} {
-      return "<div id='sidebar' class='column'>"
-    } elseif {$arg eq "left-col"} {
-      return "<div id='left-col' class='column'>"
-    } elseif {$arg eq "right-col"} {
-      return "<div id='right-col' class='column'>"
-    } elseif {$arg eq "left-col30"} {
-      return "<div id='left-col30' class='column'>"
-    } elseif {$arg eq "right-col70"} {
-      return "<div id='right-col70' class='column'>"
+    } elseif {[lsearch [list \
+			    left-col  left-col25  left-col30 \
+			    right-col right-col25 right-col30 right-col70] \
+		   $arg] > -1} {
+      return "<div id='$arg' class='column'>"
     } elseif {$arg eq "box"} {
       return "<div class='box'>"
     } elseif {$arg eq ""} {
@@ -698,16 +712,31 @@
     next
   }
 
-  Object instproc package_info {cmd} {
-    set package_info [self]::package_info
-    if {![my isobject $package_info]} {::xotcl::Object create $package_info}
-    if {[catch {$package_info eval $cmd} error ]} {
+  #
+  # Methods of the object Object
+  #
+
+  Object instproc get_content {} {
+    if {[[self]::payload info procs content] ne ""} {
+      return  [my substitute_markup [[self]::payload content]]
+    } else {
+      return "<pre>[my set text]</pre>"
+    }
+  }
+  
+  Object instproc initialize_loaded_object {} {
+    my set_payload [my set text]
+  }
+  Object instproc set_payload {cmd} {
+    set payload [self]::payload
+    if {![my isobject $payload]} {::xotcl::Object create $payload -requireNamespace}
+    if {[catch {$payload eval $cmd} error ]} {
       ns_log error "XoWiki folder object: content lead to error: $error"
     }
   }
-  Object instproc get_package_info {var} {
-    set package_info [self]::package_info
-    if {![my isobject $package_info]} {::xotcl::Object create $package_info}
-    expr {[$package_info exists $var] ? [$package_info set $var] : ""}
+  Object instproc get_payload {var} {
+    set payload [self]::payload
+    if {![my isobject $payload]} {::xotcl::Object create $payload -requireNamespace}
+    expr {[$payload exists $var] ? [$payload set $var] : ""}
   }
 }
\ No newline at end of file
Index: openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	28 Jan 2006 15:58:50 -0000	1.3
+++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	30 Jan 2006 02:04:51 -0000	1.4
@@ -20,18 +20,23 @@
   set content [expr {[$page set object_type] eq "::xowiki::PlainPage" ?
 		     [$page set text] : [lindex [$page set text] 0]}]
   $page set unresolved_references 0
-  $page instvar item_id
+  $page instvar item_id creation_user
   set content [ad_html_text_convert -from [$page set mime_type] -to text/plain -- $content]
-		   
-  #ns_log notice "--datasource content=$content, oid=$revision_id"
+  if {$creation_user ne ""} {
+    acs_user::get -user_id $creation_user -array user
+    set creator "$user(first_names) $user(last_name)"
+  } else {
+    set creator "nobody"
+  }
+  #ns_log notice "--datasource revid=$revision_id, cru=$creation_user, cr=$creator"
   # category photos 
   # link "${full}photo/photo_id=$item_id" 
   return [list object_id $revision_id title  [$page set title] \
 	      content $content keywords {} \
 	      storage_type text mime text/plain \
 	      syndication [list link "[ad_url]/o/$item_id" \
 			       description $content \
-			       author "nobody" \
+			       author $creator \
 			       category "" \
 			       guid "[ad_url]/o/$item_id" \
 			       pubDate [$page set last_modified]] \
Index: openacs-4/packages/xowiki/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/delete.tcl	30 Dec 2005 00:09:58 -0000	1.3
+++ openacs-4/packages/xowiki/www/delete.tcl	30 Jan 2006 02:04:51 -0000	1.4
@@ -8,12 +8,10 @@
   @param object_type the source class providing the data source for filling the form
 } -query {
   item_id:integer
+  {query "."}
 }
 
 permission::require_write_permission -object_id $item_id
-
 ::Generic::CrItem delete -item_id $item_id 
+ad_returnredirect $query
 
-ad_returnredirect "."
-# stop running this code, since we're redirecting
-ad_script_abort
Index: openacs-4/packages/xowiki/www/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/edit.tcl	30 Dec 2005 00:09:58 -0000	1.3
+++ openacs-4/packages/xowiki/www/edit.tcl	30 Jan 2006 02:04:51 -0000	1.4
@@ -53,7 +53,7 @@
 #ns_log notice "-- form f1 has class [::xowiki::f1 info class]"
 
 ::xowiki::f1 generate
-::xowiki::f1 instvar page_title context
+::xowiki::f1 instvar page_title context formTemplate
 
 if {[info exists item_id]} {
   set rev_link [export_vars -base revisions {{page_id $item_id} title}]
Index: openacs-4/packages/xowiki/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/index.tcl	28 Jan 2006 23:28:23 -0000	1.7
+++ openacs-4/packages/xowiki/www/index.tcl	30 Jan 2006 02:04:51 -0000	1.8
@@ -12,12 +12,13 @@
   folder_id:optional
 }
 
-set context [list]
+set context   [list [list admin Administration] index]
 set supertype ::xowiki::Page
+set query     .?[ns_conn query]
 
 if {![info exists folder_id] && ![info exists object_type]} {
   set folder_id [$supertype require_folder -name xowiki]
-  set index_page [$folder_id get_package_info index_page]
+  set index_page [$folder_id get_payload index_page]
   if {$index_page ne ""} {
     set item_id [Generic::CrItem lookup -title $index_page -parent_id $folder_id]
     if {$item_id != 0} {
@@ -86,7 +87,7 @@
 	       -object_type $object_type \
 	       -title.href [export_vars -base pages/[ad_urlencode $title] {}] \
 	       -edit.href [export_vars -base edit {item_id}] \
-	       -delete.href [export_vars -base delete {item_id}]
+	       -delete.href [export_vars -base delete {item_id query}]
   	 }
 
 set t1 [t1 asHTML]
\ No newline at end of file
Index: openacs-4/packages/xowiki/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/view.adp	28 Jan 2006 01:31:26 -0000	1.4
+++ openacs-4/packages/xowiki/www/view.adp	30 Jan 2006 02:04:51 -0000	1.5
@@ -68,8 +68,10 @@
 img.undefined {border: 10; color: yellow; height: 12px}
 #left-col   {float: left;    width: 40%; relative: absolute; top: 0px;}
 #right-col {float: right; width: 59%; relative: absolute; top: 0px;}
-#left-col30   {float: left;    width: 30%; relative: absolute; top: 0px;}
+#left-col30   {float: left;    width: 30%; relative: absolute; top: 0px; margin-right: 10px;}
+#left-col25   {float: left;    width: 25%; relative: absolute; top: 0px; margin-right: 10px;}
 #right-col70 {float: right; width: 69%; relative: absolute; top: 0px;}
+#right-col25 {float: right; width: 25%; relative: absolute; top: 0px;}
 </style>
 
 <div id='wikicmds'>
Index: openacs-4/packages/xowiki/www/admin/delete-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/delete-type.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/admin/delete-type.tcl	30 Dec 2005 00:09:58 -0000	1.3
+++ openacs-4/packages/xowiki/www/admin/delete-type.tcl	30 Jan 2006 02:04:51 -0000	1.4
@@ -7,6 +7,7 @@
   @param object_type the class name of an instance of CrClass
 } -query {
   object_type
+  {query "."}
 }
 
 db_foreach retrieve_instances [$object_type instance_select_query] {
@@ -18,4 +19,4 @@
   $type drop_object_type
 }
 
-ad_returnredirect "."
+ad_returnredirect $query
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/admin/index.tcl	28 Jan 2006 23:28:23 -0000	1.5
+++ openacs-4/packages/xowiki/www/admin/index.tcl	30 Jan 2006 02:04:51 -0000	1.6
@@ -16,6 +16,7 @@
 set folder_id       [$supertype require_folder -name xowiki]
 set object_types    [$supertype object_types]
 
+
 TableWidget t1 -volatile \
     -actions {
       Action new -label export -url export
Index: openacs-4/packages/xowiki/www/pages/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/pages/Attic/index.vuh,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/pages/index.vuh	28 Jan 2006 23:28:23 -0000	1.4
+++ openacs-4/packages/xowiki/www/pages/index.vuh	30 Jan 2006 02:04:51 -0000	1.5
@@ -22,11 +22,13 @@
 set path [ad_conn path_info]
 #ns_log notice "-- path=<$path>"
 if {$path ne ""} {
-  if {![regexp {^..:} $path]} {
-    set path [string range [lang::conn::locale] 0 1]:$path
+  set item_id [::Generic::CrItem lookup -title $path -parent_id $folder_id]
+  if {$item_id == 0} {
+    if {![regexp {^..:} $path]} {
+      set path [string range [lang::conn::locale] 0 1]:$path
+      set item_id [::Generic::CrItem lookup -title $path -parent_id $folder_id]
+    }
   }
-  set item_id [::Generic::CrItem lookup \
-		   -title $path -parent_id $folder_id] 
   #ns_log notice "-- path=<$path> item_id=$item_id"
   if {$item_id != 0} {
     rp_form_put item_id $item_id
Index: openacs-4/packages/xowiki/www/portlets/wiki.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/wiki.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/portlets/wiki.tcl	14 Dec 2005 16:13:37 -0000	1.1
+++ openacs-4/packages/xowiki/www/portlets/wiki.tcl	30 Jan 2006 02:04:51 -0000	1.2
@@ -7,10 +7,12 @@
 
 if {[::xowiki::Page incr recursion_count]<3} {
   set content [$page render]
-  set link [export_vars -base view {item_id}]
+  set link [ad_urlencode $name]
   ns_log notice "RECURSION_COUNT = [::xowiki::Page set recursion_count]"
 } else {
   set content "Recursion Limit exceeded, items are nested to deep!"
 }
 
 ::xowiki::Page incr recursion_count -1
+#strip language prefix for title
+regexp {^..:(.*)$} $name _ name
\ No newline at end of file