Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/xowiki.info 19 Jan 2006 23:01:58 -0000 1.5
+++ openacs-4/packages/xowiki/xowiki.info 26 Jan 2006 01:30:46 -0000 1.6
@@ -8,30 +8,32 @@
f
xowiki
-
+
Gustaf Neumann
A more generic xotcl-based wikis example with object types
and subtypes based on the content repository (with category support)
- 2006-01-19
+ 2006-01-26
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.
+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
-
+
-
+
+
+
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 -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 19 Jan 2006 23:01:58 -0000 1.5
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 26 Jan 2006 01:30:46 -0000 1.6
@@ -116,10 +116,13 @@
} else {
ns_log notice "-- no new class for $oldClass"
}
- }
-
+ }
}
}
+ if {$to_version_name eq "0.19"} {
+ ns_log notice "-- upgrading to 0.19"
+ ::xowiki::sc::register_implementations
+ }
}
Class create WikiForm -superclass ::Generic::Form \
@@ -203,9 +206,8 @@
WikiForm instproc handle_enhanced_text_from_form {} {
my instvar data
array set __tmp [ns_set array [ns_getform]]
- if {[info exists __tmp(text.format)] &&
- $__tmp(text.format) eq "text/enhanced"} {
- $data set mime_type "text/enhanced"
+ if {[info exists __tmp(text.format)]} {
+ $data set mime_type $__tmp(text.format)
}
}
WikiForm instproc update_references {} {
Index: openacs-4/packages/xowiki/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/index.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/index.tcl 24 Jan 2006 13:20:58 -0000 1.5
+++ openacs-4/packages/xowiki/www/index.tcl 26 Jan 2006 01:30:46 -0000 1.6
@@ -12,6 +12,9 @@
folder_id:optional
}
+set path [ad_conn path_info]
+ns_log notice "-- path=<$path>"
+
set context [list]
set supertype ::xowiki::Page
Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/admin/import.tcl 19 Jan 2006 23:01:58 -0000 1.1
+++ openacs-4/packages/xowiki/www/admin/import.tcl 26 Jan 2006 01:30:46 -0000 1.2
@@ -33,6 +33,7 @@
set added 0
foreach o [$object_type allinstances] {
$o set parent_id $folder_id
+ $o set package_id [ad_conn package_id]
# page instances have references to page templates, add these first
if {[$o istype ::xowiki::PageInstance]} continue
set item [CrItem lookup -title [$o set title] -parent_id $folder_id]
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 -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/pages/index.vuh 24 Jan 2006 03:54:40 -0000 1.1
+++ openacs-4/packages/xowiki/www/pages/index.vuh 26 Jan 2006 01:30:46 -0000 1.2
@@ -41,13 +41,13 @@
}
set item_id [::Generic::CrItem lookup \
-title $path -parent_id $folder_id]
- ns_log notice "-- path=<$path> item_id=$item_id"
+ #ns_log notice "-- path=<$path> item_id=$item_id"
if {$item_id != 0} {
rp_form_put item_id $item_id
rp_form_put folder_id $folder_id
rp_internal_redirect "/packages/xowiki/www/view"
# ad_returnredirect [export_vars -base ../view {item_id folder_id}]
- # ad_abort_script
+ ad_abort_script
}
}