Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/xowiki.info	30 Dec 2005 00:09:53 -0000	1.3
+++ openacs-4/packages/xowiki/xowiki.info	31 Dec 2005 16:37:29 -0000	1.4
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.16" url="http://openacs.org/repository/download/apm/xowiki-0.16.apm">
+    <version name="0.17" url="http://openacs.org/repository/download/apm/xowiki-0.17.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>2005-12-29</release-date>
+        <release-date>2005-12-31</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
@@ -23,7 +23,7 @@
 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.</description>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.16"/>
+        <provides url="xowiki" version="0.17"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.1.0"/>
         <requires url="general-comments" version="4.6.1"/>
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.3 -r1.4
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Dec 2005 00:09:57 -0000	1.3
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	31 Dec 2005 16:37:31 -0000	1.4
@@ -11,12 +11,6 @@
       -form ::xowiki::PlainWikiForm
 
 
-  # attribute support works only in 5.2.0 or newer. Since PageTemplate
-  # does not make much sense without PageInstance, we disable it as well.
-  
-  apm_version_get -package_key acs-kernel -array vi
-  if {[apm_version_names_compare $vi(version_name) 5.2.0] > -1} {
- 
     ::Generic::CrClass create PageTemplate -superclass Page \
 	-pretty_name "XoWiki Page Template" -pretty_plural "XoWiki Page Templates" \
 	-table_name "xowiki_page_template" -id_column "page_template_id" \
@@ -33,11 +27,6 @@
 	} \
 	-form ::xowiki::PageInstanceForm \
 	-edit_form ::xowiki::PageInstanceEditForm
-  } else {
-    # create dummy classes
-    Class create PageTemplate
-    Class create PageInstance
-  }
 
 }
 
@@ -467,7 +456,7 @@
   Page instproc substitute_markup {source} {
     set baseclass [expr {[[my info class] exists RE] ? [my info class] : [self class]}]
     $baseclass instvar RE
-    my log "-- baseclass for RE = $baseclass"
+    #my log "-- baseclass for RE = $baseclass"
 
     set content ""
     foreach l [split [lindex $source 0] \n] {
@@ -569,7 +558,7 @@
 
   PageInstance instproc get_content {} {
     my instvar page_template
-    my log  "-- fetching page_template = $page_template"
+    #my log  "-- fetching page_template = $page_template"
     ::Generic::CrItem instantiate -item_id $page_template
     $page_template volatile
     return [my substitute_markup [$page_template set text]]