Index: openacs-4/contrib/packages/survey/tcl/survey-search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/tcl/Attic/survey-search-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/tcl/survey-search-procs.tcl	26 Mar 2005 18:17:22 -0000	1.1
+++ openacs-4/contrib/packages/survey/tcl/survey-search-procs.tcl	26 Mar 2005 21:55:35 -0000	1.2
@@ -12,7 +12,7 @@
 namespace eval ::survey::search::section {}
 namespace eval ::survey::search::question {}
 
-ad_proc -public ::survey::search::survey::datasource {
+ad_proc -private ::survey::search::survey::datasource {
     object_id
 } {
     Provide datasource for FtsContentProvider service contract
@@ -26,25 +26,42 @@
 
     @error
 } {
+    set url [survey::search::survey::url $object_id]
 
     db_1row get_survey {
         select o.object_id,
           s.name as title,
           s.description,
-          s.name || ' ' || s.description as content,
           o.last_modified as pubdate,
           'text/plain' as mime,
           'text' as storage_type,
           '' as keywords
         from surveys s, acs_objects o
         where s.survey_id=:object_id
           and s.survey_id=o.object_id
-    } -column_array datasource
-
-    return [array get datasource]
+    }
+    
+    return [list object_id $object_id \
+                title $title \
+                description $description \
+                content "$title $description" \
+                pubdate $pubdate \
+                mime text/plain \
+                storage_type text \
+                keywords {} \
+                syndication \
+                [list \
+                     link "[ad_url]$url" \
+                     description $title \
+                     author $email \
+                     category Survey \
+                     guid "[ad_url]/o/$object_id" \
+                     pubDate $pubdate \
+                    ] \
+               ]
 }
 
-ad_proc -public ::survey::search::survey::url {
+ad_proc -private ::survey::search::survey::url {
     object_id
 } {
     Generate URL for search service contract
@@ -62,11 +79,11 @@
 
     array set sn [site_node::get_from_object_id -object_id $package_id]
 
-    return "[export_vars -base $sn(url)/one-survey {{survey_id $object_id}}]"
+    return "[export_vars -base $sn(url)one-survey {{survey_id $object_id}}]"
 }
 
 
-ad_proc -public ::survey::search::section::datasource {
+ad_proc -private ::survey::search::section::datasource {
     object_id
 } {
     Provide datasource for FtsContentProvider service contract
@@ -81,7 +98,6 @@
     @error
 } {
 
-    set url [survey::search::survey::url $object_id]
     db_1row get_survey_section {
         select o.object_id,
           s.name as title,
@@ -95,26 +111,10 @@
         where s.section_id=:object_id
           and s.section_id=o.object_id} -column_array datasource
 
-    return [list object_id $object_id \
-                title $title \
-                description $description \
-                content "$title $description" \
-                pubdate $pubdate \
-                mime text/plain \
-                storage_type text \
-                keywords {} \
-                syndication [list \
-                                 link "[ad_url]$url" \
-                                 description $title \
-                                 author email \
-                                 category Survey \
-                                 guid "[ad_url]/o/$object_id" \
-                                 pubDate $pubdate \
-                                ] ] \
-       ]
+    return [array get datasource]
 }
 
-ad_proc -public ::survey::search::section::url {
+ad_proc -private ::survey::search::section::url {
     object_id
 } {
     Generate URL for search service contract
@@ -139,7 +139,7 @@
 }
 
 
-ad_proc -public ::survey::search::question::datasource {
+ad_proc -private ::survey::search::question::datasource {
     object_id
 } {
     Provide datasource for FtsContentProvider service contract
@@ -163,10 +163,11 @@
                         from survey_questions sq, acs_objects o
                         where sq.question_id=:object_id
                         and sq.question_id=o.object_id} -column_array datasource
+
     return [array get datasource]
 }
 
-ad_proc -public ::survey::search::question::url {
+ad_proc -private ::survey::search::question::url {
     object_id
 } {
     Generate URL for search service contract