Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	3 Jun 2008 11:46:53 -0000	1.39
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	20 Jun 2008 09:50:27 -0000	1.40
@@ -519,9 +519,10 @@
 
     #my msg "nr trees = [llength $trees], tree:name = '$tree_name'"
     if {[llength $trees] == 0} {
-      error "No category tree found\n\
+      my log "No category tree found\n\
 	(mapped trees = [llength $mapped_trees],\n\
 	tree_name = '$tree_name')"
+      return ""
     }
 
     foreach tree $trees {
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	19 May 2008 17:42:17 -0000	1.35
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	20 Jun 2008 09:50:27 -0000	1.36
@@ -104,14 +104,26 @@
     set base_table xowiki_pagei
     set attributes [list bt.revision_id bt.publish_date bt.title bt.creator bt.creation_user \
                         bt.description s.body pi.instance_attributes]
+    
+    set class_clause \
+        " and ci.content_type not in ('::xowiki::PageTemplate','::xowiki::Object')"
+
     if {$entries_of ne ""} {
-      my instvar form_items
-      set form_items [::xowiki::Weblog instantiate_forms \
-                          -entries_of $entries_of \
-                          -package_id $package_id]
-      append extra_where_clause " and bt.page_template in ('[join $form_items ',']') and bt.page_instance_id = bt.revision_id "
-      set base_type ::xowiki::FormPage
-      set base_table xowiki_form_pagei
+      if {[string match "::*" $entries_of]} {
+        # xotcl classes were provided as a filter
+        set class_clause \
+            " and ci.content_type in ('[join [split $entries_of { }] ',']')"
+      } else {
+        # we use a form as a filter
+        my instvar form_items
+        set form_items [::xowiki::Weblog instantiate_forms \
+                            -entries_of $entries_of \
+                            -package_id $package_id]
+        append extra_where_clause " and bt.page_template in ('[join $form_items ',']') and bt.page_instance_id = bt.revision_id "
+        set base_type ::xowiki::FormPage
+        set base_table xowiki_form_pagei
+        set class_clause ""
+      }
     }
 
     if {$locale ne ""} {
@@ -144,7 +156,7 @@
              -where_clause "ci.item_id not in ([my exclude_item_ids]) \
                 and ci.name != '::$folder_id' and ci.name not like '%weblog%' $date_clause \
 		[::xowiki::Page container_already_rendered ci.item_id] \
-                and ci.content_type not in ('::xowiki::PageTemplate','::xowiki::Object') \
+                $class_clause \
                 and ci.publish_status <> 'production' \
                 $extra_where_clause" ]
 
Index: openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/weblog-portlet.page,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	25 Apr 2008 10:03:08 -0000	1.14
+++ openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	20 Jun 2008 09:50:42 -0000	1.15
@@ -41,10 +41,6 @@
         "<span class='date'>$pretty_date</span></p>" \
         $description $more $my_footer \n\
         "</DIV>"
-    if {[my do_substitutions] == 0} {
-      # the including weblog will do otherwise the substitutions
-      set content [string map [list "\{\{" "\\\{\{"] $content]
-    }
     #my log "--W entry done [self] [my info class] subst=[my do_substitutions] [my name]"
     return $content
   }
@@ -83,14 +79,16 @@
 
     if {[$page exists __including_page]} {
       set i [$page set __including_page]
-      set exclude_item_ids [$i item_id]
-      $i set render_adp 0  ;# no double substitutions
       #my log "--W including page $i"
+      set exclude_item_ids [$i item_id]
+      $i set render_adp 0  ;# no double adp substitutions
+      $i do_substitutions 0;# no double substitutions in parent
     } else {
       #my log "--W NO including page"
       set exclude_item_ids [$page item_id]
       $page set __no_footer 1
     }
+    $page do_substitutions 0; # no double substitutions in page
 
     # on the weblog-portlet page, an edit-new should not create an object
     ::xo::cc set_parameter object_type ::xowiki::Page
@@ -122,6 +120,3 @@
   }
   
 }
-
-
-