Index: openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql 14 May 2004 09:34:37 -0000 1.2 +++ openacs-4/packages/assessment/sql/postgresql/assessment-drop.sql 21 Jul 2004 10:21:20 -0000 1.3 @@ -1,4 +1,3 @@ -drop table as_item_choice_map; drop table as_item_choices; drop table as_item_attributes; drop table as_item_localized; Index: openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql 20 Jul 2004 18:11:15 -0000 1.1 +++ openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql 21 Jul 2004 10:21:20 -0000 1.2 @@ -64,12 +64,17 @@ check (value <= 100) ); -create table as_item_choice_map ( +create table as_item_help_map ( as_item_id integer - constraint as_item_choice_map_item_id_fk + constraint as_item_help_map_as_item_id_fk references as_items (as_item_id), - choice_id integer - constraint as_item_choice_map_choice_id_fk - references as_item_choices (choice_id), + message_id integer + constraint as_item_help_map_message_id_fk + references as_messages (message_id), sort_order integer ); + +create table as_messages ( + message_id integer, + message varchar(500) +); Index: openacs-4/packages/assessment/tcl/assessment-qti-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/Attic/assessment-qti-procs.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/assessment/tcl/assessment-qti-procs.tcl 20 Jul 2004 18:11:15 -0000 1.13 +++ openacs-4/packages/assessment/tcl/assessment-qti-procs.tcl 21 Jul 2004 10:21:21 -0000 1.14 @@ -91,7 +91,7 @@ set itemNodes [$qtiNode selectNodes {item}] foreach item $itemNodes { - # Order of the item_choices (as_item_choice_map) + # Order of the item_choices set sort_order 0 set as_items__name [$item getAttribute {title}] set objectivesNodes [$item selectNodes {objectives}] @@ -136,7 +136,6 @@ # Insert as_item_choice in the CR (and as_item_choices table) getting the revision_id (choice_id) set as_items_choices__choice_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name $as_item_choices__ident -title $as_item_choices__choice_text ] set choice_id [content::revision::new -item_id $as_items_choices__choice_id -content_type {as_item_choices} -title $as_item_choices__choice_text ] - db_dml as_item_choice_map_insert {} # order of the item_choices incr sort_order } @@ -168,7 +167,6 @@ # Insert as_item_choice in the CR (and as_item_choices table) getting the revision_id (choice_id) set as_items_choices__choice_id [content::item::new -parent_id $folder_id -content_type {as_item_choices} -name $as_item_choices__ident -title $as_item_choices__choice_text ] set choice_id [content::revision::new -item_id $as_items_choices__choice_id -content_type {as_item_choices} -title $as_item_choices__choice_text ] - db_dml as_item_choice_map_insert {} # order of the item_choices incr sort_order }