Index: openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql	26 Nov 2004 20:44:54 -0000	1.1
+++ openacs-4/packages/assessment/sql/oracle/assessment-item-type-create.sql	6 Dec 2004 12:06:56 -0000	1.2
@@ -8,17 +8,17 @@
 -- Multiple Choice Item 
 create table as_item_type_mc (
 	as_item_type_id		integer
-				constraint as_item_type_mc_as_item_type_id_pk
+				constraint as_item_type_mc_type_id_pk
 				primary key
-				constraint as_item_type_mc_as_item_type_id_fk
+				constraint as_item_type_mc_type_id_fk
 				references cr_revisions(revision_id),
 	-- (number of correct matches / number of total matches) *100% points. All or nothing will either give 100%, if all correct answers are given, or 0% else.
 	increasing_p		char(1) default 'f'
-				constraint as_item_type_mc_increasing_p_ck
+				constraint as_item_type_mc_incr_p_ck
 				check (increasing_p in ('t','f')),
 	-- if a negative percentage is allowed
 	allow_negative_p	char(1) default 'f'
-				constraint as_item_type_mc_allow_negative_p_ck
+				constraint as_item_type_mc_neg_p_ck
 				check (allow_negative_p in ('t','f')),
 	-- number of correct options 
 	num_correct_answers	integer,
@@ -29,9 +29,9 @@
 -- Open Question Item
 create table as_item_type_oq (
 	as_item_type_id		integer
-				constraint as_item_type_oq_as_item_type_id_pk
+				constraint as_item_type_oq_type_id_pk
 				primary key
-				constraint as_item_type_oq_as_item_type_id_fk
+				constraint as_item_type_oq_type_id_fk
 				references cr_revisions(revision_id),
 	-- the content of this field will be prefilled in the response of the user taking the survey
 	default_value		varchar(500),
@@ -42,9 +42,9 @@
 -- Radiobutton display type
 create table as_item_display_rb (
 	as_item_display_id	integer
-				constraint as_item_display_rb_as_item_display_id_pk
+				constraint as_item_display_rb_displ_id_pk
 				primary key
-				constraint as_item_display_rb_as_item_display_id_fk
+				constraint as_item_display_rb_displ_id_fk
 				references cr_revisions(revision_id),
 	-- field to specify other stuff like textarea dimensions 
 	html_display_options	varchar(50),
@@ -61,9 +61,9 @@
 -- Checkbox Display Type
 create table as_item_display_cb (
 	as_item_display_id	integer
-				constraint as_item_display_cb_as_item_display_id_pk
+				constraint as_item_display_cb_displ_id_pk
 				primary key
-				constraint as_item_display_cb_as_item_display_id_fk
+				constraint as_item_display_cb_displ_id_fk
 				references cr_revisions(revision_id),
 	-- field to specify other stuff like textarea dimensions 
 	html_display_options	varchar(50),
@@ -73,7 +73,7 @@
 	choice_label_orientation varchar(20),
 	-- if it is allowed to select multiple values
 	allow_multiple_p	char(1) default 'f'
-				constraint as_item_type_cb_allow_multiple_p_ck
+				constraint as_item_type_cb_multiple_p_ck
 				check (allow_multiple_p in ('t','f')),
 	-- order in which the choices will appear (numerical, alphabetic, randomized or by order of entry)
 	sort_order_type		varchar(20),
@@ -84,9 +84,9 @@
 -- Textbox Display Type
 create table as_item_display_tb (
 	as_item_display_id	integer
-				constraint as_item_display_tb_as_item_display_id_pk
+				constraint as_item_display_tb_displ_id_pk
 				primary key
-				constraint as_item_display_tb_as_item_display_id_fk
+				constraint as_item_display_tb_displ_id_fk
 				references cr_revisions(revision_id),
 	-- field to specify other stuff like textarea dimensions
 	html_display_options	varchar(50),
@@ -99,9 +99,9 @@
 -- ShortAnswer Display Type: multiple textboxes in one item.
 create table as_item_display_sa (
 	as_item_display_id	integer
-				constraint as_item_display_sa_as_item_display_id_pk
+				constraint as_item_display_sa_displ_id_pk
 				primary key
-				constraint as_item_display_sa_as_item_display_id_fk
+				constraint as_item_display_sa_displ_id_fk
 				references cr_revisions(revision_id),
 	-- field to specify other stuff like textarea dimensions
 	html_display_options	varchar(50),
@@ -114,26 +114,26 @@
 -- Short Answer Item
 create table as_item_type_sa (
 	as_item_type_id		integer
-				constraint as_item_type_sa_as_item_type_id_pk
+				constraint as_item_type_sa_type_id_pk
 				primary key
-				constraint as_item_type_sa_as_item_type_id_fk
+				constraint as_item_type_sa_type_id_fk
 				references cr_revisions(revision_id),
 	-- (number of correct matches / number of total matches) *100% points. All or nothing will either give 100%, if all correct answers are given, or 0% else.
 	increasing_p		char(1) default 'f'
-				constraint as_item_type_sa_increasing_p_ck
+				constraint as_item_type_sa_incr_p_ck
 				check (increasing_p in ('t','f')),
 	-- if a negative percentage is allowed
 	allow_negative_p	char(1) default 'f'
-				constraint as_item_type_sa_allow_negative_p_ck
+				constraint as_item_type_sa_neg_p_ck
 				check (allow_negative_p in ('t','f'))	
 );
 
 -- Textarea Display Type: multiple-line typed entry
 create table as_item_display_ta (
 	as_item_display_id	integer
-				constraint as_item_display_ta_as_item_display_id_pk
+				constraint as_item_display_ta_displ_id_pk
 				primary key
-				constraint as_item_display_ta_as_item_display_id_fk
+				constraint as_item_display_ta_displ_id_fk
 				references cr_revisions(revision_id),
 	-- field to specify other stuff like textarea dimensions
 	html_display_options	varchar(50),