Index: openacs-4/contrib/packages/bcms-ui-base/resources/search-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/search-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/resources/search-postgresql.xql	22 Sep 2003 07:36:46 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/resources/search-postgresql.xql	5 Oct 2003 12:28:03 -0000	1.2
@@ -20,6 +20,7 @@
                 (select tree_sortkey, item_id from cr_items where item_id = :root_folder_id) r $openfts_from
             where tree_ancestor_p(r.tree_sortkey, i.tree_sortkey) 
                 and ao.object_id = i.item_id
+                and i.item_id <> r.item_id
                 $openfts_where
                 [template::list::page_where_clause -key i.item_id -and -name search_results]
         ) results
@@ -33,17 +34,18 @@
     <querytext>
 
         select * from (
-            select item_id, 
-                name, 
-                parent_id,
+            select i.item_id, 
+                i.name, 
+                i.parent_id,
                 case when i.content_type = 'content_folder' then content_folder__get_label(i.item_id) else bcms__get_title(i.item_id, 'latest') end as title,
-                live_revision,
-                content_type,
+                i.live_revision,
+                i.content_type,
                 to_char(ao.last_modified,'YYYY-MM-DD HH:MM AM') as last_modified
             from cr_items i, acs_objects ao,
-                (select tree_sortkey from cr_items where item_id = :root_folder_id) r $openfts_from
+                (select tree_sortkey, item_id from cr_items where item_id = :root_folder_id) r $openfts_from
             where tree_ancestor_p(r.tree_sortkey, i.tree_sortkey) 
                 and ao.object_id = i.item_id
+                and i.item_id <> r.item_id
                 $openfts_where
         ) results
             where 1 = 1