Index: openacs-4/packages/categories/lib/categorize.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/categorize.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/lib/categorize.adp	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,6 @@
+  <h1>Categorize @name@</h1>
+  <if @catass_list@ not nil>
+    <h2> Current categories</h2>
+    <p>@catass_list;noquote@</p>
+  </if>
+  <formtemplate id="catass"></formtemplate>
Index: openacs-4/packages/categories/lib/categorize.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/categorize.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/lib/categorize.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,29 @@
+if {![exists_and_not_null object_id]} {
+    ad_complain "You must specify an object to categorize"
+}
+
+if {![exists_and_not_null container_id]} {
+    set container_id [ad_conn subsite_id]
+}
+
+set name [db_string title {select title from acs_objects where object_id = :object_id} -default $object_id]
+
+# Category mapping stuff
+# add category form
+ad_form -action map -method GET -name catass -form {
+    {object_id:integer(hidden)
+        {value $object_id}
+    }
+    {container_id:integer(hidden)
+        {value $container_id}
+    }
+}
+
+category::ad_form::add_widgets -container_object_id $container_id -form_name catass
+
+# mapped categories:
+set catass_list [category::list::get_pretty_list \
+                     -category_link_eval "list-categories?cat=\$__category_id" \
+                     -remove_link_eval "remove?cat=\$__category_id&object_id=$object_id" \
+                     -remove_link_text "<b style=\"color: red\">X</b>" \
+                     [category::get_mapped_categories $object_id]]
Index: openacs-4/packages/categories/lib/list-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/list-categories.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/lib/list-categories.adp	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,21 @@
+  <div style="float: left;">
+    <div>
+      <multiple name="categories">
+        <h2>@categories.tree_name@</h2>
+        <ul>
+          <group column="tree_id">
+            <if @categories.category_id@ eq @cat@><li><b>@categories.pad;noquote@@categories.category_name@ <if @categories.count@ gt 0>(@categories.count@)</if></b></li></if>
+            <else>
+              <if @categories.count@ gt 0 or @categories.child_sum@ gt 0>
+                <li>@categories.pad;noquote@<if @categories.count@ gt 0><a href="?cat=@categories.category_id@">@categories.category_name@</a> (@categories.count@)</if><else>@categories.category_name@</else>
+                </li>
+              </if>
+            </else>
+          </group>
+        </ul>
+      </multiple>
+    </div>
+    <div>
+      <if @cat@ not nil><include src="/packages/categories-ui/lib/contributions" orderby="@orderby@" category="@cat@" root_node_id="@node_id@"></if>
+    </div>
+  </div>
Index: openacs-4/packages/categories/lib/list-categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/list-categories.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/lib/list-categories.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,23 @@
+if {![exists_and_not_null cat]} {
+    set cat {}
+}
+
+if {![exists_and_not_null orderby]} {
+    set orderby "object_title"
+}
+
+# Get category data.
+set counts {}
+set node_id [ad_conn node_id]
+set packages [categories-ui::util::packages -node_id $node_id]
+db_foreach category_count "
+    SELECT c.category_id as catid, count(*) as count
+    FROM category_object_map c, acs_objects o
+    where c.object_id = o.object_id
+    and o.package_id in ([join $packages ,])
+    group by c.category_id
+" { 
+    lappend counts $catid $count
+}
+
+category_tree::get_multirow -datasource categories -container_id [ad_conn subsite_id] -category_counts $counts
Index: openacs-4/packages/categories/lib/map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/map.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/lib/map.adp	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1 @@
+OK
\ No newline at end of file
Index: openacs-4/packages/categories/lib/map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/map.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/lib/map.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,27 @@
+if {![exists_and_not_null object_id]} {
+    ad_complain "You must specify an item to map"
+}
+
+if {![exists_and_not_null container_id]} {
+    ad_complain "You must specify a container to map the object to"
+}
+
+ad_form -name catass -form {
+    {object_id:integer(hidden)
+        {value $object_id}
+    }
+    {container_id:integer(hidden)
+        {value $container_id}
+    }
+} 
+category::ad_form::add_widgets -container_object_id $container_id -form_name catass
+ad_form -extend -name catass -on_submit { 
+    ns_log Notice "JCD: trees [category_tree::get_mapped_trees $container_id]"
+    set category_ids [category::ad_form::get_categories -container_object_id $container_id]
+    ns_log Notice "JCD: mapping $category_ids" 
+    category::map_object \
+        -object_id $object_id \
+        $category_ids
+}
+
+ad_returnredirect [get_referrer]
Index: openacs-4/packages/faq/faq.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/faq/faq.info	24 Feb 2005 13:33:17 -0000	1.14
+++ openacs-4/packages/faq/faq.info	10 Mar 2005 18:27:41 -0000	1.15
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.2.0d3" url="http://openacs.org/repository/download/apm/faq-5.2.0d3.apm">
+    <version name="5.2.0d4" url="http://openacs.org/repository/download/apm/faq-5.2.0d4.apm">
         <owner url="mailto:wirth@ybos.net">Elizabeth Wirth</owner>
         <owner url="mailto:jennie@ybos.net">Jennie Kim Housman</owner>
         <owner url="mailto:mazloumi@uni-mannheim.de">Nima Mazloumi</owner>
@@ -17,14 +17,15 @@
         <vendor url="http://ybos.net">Ybos Corporation</vendor>
         <description format="text/html">Handles frequently asked questions Q&amp;A presentation.  Can be one Q&amp;A per page or all presented flat.  Straightforward application with room for improvement. Support for notification as well as WYSIQYG Editor and Categories - both optional. Category trees are displayed flat. No multiple filters.</description>
 
-        <provides url="faq" version="5.2.0d3"/>
+        <provides url="faq" version="5.2.0d4"/>
         <requires url="acs-kernel" version="5.2.0d3"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="notifications" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
         <parameters>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CategoryContainer"  default="package_id" description="Should the category container for the faqs be &quot;subsite_id&quot; or &quot;package_id&quot;."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableCategoriesP"  default="0" description="Should categories be enabled? Default is 0 (false)."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UseWysiwygP"  default="t" description="Should we allow users to use a WYSIWYG editor to make their entries? Defaults to f (false)."/>
         </parameters>
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/faq/www/one-faq.adp	12 Aug 2004 13:57:46 -0000	1.12
+++ openacs-4/packages/faq/www/one-faq.adp	10 Mar 2005 18:27:41 -0000	1.13
@@ -22,6 +22,7 @@
 <if @separate_p@ false>
     <li>
       <a href="#@one_question.entry_id@">@one_question.question;noquote@</a>
+      <a href="categories/categorize?object_id=@one_question.entry_id@">Categorize</a>
     </li>
 </if>
 </multiple>
@@ -54,4 +55,4 @@
 <br><a href="@package_url@one-faq?faq_id=@faq_id@">#faq.All_QA#</a>
 </if>
 </td></tr>
-</table>
\ No newline at end of file
+</table>
Index: openacs-4/packages/faq/www/categories/categorize.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/categorize.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/categorize.adp	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,4 @@
+<master>
+<property name="context">@context;noquote@</property>
+
+<include src="/packages/categories/lib/categorize" object_id="@object_id@" container_id="@container_id@">
Index: openacs-4/packages/faq/www/categories/categorize.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/categorize.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/categorize.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,11 @@
+ad_page_contract {
+
+} {
+    object_id:integer
+}
+
+set container_id [ad_conn [parameter::get -parameter CategoryContainer -default package_id]]
+
+set context Categorize
+
+ad_return_template
Index: openacs-4/packages/faq/www/categories/list-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/list-categories.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/list-categories.adp	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,4 @@
+<master>
+  <property name="context">@cat_name@</property>
+
+<include src="/packages/categories/lib/list-categories" cat="@cat@" orderby="@orderby@">
Index: openacs-4/packages/faq/www/categories/list-categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/list-categories.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/list-categories.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract { 
+    Main category display page 
+    @author Jeff Davis (davis@xarg.net)
+    @cvs-id $Id: list-categories.tcl,v 1.1 2005/03/10 18:27:41 rob Exp $
+} {
+    {cat:trim,integer {}}
+    {orderby "object_title"}
+}
+
+set cat_name [category::get_names $cat]
+
+ad_return_template
Index: openacs-4/packages/faq/www/categories/map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/map.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/map.adp	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1 @@
+<include src="/packages/categories/lib/map" object_id="@object_id@" container_id="@container_id@">
Index: openacs-4/packages/faq/www/categories/map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/map.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/map.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,7 @@
+ad_page_contract {
+} {
+    object_id:integer,notnull
+    container_id:integer,notnull
+}
+
+ad_return_template
Index: openacs-4/packages/faq/www/categories/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/remove.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/faq/www/categories/remove.tcl	10 Mar 2005 18:27:41 -0000	1.1
@@ -0,0 +1,9 @@
+ad_page_contract {
+} {
+    object_id:integer,notnull
+    cat:integer,notnull
+}
+
+db_dml nuke {delete from category_object_map where category_id = :cat and object_id = :object_id}
+
+ad_returnredirect -message "removed category" [get_referrer]