Index: openacs-4/packages/faq-portlet/faq-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/faq-portlet.info,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq-portlet/faq-portlet.info	25 Feb 2002 20:37:51 -0000	1.6
+++ openacs-4/packages/faq-portlet/faq-portlet.info	6 Apr 2002 23:41:34 -0000	1.7
@@ -31,7 +31,6 @@
             <file type="query_file" db_type="oracle" path="www/faq-portlet-oracle.xql"/>
             <file type="content_page" path="www/faq-portlet.adp"/>
             <file type="content_page" path="www/faq-portlet.tcl"/>
-            <file type="query_file" path="www/faq-portlet.xql"/>
         </files>
         <parameters>
         <!-- No version parameters -->
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>
Index: openacs-4/packages/faq-portlet/www/faq-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq-portlet/www/faq-portlet.adp	29 Mar 2002 19:25:19 -0000	1.4
+++ openacs-4/packages/faq-portlet/www/faq-portlet.adp	6 Apr 2002 23:41:34 -0000	1.5
@@ -18,26 +18,67 @@
 
 %>
 
-<if @shaded_p@ false>
+<if @shaded_p@ ne "t">
 
-  <if @no_faqs_p@ false>
+  <if @faqs:rowcount@ gt 0>
 
-    <if @one_instance_p@ eq 0>
-      <ul>
+<%
+    set new_package_id ""
+    set old_package_id ""
+%>
+
+    <if @one_instance_p@ false>
+      <table border="0" bgcolor="white" cellpadding="2" cellspacing="3" width="100%">
+        <tr>
+          <td><strong>Name</strong></td>
+          <td><strong>Group</strong></td>
+        </tr>
     </if>
-   
-    @data@
-  
-    <if @one_instance_p@ eq 0>
-      </ul>
+
+<multiple name="faqs">
+
+<% set new_package_id $faqs(package_id) %>
+
+    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
+      <tr>
     </if>
 
+    <if @one_instance_p@>
+      <li>
+        <a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a>
+      </li>
+    </if>
+    <else>
+      <if @faqs.rownum@ odd>
+        <tr bgcolor="#ececec">
+      </if>
+      <else>
+        <tr bgcolor="#ffffff">
+      </else>
+        <td><a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a></td>
+        <td>@faqs.community_name@</td>
+      </tr>
+    </else>
+
+<%
+    set old_package_id $new_package_id
+%>
+
+    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
+      </tr>
+    </if>
+</multiple>
+
+    <if @one_instance_p@ false>
+      </table>
+    </if>
+
   </if>
   <else>
-    <small>No FAQs</small>
+    No FAQs
   </else>
 
 </if>
 <else>
-  &nbsp;
+&nbsp;
 </else>
Index: openacs-4/packages/faq-portlet/www/faq-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/faq-portlet/www/faq-portlet.tcl	29 Mar 2002 19:25:19 -0000	1.11
+++ openacs-4/packages/faq-portlet/www/faq-portlet.tcl	6 Apr 2002 23:41:34 -0000	1.12
@@ -27,99 +27,7 @@
 array set config $cf
 
 set shaded_p $config(shaded_p)
-
-# Should be a list already!
 set list_of_package_ids $config(package_id)
-set data ""
+set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
 
-if {[llength $list_of_package_ids] == 1} {
-    set one_instance_p 1
-} else {
-    set one_instance_p 0
-}
-
-if {[ad_parameter community_level_p] == 1} {
-# if i'm in a comm, have the list UI
-
-    foreach package_id $list_of_package_ids {
-
-        if { [db_string faq_q_and_as_count_select {} ] != 0 } {
-
-            set comm_name [site_nodes::get_parent_name \
-                    -instance_id $package_id
-            ]
-
-            set comm_url [dotlrn_community::get_url_from_package_id -package_id $package_id]
-
-            set f_check [db_0or1row faqs_check {}]
-
-            if {!$one_instance_p && $f_check} {
-                append data "<li>$comm_name"
-                append data "<ul>"
-            }
-
-            db_foreach faqs_select {} {
-                append data "<li><a href=${comm_url}one-faq?faq_id=$faq_id>$faq_name</a><br>"
-            }
-
-            if {!$one_instance_p && $f_check} {
-                append data "</ul>"
-            }
-
-        }
-    }
-
-} else {
-    # i'm at /dotlrn, so have the table UI, hack
-
-    #
-    # this seems broken, but it was working ystr - aks 3/18
-    #
-
-
-
-    set one_instance_p 1
-    set data ""
-    set data_start "<table border=\"0\" bgcolor=\"white\" cellpadding=\"2\" cellspacing=\"3\" width=\"100%\">
-    <tr>
-                <td><strong>Name</strong></td>
-                <td><strong>Group</strong></td>
-    </tr>"
-
-    foreach package_id $list_of_package_ids {
-
-        set comm_url [dotlrn_community::get_url_from_package_id -package_id $package_id]
-
-        set comm_name [site_nodes::get_parent_name \
-                -instance_id $package_id
-        ]
-
-        set count 0
-
-        db_foreach faqs_select {} {
-
-            if {[expr $count % 2] == 0} {
-                append data "<tr><td bgcolor=#ececec><a href=${comm_url}one-faq?faq_id=$faq_id>$faq_name</a></td><td bgcolor=#ececec>$comm_name</td></tr>"
-            } else {
-                append data "<tr><td><a href=${comm_url}one-faq?faq_id=$faq_id>$faq_name</a></td><td>$comm_name</td></tr>"
-            }
-
-            incr count
-        }
-    }
-
-    set data_end "</table>"
-
-    if {$count != 0} {
-        append $data_start $data $data_end
-    }
-
-
-}
-
-# portlets shouldn't disappear anymore (ben)
-if {[empty_string_p $data]} {
-    set no_faqs_p "t"
-} else {
-    set no_faqs_p "f"
-}
+db_multirow faqs select_faqs {}
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/faq-portlet/www/faq-portlet.xql'.
Fisheye: No comparison available.  Pass `N' to diff?