Index: openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/Attic/faq-portlet-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	29 Mar 2002 19:41:14 -0000	1.5
+++ openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	6 Apr 2002 23:41:34 -0000	1.6
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 
 <queryset>
-<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="faqs_select">
-    <querytext>
-      select f.faq_id, f.faq_name
-      from acs_objects o, faqs f
-      where object_id = f.faq_id
-      and context_id = :package_id
-    </querytext>
-</fullquery>
+    <fullquery name="select_faqs">
+        <querytext>
+            select acs_objects.context_id as package_id,
+                   (select apm_packages.instance_name
+                    from apm_packages
+                    where apm_packages.package_id = apm_package.parent_id(acs_objects.context_id)) as community_name,
+                   (select site_node.url(site_nodes.node_id)
+                    from site_nodes
+                    where site_nodes.object_id = acs_objects.context_id) as url,
+                   faqs.faq_id,
+                   faqs.faq_name
+            from faqs,
+                 acs_objects
+            where faqs.faq_id = acs_objects.object_id
+            and acs_objects.context_id in ([join $list_of_package_ids ", "])
+        </querytext>
+    </fullquery>
 
-<fullquery name="faqs_check">
-    <querytext>
-    select 1
-    from dual where exists (select 1 from acs_objects o, faqs f
-    where object_id = f.faq_id
-    and context_id = :package_id)
-    </querytext>
-</fullquery>
-
 </queryset>