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.17 -r1.18
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	25 Dec 2006 21:26:21 -0000	1.17
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	31 Dec 2006 16:47:00 -0000	1.18
@@ -22,7 +22,7 @@
     #my log "--L link has class [my info class] // $class"
   }
   Link instproc resolve {} {
-    #my log "--lookup of [my name]"
+    #my log "--lookup of [my name] -page [my page]"
     if {![regexp {(.*?)(\#|%23)+(.*)$} [my name] full_name name anchor_tag anchor]} {
       set name [my name]
     }
@@ -68,7 +68,7 @@
       set package_id [site_node::get_children -node_id $a -package_key xowiki \
                           -filters [list name $name] -element package_id]
       if {$package_id ne ""} {
-        my log "--LINK found package_id=$package_id [my isobject ::$package_id]"
+        #my log "--LINK found package_id=$package_id [my isobject ::$package_id]"
         ::xowiki::Package require $package_id
         return $package_id
       }
@@ -177,7 +177,7 @@
     # look for a package instance of xowiki, named "glossary" (the type)
     set id [my lookup_xowiki_package_by_name [my type] \
                 [site_node::get_node_id_from_object_id -object_id [my package_id]]]
-    my log "--LINK glossary lookup returned package_id $id"
+    #my log "--LINK glossary lookup returned package_id $id"
     if {$id} {
       # set correct package id for rendering the link
       my set package_id $id
@@ -187,7 +187,7 @@
       # lookup the item from the found folder
       return [::Generic::CrItem lookup -name [my name] -parent_id [$id set folder_id]]
     }
-    my log "--LINK no page found [my name], [my lang], type=[my type]."
+    #my log "--LINK no page found [my name], [my lang], type=[my type]."
     return 0
   }
   ::xowiki::Link::glossary instproc render_found {href label} {
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	30 Dec 2006 01:55:17 -0000	1.25
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	31 Dec 2006 16:47:00 -0000	1.26
@@ -126,10 +126,11 @@
     upvar name name nls_language nls_language folder_id folder_id \
         object_type object_type mime_type mime_type
     my instvar data
-    #my log "--F validate_name ot=$object_type data=[my exists data]"
+    my log "--F validate_name ot=$object_type data=[my exists data]"
     $data instvar package_id
     if {$object_type eq "::xowiki::File" && [$data exists mime_type]} {
       #my get_uploaded_file
+      #my log "--mime validate_name ot=$object_type data=[my exists data] MIME [$data set mime_type]"
       switch -glob -- [$data set mime_type] {
         image/* {set type image}
         default {set type file}
@@ -289,7 +290,7 @@
     } else {
       #my log "--F no upload_file provided [lsort [$data info vars]]"
       if {[$data exists mime_type]} {
-        #my log "   mime_type=[$data set mime_type]"
+        #my log "--mime_type=[$data set mime_type]"
         #my log "   text=[$data set text]"
         regexp {^[^:]+:(.*)$} [$data set name] _ upload_file
         $data set upload_file $upload_file
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	29 Dec 2006 11:01:36 -0000	1.8
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	31 Dec 2006 16:47:00 -0000	1.9
@@ -627,13 +627,18 @@
       } else {
         set edit_markup ""
       }
-
-      $p set render_adp 0
+      
+      $p set unresolved_references 0
+      #$p set render_adp 0
+      set content [$p get_content]
+      if {[regexp package_id $content]} {my log "--CONTENT 0 $content"}
+      set content [string map [list "\{\{" "\\\{\{"] $content]
+     if {[regexp package_id $content]} {my log "--CONTENT 1 $content"}
       regexp {^.*:([^:]+)$} $name _ anchor
       append output "<h$level class='book'>" \
           $edit_markup \
           "<a name='$anchor'>$page_order $title</h$level>" \
-          [$p render]
+          $content
     }
     return $output
   }
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.64 -r1.65
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	29 Dec 2006 11:08:19 -0000	1.64
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	31 Dec 2006 16:47:00 -0000	1.65
@@ -597,8 +597,9 @@
       set page [$package_id resolve_page $page_name __m]
       catch {$page set __decoration portlet}
     }
-    my set __last_includelet $page
+
     if {$page ne ""} {
+      my set __last_includelet $page
       $page destroy_on_cleanup
       $page set __including_page [self]
       $page set __caller_parameters [lrange $arg 1 end] 
@@ -614,7 +615,7 @@
       }
       return [$page render]
     } else {
-      return "$page_name unknown<br>\n"
+      return "<div style='color: red; font-weight: bold;'><p>Error: includelet '$page_name' unknown</span></div>\n"
     }
   }