Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v
diff -u -r1.25.2.2 -r1.25.2.3
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	5 Jan 2005 12:33:45 -0000	1.25.2.2
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	7 Jan 2005 01:19:55 -0000	1.25.2.3
@@ -1182,28 +1182,17 @@
     @author Peter Marklund
 } {
 
-    # THIS IS AN UGLY HACK TO GET IT WORKING AGAIN. Once keywords work with the CR someone can clean it up and get the SQL out of here :)
-
     if {![db_0or1row already_there {select 1 from bt_projects where  project_id = :project_id} ] } {
 	if [db_0or1row instance_info {select p.instance_name, o.creation_user, o.creation_ip from apm_packages p join acs_objects o on (p.package_id = o.object_id) where  p.package_id = :project_id }] {
 	    set folder_id [content::folder::new -name "bug_tracker_$project_id" -package_id $project_id]
 	    content::folder::register_content_type -folder_id $folder_id -content_type {bt_bug_revision} -include_subtypes t
 	    
-	    # set keyword_I [content::keyword::new -heading "$instance_name"]
-	    set keyword_id [db_1row keyword "select content_keyword__new(
-        :instance_name,                -- heading
-        null,                           -- description
-        null,                           -- parent_id
-        null,                           -- keyword_id
-        current_timestamp,              -- creation_date
-        :creation_user,                -- creation_user
-        :creation_ip,                  -- creation_ip
-        'content_keyword'             -- object_type
-    )"]
+	    set keyword_id [content::keyword::new -heading "$instance_name"]
 	    
 	    # Inserts into bt_projects
-	    db_dml bt_projects_insert {insert into bt_projects (project_id, folder_id, root_keyword_id) values (:project_id, :folder_id, :keyword_id)}
-	    db_dml bt_components_insert {insert into bt_components (component_id, project_id, component_name) select acs_object_id_seq.nextval, :project_id, 'General'}
+	    set component_id [db_nextval acs_object_id_seq]
+	    db_dml bt_projects_insert {}
+	    db_dml bt_components_insert {}
 	}
     }
 }
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql	7 Nov 2003 13:15:49 -0000	1.3
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.xql	7 Jan 2005 01:19:55 -0000	1.3.4.1
@@ -160,13 +160,23 @@
     </querytext>
 </fullquery>
 
-<fullquery name="bug_tracker::project_delete.min_bug_id">
+<fullquery name="bug_tracker::project_new.bt_projects_insert">
     <querytext>
-        select min(bug_id)
-        from   bt_bugs
-        where  project_id = :project_id
+      insert into bt_projects
+        (project_id, folder_id, root_keyword_id)
+       values
+         (:project_id, :folder_id, :keyword_id)
     </querytext>
 </fullquery>
 
+<fullquery name="bug_tracker::project_new.bt_components_insert">
+    <querytext>
+      insert into bt_components
+        (component_id, project_id, component_name)
+      values
+        (:component_id, :project_id, 'General')
+    </querytext>
+</fullquery>
+
  
 </queryset>