Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.33.2.30 -r1.33.2.31
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	1 Mar 2005 00:18:42 -0000	1.33.2.30
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	29 Mar 2005 13:50:32 -0000	1.33.2.31
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.1.5" url="http://openacs.org/repository/download/apm/acs-content-repository-5.1.5.apm">
+    <version name="5.1.6d1" url="http://openacs.org/repository/download/apm/acs-content-repository-5.1.6d1.apm">
         <owner url="mailto:dcwickstrom@earthlink.net">Dan Wickstrom</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2005-02-28</release-date>
@@ -17,13 +17,16 @@
          other CMS backing functionality.  Utilized by Bug Tracker, File Storage, and other packages.
         </description>
 
-        <provides url="acs-content-repository" version="5.1.5"/>
+        <provides url="acs-content-repository" version="5.1.6d1"/>
         <requires url="acs-kernel" version="5.1.0"/>
         <requires url="acs-service-contract" version="5.1.0"/>
         <requires url="search" version="5.1.0"/>
 
         <callbacks>
+            <callback type="after-install"  proc="cr_after_install"/>
+            <callback type="after-upgrade"  proc="cr_after_upgrade"/>
         </callbacks>
+
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TemplateRoot"  default="templates" description="The directory to which templates are published and from where they are retrieved when a page is served. If the value does not start with a '/', it is taken to be relative to [acs_root_dir]. Packages that use the content-repository can override this setting by defining their own TemplateRoot parameter." section_name="templates"/>
         </parameters>
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql,v
diff -u -r1.21.4.1 -r1.21.4.2
--- openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql	6 Sep 2004 16:43:47 -0000	1.21.4.1
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-create.sql	29 Mar 2005 13:51:38 -0000	1.21.4.2
@@ -883,3 +883,55 @@
 end;
 /
 show errors
+
+
+-- Create the default templates
+declare
+  v_item_id integer;
+  v_revision_id integer;
+begin
+
+  select acs_object_id_seq.nextval into v_item_id from dual;
+
+  v_item_id := content_template.new (
+    name	=> 'default_template',
+    parent_id 	=> -200,
+    template_id	=> v_item_id
+  );
+
+  v_revision_id := content_revision.new (
+    title	=> 'template',
+    mime_type	=> 'text/html',
+    item_id	=> v_item_id
+  );
+
+  update 
+    cr_items
+  set 
+    live_revision = v_revision_id
+  where 
+    item_id = v_item_id;
+
+  content_type.register_template (
+    content_type	=> 'content_revision',
+    template_id		=> v_item_id,
+    use_context		=> 'public',
+    is_default		=> 't'
+  );
+
+  content_type.register_template (
+    content_type	=> 'image',
+    template_id		=> v_item_id,
+    use_context		=> 'public',
+    is_default		=> 't'
+  );
+
+  content_type.register_template (
+    content_type	=> 'content_template',
+    template_id		=> v_item_id,
+    use_context		=> 'public',
+    is_default		=> 't'
+  );
+end;
+/
+show errors
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.5-5.1.6d1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql	13 Feb 2003 14:42:53 -0000	1.4
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs-oracle.xql	29 Mar 2005 13:50:33 -0000	1.4.2.1
@@ -13,4 +13,48 @@
       </querytext>
 </fullquery>
 
+<fullquery name="cr_after_install.get_template_id">
+      <querytext>
+
+		select live_revision as revision_id
+		from cr_items
+		where name = 'default_template'
+		and parent_id = -200
+
+      </querytext>
+</fullquery>
+
+<fullquery name="cr_after_install.update_default_template">
+      <querytext>
+
+		update cr_revisions
+		set content = empty_blob()
+		where revision_id = :revision_id
+		returning content into :1
+
+      </querytext>
+</fullquery>
+
+<fullquery name="cr_after_upgrade.get_template_id">
+      <querytext>
+
+		select live_revision as revision_id
+		from cr_items
+		where name = 'default_template'
+		and parent_id = -200
+
+      </querytext>
+</fullquery>
+
+<fullquery name="cr_after_upgrade.update_default_template">
+      <querytext>
+
+		update cr_revisions
+		set content = empty_blob()
+		where revision_id = :revision_id
+		returning content into :1
+
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl,v
diff -u -r1.5 -r1.5.4.1
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl	28 Oct 2003 22:30:23 -0000	1.5
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl	29 Mar 2005 13:50:33 -0000	1.5.4.1
@@ -67,3 +67,35 @@
         }
     }
 }
+
+ad_proc -private cr_after_install {} {
+    if {[db_type] == "oracle"} {
+	set default_template "<html><body><content></body></html>"
+
+	db_transaction {
+	    db_1row get_template_id {}
+	    db_dml update_default_template {} -blobs [list $default_template]
+	}
+    }
+}
+
+ad_proc -public cr_after_upgrade {
+    {-from_version_name:required}
+    {-to_version_name:required}
+} {
+    apm_upgrade_logic \
+        -from_version_name $from_version_name \
+        -to_version_name $to_version_name \
+        -spec {
+            5.1.5 5.1.6d1 {
+		if {[db_type] == "oracle"} {
+		    set default_template "<html><body><content></body></html>"
+
+		    db_transaction {
+			db_1row get_template_id {}
+			db_dml update_default_template {} -blobs [list $default_template]
+		    }
+		}
+	    }
+	}
+}
Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -r1.16.2.8 -r1.16.2.9
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	12 Feb 2005 15:35:34 -0000	1.16.2.8
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	29 Mar 2005 13:50:33 -0000	1.16.2.9
@@ -212,7 +212,11 @@
   variable template_path
 
   # Get the template 
-  set template_found_p [db_0or1row get_template_url "" -column_array info]
+  if {[catch {
+      set template_found_p [db_0or1row get_template_url "" -column_array info]
+  }]} {
+      set template_found_p 0
+  }
 
   if { !$template_found_p || [string equal $info(template_url) {}] } { 
       ns_log notice "content::init: No template found to render content item $item_id in context '$context'"