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.37 -r1.38
--- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	13 Sep 2012 16:05:29 -0000	1.37
+++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	27 Oct 2014 16:42:05 -0000	1.38
@@ -1,87 +1,106 @@
 ::xo::library doc {
-    XoWiki - Search Service Contracts
+  XoWiki - Search Service Contracts
 
-    @creation-date 2006-01-10
-    @author Gustaf Neumann
-    @cvs-id $Id$
+  @creation-date 2006-01-10
+  @author Gustaf Neumann
+  @cvs-id $Id$
 }
 
 namespace eval ::xowiki {}
 
 ad_proc -private ::xowiki::datasource { revision_id } {
-    @param revision_id
+  @param revision_id
 
   returns a datasource for the search package
 } {
-  #ns_log notice "--sc datasource called with revision_id = $revision_id"
-
+  #ns_log notice "--sc ::xowiki::datasource called with revision_id = $revision_id"
+  
   set page [::xowiki::Package instantiate_page_from_id -revision_id $revision_id -user_id 0]
+  
+  #ns_log notice "--sc ::xowiki::datasource $page [$page set publish_status]"
 
-  #ns_log notice "--sc package=[[$page package_id] serialize]"
-  ns_log notice "--sc $page [$page set publish_status]"
-
   if {[$page set publish_status] eq "production"} {
     # no data source for for pages under construction
     #ns_log notice "--sc page under construction, no datasource"
-    return   [list object_id $revision_id title "" \
-                  content "" keywords "" \
-                  storage_type text mime text/html]
+    return [list object_id $revision_id title "" \
+                content "" keywords "" \
+                storage_type text mime text/html]
   }
 
   #ns_log notice "--sc setting absolute links for page = $page [$page set name]"
 
-  array set "" [$page search_render]
+  set d [dict merge \
+             {mime text/html text "" html "" keywords ""} \
+             [$page search_render]]
 
-  if {![info exists (title)]} {
-    set (title) [$page title]
+  if {![dict exists $d title]} {
+    dict set d title [$page title]
   }
-  set text [ad_html_text_convert -from text/html -to text/plain -- $(html)]
-  #set text [ad_text_to_html $(html)]; #this could be used for entity encoded html text in rss entries
-  
-  set found [string first {[1]} $text]
-  #$page log "--sc search=$found,html=$(html),text=$text"
-  if {$found > -1} {
-    append description {<![CDATA[} \n $(html) { ]]>}
-  } else {
-    set description [string map [list "&" "&amp;" < "&lt;" > "&gt;"] $text]
+  switch [dict get $d mime] {
+    text/html {
+      set content [dict get $d html]
+      set text [ad_html_text_convert -from text/html -to text/plain -- [dict get $d html]]
+      #set text [ad_text_to_html [dict get $d html]]; #this could be used for entity encoded html text in rss entries
+      
+      # If the html contains links (which are rendered by ad_html_text as [1], [2], ...)
+      # then we have to use CDATA in the description
+      #
+      if {[string first {[1]} $text] > -1} {
+        append description {<![CDATA[} \n $content { ]]>}
+      } else {
+        set description [ns_quotehtml $text]
+      }
+    }
+    text/plain {
+      set content [dict get $d text]
+      set description $content
+    }
+    default {
+      ns_log error "can't handle results of search_render of type '[dict get $d mime]'"
+      set content ""
+      set description ""
+    }
   }
-  #::xowiki::notification::do_notifications -page $page -html $(html) -text $text
 
-  #ns_log notice "--sc INDEXING $revision_id -> $text keywords $(keywords)"
-  #$page set unresolved_references 0
-  $page instvar item_id
+  #ns_log notice "--sc INDEXING $revision_id -> $text keywords [dict get $d keywords]"
+
+  #
   # cleanup old stuff. This might run into an error, when search is not
   # configured, and therefore txt does not exist. TODO: we should look for a better
   # solution, where syndication does not depend on search....
+  #
+  $page instvar item_id
   catch {
     db_dml delete_old_revisions {
       delete from txt where object_id in \
-      (select revision_id from cr_revisions 
-       where item_id = :item_id and revision_id != :revision_id)
+          (select revision_id from cr_revisions 
+           where item_id = :item_id and revision_id != :revision_id)
     }
   }
 
   set pubDate [::xo::db::tcl_date [$page set publish_date] tz]
   set link [$page detail_link]
 
-  set result [list object_id $revision_id title $(title) \
-		  content $(html) keywords $(keywords) \
-		  storage_type text mime text/html \
-		  syndication [list link [string map [list & "&amp;"] $link] \
-                               description $description \
-                               author [$page set creator] \
-                               category "" \
-                               guid "$item_id" \
-                               pubDate $pubDate] \
-		 ]
+  set result [list object_id $revision_id title [dict get $d title] \
+                  content $content \
+                  keywords [dict get $d keywords] \
+                  storage_type text mime [dict get $d mime] \
+                  syndication [list \
+                                   link [string map [list & "&amp;"] $link] \
+                                   description $description \
+                                   author [$page set creator] \
+                                   category "" \
+                                   guid "$item_id" \
+                                   pubDate $pubDate] \
+                 ]
   if {[catch {::xo::at_cleanup} errorMsg]} {
     ns_log notice "cleanup in ::xowiki::datasource returned $errorMsg"
   }
   return $result
 }
 
 ad_proc -private ::xowiki::url { revision_id} {
-    returns a url for a message to the search package
+  returns a url for a message to the search package
 } {
   return [::xowiki::Package get_url_from_id -revision_id $revision_id]
 }
@@ -137,7 +156,7 @@
       contract_name FtsContentProvider
       owner xowiki
     }
-}
+  }
 
   ad_proc -private ::xowiki::sc::unregister_implementations {} {
     acs_sc::impl::delete -contract_name FtsContentProvider -impl_name ::xowiki::Page
@@ -150,3 +169,9 @@
 
 ::xo::library source_dependent 
 
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 2
+#    indent-tabs-mode: nil
+# End: