Index: openacs-4/packages/bookshelf/lib/one-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/lib/one-book.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookshelf/lib/one-book.adp	26 Jul 2004 13:09:00 -0000	1.1
@@ -0,0 +1,16 @@
+<contract>
+  Display one bookshelf book
+
+  @author Jeff Davis davis@xarg.net
+  @cvs-id $Id: one-book.adp,v 1.1 2004/07/26 13:09:00 jeffd Exp $
+
+  @param book array of values as returned from bookshelf::book::get
+  @param style string (either "feed" or "display" -- default is display)
+  @param base_url url to the package (ok for this to be empty if in the package, trailing / expected)
+</contract>
+<h1>@book.book_title@ by @book.book_author@</h1>
+<p>reviewed by <a href="@book.user_url@">@book.creation_user_first_names@ @book.creation_user_last_name@</a></p>
+<p>@book.main_entry@</p>
+<p>@book.additional_entry@</p>
+<h2>Excerpt</h2>
+<p>@book.excerpt@</p>
Index: openacs-4/packages/bookshelf/lib/one-book.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/lib/one-book.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookshelf/lib/one-book.tcl	26 Jul 2004 13:09:00 -0000	1.1
@@ -0,0 +1,3 @@
+if {![info exists book(user_url)]} {
+    set book(user_url) [acs_community_member_url -user_id $book(creation_user)]
+}
Index: openacs-4/packages/bookshelf/tcl/bookshelf-search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/tcl/bookshelf-search-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/tcl/bookshelf-search-procs.tcl	27 Apr 2004 12:30:26 -0000	1.1
+++ openacs-4/packages/bookshelf/tcl/bookshelf-search-procs.tcl	26 Jul 2004 13:09:00 -0000	1.2
@@ -16,23 +16,31 @@
 
     @author Jeff Davis davis@xarg.net
 } {
+    if {[db_0or1row get {select package_id, book_no from bookshelf_books where book_id = :book_id}]} {
+        set base [apm_package_url_from_id $package_id]
+    } else { 
+        set base {}
+    }
+    set full "[ad_url]$base"
 
-    bookshelf::book::get -book_id $book_id -array b
+    bookshelf::book::get -book_id $book_id -array book
+    set title "$book(book_title) by $book(book_author)"
 
-    set title "$b(book_title) by $b(book_author)"
-    set content "$b(book_title) by $b(book_author)
-$b(main_entry)
-$b(additional_entry)
-$b(excerpt)
-reviewed $b(creation_date_pretty)
-ISBN $b(isbn)
-"
+    set body [template::adp_include /packages/bookshelf/lib/one-book [list & "book" base $base style feed]]
+
     return [list object_id $book_id \
                 title $title \
-                content $content \
+                content $body \
                 keywords {} \
                 storage_type text \
-                mime text/plain ]
+                mime text/html \
+                syndication [list link ${full}book-view?book_no=$book(book_no) \
+                                 description "Book review" \
+                                 guid "[ad_url]/o/$book_id" \
+                                 category {book review} \
+                                 pubDate $book(creation_date) \
+                                 author "$book(creation_user_first_names) $book(creation_user_last_name)" ] \
+               ]
 }
 
 ad_proc -private bookshelf::book::search::url { book_id } {