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 -N -r1.10 -r1.11
--- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	7 Jun 2006 17:08:24 -0000	1.10
+++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	26 Jul 2006 22:56:46 -0000	1.11
@@ -15,13 +15,9 @@
 } {
   ns_log notice "--datasource called with revision_id = $revision_id"
 
-  set page [::Generic::CrItem instantiate -item_id 0 -revision_id $revision_id]
+  set page [::xowiki::Package instantiate_from_page -revision_id $revision_id]
   $page volatile
 
-  # ensure context for dependencies of folder object
-  set folder_id [$page set parent_id]
-  ::xowiki::Page require_folder_object -folder_id $folder_id
-
   set html [$page render]
   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
@@ -30,15 +26,15 @@
   #$page set unresolved_references 0
   $page instvar item_id
 
-  return [list object_id $revision_id title [$page set title] \
+  return [list object_id $revision_id title [$page title] \
 	      content $text keywords {} \
 	      storage_type text mime text/plain \
 	      syndication [list \
 			link [::xowiki::Page pretty_link -fully_qualified 1 [$page set name]] \
 			description $text \
 			author [$page set creator] \
 			category "" \
-			guid "[ad_url]/o/$item_id" \
+			guid "$item_id" \
 			pubDate [$page set last_modified]] \
 	     ]
 }
@@ -48,18 +44,9 @@
 
     returns a url for a message to the search package
 } {
-  set page [::Generic::CrItem instantiate -item_id 0 -revision_id $revision_id]
+  set page [::xowiki::Package instantiate_from_page -revision_id $revision_id]
   $page volatile
-  set folder_id [$page set parent_id]
-  set pid [db_string get_pid "select package_id from cr_folders where folder_id = $folder_id"]
-  if {$pid > 0} {
-    return [::xowiki::Page pretty_link -package_id $pid [$page set name]]
-  } else {
-    # cannot determine package_id; one page from the directory should be viewed to update 
-    # package id for the content folder...
-    return "cannot determine package_id, view a page from the folder containing page \
-	[$page set name]"
-  }
+  return [::[$page package_id] url]
 }