Index: openacs-4/packages/bookshelf/bookshelf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/bookshelf.info,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookshelf/bookshelf.info	29 Jun 2004 10:17:49 -0000	1.5
+++ openacs-4/packages/bookshelf/bookshelf.info	18 Feb 2007 16:56:30 -0000	1.6
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.4d2" url="http://openacs.org/repository/download/apm/bookshelf-0.4d2.apm">
+    <version name="0.4d3" url="http://openacs.org/repository/download/apm/bookshelf-0.4d3.apm">
         <owner url="mailto:lars@pinds.com">Lars Pind</owner>
         <summary>Share your bookshelf with others.</summary>
         <release-date>2004-05-20</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="0.4d2"/>
-        <requires url="acs-kernel" version="5.2.0d2"/>
+        <provides url="bookshelf" version="0.4d3"/>
+        <requires url="acs-kernel" version="5.2.3"/>
         <callbacks>
             <callback type="after-install"  proc="bookshelf::install::package_install"/>
             <callback type="before-uninstall"  proc="bookshelf::install::package_uninstall"/>
Index: openacs-4/packages/bookshelf/sql/postgresql/bookshelf-books-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/sql/postgresql/bookshelf-books-package-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookshelf/sql/postgresql/bookshelf-books-package-create.sql	29 Jun 2004 10:17:49 -0000	1.4
+++ openacs-4/packages/bookshelf/sql/postgresql/bookshelf-books-package-create.sql	18 Feb 2007 16:56:31 -0000	1.5
@@ -62,7 +62,7 @@
         v_creation_date,
         p_creation_user,
         p_creation_ip,
-        coalesce(p_context_id, p_package_id),
+        p_package_id,
         ''t'',
         p_book_title,
         p_package_id
Index: openacs-4/packages/bookshelf/sql/postgresql/upgrade/upgrade-0.4d2-0.4d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/sql/postgresql/upgrade/upgrade-0.4d2-0.4d3.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/bookshelf/sql/postgresql/upgrade/upgrade-0.4d2-0.4d3.sql	18 Feb 2007 16:56:31 -0000	1.1
@@ -0,0 +1,73 @@
+create or replace function bookshelf_book__new (
+  integer, -- book_id
+  varchar, -- object_type
+  integer, -- package_id
+  varchar, -- isbn
+  text,    -- book_author
+  text,    -- book_title
+  text,    -- main_entry
+  text,    -- main_entry_mime_type
+  text,    -- additional_entry
+  text,    -- additional_entry_mime_type
+  text,    -- excerpt
+  varchar, -- publish_status
+  varchar, -- read_status
+  date,    -- creation_date
+  integer, -- creation_user
+  varchar  -- creation_ip       
+)
+returns integer as '
+declare
+    p_book_id                       alias for $1;
+    p_object_type                   alias for $2;
+    p_package_id                    alias for $3;
+    p_isbn                          alias for $4;
+    p_book_author                   alias for $5;
+    p_book_title                    alias for $6;
+    p_main_entry                    alias for $7;
+    p_main_entry_mime_type          alias for $8;
+    p_additional_entry              alias for $9;
+    p_additional_entry_mime_type    alias for $10;
+    p_excerpt                       alias for $11;
+    p_publish_status                alias for $12;
+    p_read_status                   alias for $13;
+    p_creation_date                 alias for $14;
+    p_creation_user                 alias for $15;
+    p_creation_ip                   alias for $16;
+    v_book_id                       integer;
+    v_book_no                       integer;
+    v_creation_date                 date;
+begin
+    if p_creation_date is null then
+        v_creation_date := now();
+    else
+        v_creation_date := p_creation_date;
+    end if;
+
+    v_book_id := acs_object__new(
+        p_book_id,
+        p_object_type,
+        v_creation_date,
+        p_creation_user,
+        p_creation_ip,
+        p_package_id,
+        ''t'',
+        p_book_title,
+        p_package_id
+    );
+
+    select coalesce(max(book_no),0) + 1
+    into   v_book_no
+    from   bookshelf_books
+    where  package_id = p_package_id;
+
+    insert into bookshelf_books
+    (book_id, book_no, isbn, book_author, book_title, main_entry, main_entry_mime_type, additional_entry, 
+     additional_entry_mime_type, excerpt, publish_status, read_status, package_id)
+    values
+    (v_book_id, v_book_no, p_isbn, p_book_author, p_book_title, p_main_entry, p_main_entry_mime_type, p_additional_entry, 
+     p_additional_entry_mime_type, p_excerpt, p_publish_status, p_read_status, p_package_id);
+
+    return v_book_id;
+end;
+' language 'plpgsql';