Index: openacs-4/packages/bookshelf/bookshelf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/bookshelf.info,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/bookshelf/bookshelf.info	4 Apr 2005 02:41:22 -0000	1.2.2.2
+++ openacs-4/packages/bookshelf/bookshelf.info	4 Apr 2005 04:06:23 -0000	1.2.2.3
@@ -7,13 +7,13 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.0" url="http://openacs.org/repository/download/apm/bookshelf-1.0.apm">
+    <version name="1.1" url="http://openacs.org/repository/download/apm/bookshelf-1.1.apm">
         <owner url="mailto:lars@pinds.com">Lars Pind</owner>
         <summary>Share your bookshelf with others.</summary>
         <release-date>2005-04-03</release-date>
         <description format="text/html">Store commentary on books with an interface to amazon to retrieve thumbnails and other book data</description>
 
-        <provides url="bookshelf" version="1.0"/>
+        <provides url="bookshelf" version="1.1"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/bookshelf/www/bookshelf-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/bookshelf-include.tcl,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/bookshelf/www/bookshelf-include.tcl	11 Dec 2004 23:11:35 -0000	1.2.4.1
+++ openacs-4/packages/bookshelf/www/bookshelf-include.tcl	4 Apr 2005 04:06:24 -0000	1.2.4.2
@@ -17,13 +17,14 @@
     set limit_clause ""
 }
 
-db_multirow -extend { view_url } book books "
+db_multirow -extend { view_url main_entry_html } book books "
     select b.book_id,
            b.book_no,
            b.isbn,
            b.book_author,
            b.book_title,
            b.main_entry,
+           b.main_entry_mime_type,
            b.additional_entry,
            b.excerpt,
            b.publish_status,
@@ -47,5 +48,8 @@
     }
     set read_status_pretty [string totitle $read_status_pretty]
     set view_url "book-view?[export_vars { book_no }]"
+
+    set richtext [list $main_entry $main_entry_mime_type]
+    set main_entry_html [template::util::richtext::get_property html_value $richtext]
 }