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.20 -r1.21
--- openacs-4/packages/lars-blogger/lars-blogger.info	1 Oct 2003 13:00:00 -0000	1.20
+++ openacs-4/packages/lars-blogger/lars-blogger.info	1 Oct 2003 19:12:05 -0000	1.21
@@ -27,13 +27,16 @@
         </callbacks>
         <parameters>
             <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="EnableAutoDiscoveyAndPing"  default="1" description="Enable auto-discovery and sedning 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="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="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="%lars-blogger.css" description="The url to the stylesheet used in conjunction with the weblog instance. '%' is replaced with the package_url."/>
+            <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"/>
Index: openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql	28 Aug 2003 09:41:55 -0000	1.2
+++ openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql	1 Oct 2003 19:12:05 -0000	1.3
@@ -41,4 +41,31 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="lars_blogger::entry::get_comments.get_comments">
+	<querytext>
+      
+             select g.comment_id,
+                    r.title,
+                    r.mime_type,
+                    o.creation_user,
+                    acs_object.name(o.creation_user) as author,
+                    to_char(o.creation_date, 'MM-DD-YYYY') as pretty_date,
+                    to_char(o.creation_date, 'Month DD, YYYY HH12:MI PM') as pretty_date2
+		    case when tb.comment_id not null 't' else 'f' end as trackback_p,
+		    tb.tb_url as trackback_url,
+		    nvl(tb.name,tb.tb_url) as trackback_name
+               from general_comments g left join trackback_pings tb on gc.comment_id=tb.comment_id,
+                    cr_revisions r,
+	            cr_items ci,
+                    acs_objects o
+              where g.object_id = :object_id 
+		and r.revision_id = i.live_revision
+	        and i.item_id=g.comment_id 
+                and o.object_id = g.comment_id
+              order by o.creation_date
+		
+	</querytext>
+    </fullquery>
+
 </queryset>
+
Index: openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql	29 Sep 2003 08:05:42 -0000	1.3
+++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql	1 Oct 2003 19:12:05 -0000	1.4
@@ -42,4 +42,31 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="lars_blogger::entry::get_comments.get_comments">
+	<querytext>
+      
+             select g.comment_id,
+		    r.content,
+                    r.title,
+                    r.mime_type,
+                    o.creation_user,
+                    acs_object__name(o.creation_user) as author,
+                    to_char(o.creation_date, 'MM-DD-YYYY') as pretty_date,
+                    to_char(o.creation_date, 'Month DD, YYYY HH12:MI PM') as pretty_date2,
+		    case when tb.comment_id is not null then 't' else 'f' end as trackback_p,
+		    tb.tb_url as trackback_url,
+		    coalesce(tb.name, tb.tb_url) as trackback_name
+               from general_comments g left join trackback_pings tb on g.comment_id=tb.comment_id,
+                    cr_revisions r,
+	            cr_items ci,
+                    acs_objects o
+              where g.object_id = :entry_id
+		and r.revision_id = ci.live_revision
+	        and ci.item_id=g.comment_id 
+                and o.object_id = g.comment_id
+              order by o.creation_date
+		
+	</querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/lars-blogger/tcl/entry-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	29 Sep 2003 08:05:42 -0000	1.6
+++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	1 Oct 2003 19:12:05 -0000	1.7
@@ -66,6 +66,9 @@
     
     # Ping weblogs.com
     lars_blog_weblogs_com_update_ping
+
+    # trackback
+    lars_blogger::entry::trackback -entry_id $entry_id
 }
 
 
@@ -131,3 +134,40 @@
         -notif_subject $blog(title) \
         -notif_text $new_content
 }
+
+ad_proc lars_blogger::entry::trackback { -entry_id } {
+    sends trackback ping (if enabled)
+} {
+
+    if {[parameter::get -parameter EnableAutoDiscoveryAndPing -default "1"]} {
+
+	lars_blogger::entry::get -entry_id $entry_id -array entry
+	set url [ad_url][pinds_blog_entry__url $entry_id]
+	set excerpt [string range $entry(content) 0 [parameter::get -parameter TrackbackMaxExcerpt -default 200]]
+	set blog_name [lars_blog_name -package_id $entry(package_id)]
+
+	ns_log notice "Trackback sending: url=$url title=$entry(title) excerpt=$excerpt content=$entry(content) blog_name=$blog_name"
+	trackback::auto_ping -url $url \
+                -title $entry(title) \
+		-excerpt $excerpt \
+                -content $entry(content) \
+                -blog_name $blog_name
+
+    }
+
+}
+
+ad_proc -public lars_blogger::entry::get_comments {
+    -entry_id
+    {-multirow "comments"}
+} {
+    @ param entry_id
+    @ param multirow
+    upvars a multirow in the caller to display comments
+} {
+
+    set content_select [db_map content_select] ;# ", r.content"
+    upvar $multirow $multirow 
+    db_multirow $multirow get_comments ""
+
+}
\ No newline at end of file
Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/lars-blogger/www/entry-chunk.adp	1 Oct 2003 03:34:31 -0000	1.12
+++ openacs-4/packages/lars-blogger/www/entry-chunk.adp	1 Oct 2003 19:12:05 -0000	1.13
@@ -63,11 +63,11 @@
 </div>
 
 
-<if @comments_html@ not nil>
-  <table align=center width="50%"><tr><td><hr></td></tr></table>
-  <h4>Comments</h4>
-  <blockquote>
-   @comments_html;noquote@
-  </blockquote>
+<if @comments:rowcount@ not nil>
+<multiple name="comments">
+<h3 class="lars_blogger_comment_title">@comments.title@</h3>
+<p class="lars_blogger_comment_text">@comments.content@</p>
+<p><if @comments.trackback_p@ eq "f">by @comments.author@</if><else>Trackback from <a href="@comments.trackback_url@" title="@comments.trackback_name@">@comments.trackback_name@</a></else> on @comments.pretty_date@</p>
+</multiple>
   <center><a href="@blog.comment_add_url@" title="Comment on this entry">Add comment</a></center>
 </if>
Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	29 Sep 2003 08:05:42 -0000	1.8
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	1 Oct 2003 19:12:05 -0000	1.9
@@ -59,7 +59,6 @@
 set display_categories [lars_blog_categories_p -package_id [ad_conn package_id]]
 
 if { [string equal $show_comments_p "t"] } {
-    set comments_html [general_comments_get_comments -print_content_p 1 $entry_id]
+    lars_blogger::entry::get_comments -entry_id $entry_id
 }
-
 ad_return_template