Index: openacs-4/packages/lars-blogger/lars-blogger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/lars-blogger/lars-blogger.info	27 Feb 2004 19:16:24 -0000	1.35
+++ openacs-4/packages/lars-blogger/lars-blogger.info	1 Apr 2004 13:05:30 -0000	1.36
@@ -7,45 +7,39 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.0d2" url="http://openacs.org/repository/download/apm/lars-blogger-2.0d2.apm">
+    <version name="2.0d3" url="http://openacs.org/repository/download/apm/lars-blogger-2.0d3.apm">
         <owner url="mailto:lars@pinds.com">Lars Pind</owner>
         <summary>Individual or collaborative web logs.</summary>
         <release-date>2004-02-11</release-date>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
         <description format="text/html">Weblog creation and management with notifications, RSS, trackpack, technorati, blogroll, pings, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users.</description>
 
-        <provides url="lars-blogger" version="2.0d2"/>
+        <provides url="lars-blogger" version="2.0d3"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-tcl" version="5.0.1"/>
+        <requires url="categories" version="1.0d4"/>
         <requires url="general-comments" version="4.0"/>
         <requires url="notifications" version="5.0.0b4"/>
         <requires url="rss-support" version="0.3d1"/>
         <requires url="trackback" version="0.1d"/>
         <requires url="xml-rpc" version="0.1"/>
-        <requires url="categories" version="1.0d3"/>
 
         <callbacks>
-            <callback type="after-instantiate"  proc="lars_blogger::install::package_instantiate"/>
             <callback type="before-uninstantiate"  proc="lars_blogger::install::package_uninstantiate"/>
+            <callback type="after-instantiate"  proc="lars_blogger::install::package_instantiate"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="channel_image_height"  description="Height in pixels of the image to be used for this blog as an RSS channel" section_name="rss"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="channel_image_url"  description="The URL, relative to this server, to the image that corresponds to this blog in the rss channel" section_name="rss"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="channel_image_width"  description="Width in pixels of the image to be used for this blog as an RSS channel" section_name="rss"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CategoryContainer"  default="package_id" description="Should the category container for the weblog be 
+&quot;subsite_id&quot; or &quot;package_id&quot;"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayUsersP"  default="0" description="Should we display a list of bloggers on the index page."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableAutoDiscoveryAndPing"  default="1" description="Enable auto-discovery and sending of trackback pings" section_name="Trackback"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableCategoriesP"  default="1" description="Should entries be categorized?"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableIncomingTrackback"  default="1" description="Enable incoming trackback" section_name="Trackback"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HeaderBackgroundColor"  default="#dcdcdc" description="Background color for the header bars, those with the entry date, calendar, etc."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="max_content_length"  default="0" description="Maximum length of content for an entry when display on pages listing entries, such as the index page and the archive pages. Enter 0 to show full contents of all entries."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxNumEntriesOnFrontPage"  description="Maximum number of entries to show on the weblog front page. 0 or empty string for no maximum."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MinNumEntriesOnFrontPage"  default="3" description="Minimum number of entries to show on the weblog front page. 0 or empty string for no minimum."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="NumDaysOnFrontPage"  default="30" description="Number of days worth of entries on the weblog front page. Default is 30. Set to 0 or empty string for no date limit."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="NumberOfCommentsInIncludelet"  default="10" description="How many comments should be included in the &quot;last n comments&quot; includelet?"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="package_rss_feed_p"  default="1" description="Should we build an RSS feed for this instance." section_name="rss"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="public_url"  description="The public URL for this blog (in case you've put the blog on your front page, for example)"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="rss_file_name"  default="rss.xml" description="What name should we advertise the RSS feed under, relative to the blog mount point. Leave blank if no RSS feed." section_name="rss"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="rss_max_description_length"  default="500" description="Maximum length of entry included in the 'description' part of the RSS feed. 0 means no truncation." section_name="rss"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowPosterP"  default="1" description="Show who posted the entry and when"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="StylesheetURL"  default="/resources/lars-blogger/lars-blogger.css" description="The url to the stylesheet used in conjunction with the weblog instance."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="TechnoratiApiCosmosNumber"  default="40" description="Number of entries to retrieve in Cosmos calls. The includelet can decide to display a different number of entries." section_name="technorati"/>
@@ -54,6 +48,14 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TechnoratiApiKey"  description="An API key is necessary to use the Technorati API. After logging in at technorati.com you can retrieve your key by visiting http://www.technorati.com/members/apikey.html and pasting it here." section_name="technorati"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TechnoratiApiUrl"  description="The URL which will be used in Technorati API lookups. If you leave this empty it will default to the blog's URL." section_name="technorati"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="TrackbackMaxExcerpt"  default="200" description="Maximum length of excerpt to send for trackback" section_name="Trackback"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="channel_image_height"  description="Height in pixels of the image to be used for this blog as an RSS channel" section_name="rss"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="channel_image_url"  description="The URL, relative to this server, to the image that corresponds to this blog in the rss channel" section_name="rss"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="channel_image_width"  description="Width in pixels of the image to be used for this blog as an RSS channel" section_name="rss"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="max_content_length"  default="0" description="Maximum length of content for an entry when display on pages listing entries, such as the index page and the archive pages. Enter 0 to show full contents of all entries."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="package_rss_feed_p"  default="1" description="Should we build an RSS feed for this instance." section_name="rss"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="public_url"  description="The public URL for this blog (in case you've put the blog on your front page, for example)"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="rss_file_name"  default="rss.xml" description="What name should we advertise the RSS feed under, relative to the blog mount point. Leave blank if no RSS feed." section_name="rss"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="rss_max_description_length"  default="500" description="Maximum length of entry included in the 'description' part of the RSS feed. 0 means no truncation." section_name="rss"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="user_rss_feed_p"  default="0" description="Should we build an RSS feed for each user." section_name="rss"/>
         </parameters>
 
Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/lars-blogger/www/entry-edit.tcl	7 Feb 2004 13:50:40 -0000	1.21
+++ openacs-4/packages/lars-blogger/www/entry-edit.tcl	1 Apr 2004 13:05:30 -0000	1.22
@@ -81,10 +81,11 @@
 
     }
 }
+set container_id [ad_conn [parameter::get -parameter CategoryContainer -default package_id]]
 
 # SWC (Site-wide categories):
 category::ad_form::add_widgets \
-    -container_object_id $package_id \
+    -container_object_id $container_id \
     -categorized_object_id [value_if_exists entry_id] \
     -form_name entry
 
@@ -142,7 +143,7 @@
 
         # SWC Collect categories from all the category widgets
         set category_ids [category::ad_form::get_categories \
-          -container_object_id $package_id]
+                              -container_object_id $container_id]
 
     } \
     -new_data {
Index: openacs-4/packages/lars-blogger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/lars-blogger/www/index.adp	27 Feb 2004 19:45:28 -0000	1.34
+++ openacs-4/packages/lars-blogger/www/index.adp	1 Apr 2004 13:05:30 -0000	1.35
@@ -63,7 +63,7 @@
          <multiple name="sw_categories">
            <h2>@sw_categories.tree_name@</h2>
            <group column="tree_id">
-             <a href="@package_url_with_extras@swcat/@sw_categories.sw_category_id@">@sw_categories.sw_category_name@</a><br>
+             <if @sw_categories.count@ gt 0>@sw_categories.pad;noquote@<a href="@package_url_with_extras@swcat/@sw_categories.category_id@">@sw_categories.category_name@</a> (@sw_categories.count@)<br /></if>
            </group>
          </multiple>
         </div>
@@ -81,7 +81,7 @@
       <if @notification_chunk@ not nil>
         <div class="lars_blogger_portlet">
           <h2>Notifications</h2>
-          @notification_chunk;noquote@            
+          @notification_chunk;noquote@
         </div>
       </if>
       <if @rss_file_url@ not nil>
Index: openacs-4/packages/lars-blogger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/lars-blogger/www/index.tcl	27 Feb 2004 18:30:59 -0000	1.22
+++ openacs-4/packages/lars-blogger/www/index.tcl	1 Apr 2004 13:05:30 -0000	1.23
@@ -179,16 +179,12 @@
 db_multirow categories categories {}
 
 # SWC
-
-db_multirow -unclobber -extend {sw_category_name tree_name} \
-  sw_categories sw_categories {
-  select c.category_id as sw_category_id, c.tree_id
-    from categories c, category_tree_map ctm
-   where ctm.tree_id = c.tree_id
-     and ctm.object_id = :package_id} {
-  set sw_category_name [category::get_name $sw_category_id]
-  set tree_name [category_tree::get_name $tree_id]
+set counts {}
+db_foreach catcount {select c.category_id as catid, count(*) as count from category_object_map c, pinds_blog_entries e where e.package_id = :package_id and c.object_id = e.entry_id group by c.category_id} { 
+    lappend counts $catid $count
 }
+set container_id [ad_conn [parameter::get -parameter CategoryContainer -default package_id]]
+category_tree::get_multirow -datasource sw_categories -container_id $container_id -category_counts $counts
 
 # Cut the URL off the last item in the context bar
 if { [llength $context] > 0 } {
Index: openacs-4/packages/lars-blogger/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/lars-blogger/www/admin/index.tcl	28 Jan 2004 15:46:00 -0000	1.10
+++ openacs-4/packages/lars-blogger/www/admin/index.tcl	1 Apr 2004 13:05:30 -0000	1.11
@@ -19,7 +19,7 @@
 
 set category_map_url [export_vars -base \
     "[site_node::get_package_url -package_key categories]cadmin/one-object" \
-    { { object_id $package_id } }]
+                          { { object_id {[ad_conn [parameter::get -parameter CategoryContainer -default package_id]]} } }]
 
 set instance_feed_p [db_string rss_feed_p {}]