Index: openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml,v diff -u -r1.25 -r1.26 --- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml 13 Jul 2006 13:11:43 -0000 1.25 +++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml 20 Jul 2006 16:18:48 -0000 1.26 @@ -333,5 +333,6 @@ waiting When Condition True With Control + With Control? XML Piece Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql 13 Jul 2006 13:11:43 -0000 1.5 +++ openacs-4/packages/imsld/sql/postgresql/imsld-level-a-create.sql 20 Jul 2006 16:18:48 -0000 1.6 @@ -690,16 +690,19 @@ Feedback are items that are mapped to this table with the imsld_feedback_rel.'; create table imsld_classes ( - class_id integer - constraint imsld_cla_fk - references cr_revisions - on delete cascade - constraint imsld_cla_pk - primary key, - method_id integer - constraint imsld_cla_methodid_fk - references cr_items, --imsld_methods - identifier varchar(200) + class_id integer + constraint imsld_cla_fk + references cr_revisions + on delete cascade + constraint imsld_cla_pk + primary key, + method_id integer + constraint imsld_cla_methodid_fk + references cr_items, --imsld_methods + identifier varchar(200), + with_control_p char(1) + check (with_control_p in ('t','f')) + default 'f' ); comment on table imsld_classes is ' Index: openacs-4/packages/imsld/tcl/imsld-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-install-procs.tcl,v diff -u -r1.31 -r1.32 --- openacs-4/packages/imsld/tcl/imsld-install-procs.tcl 13 Jul 2006 13:11:43 -0000 1.31 +++ openacs-4/packages/imsld/tcl/imsld-install-procs.tcl 20 Jul 2006 16:18:49 -0000 1.32 @@ -212,6 +212,7 @@ content::type::attribute::new -content_type imsld_class -attribute_name method_id -datatype number -pretty_name "#imsld.Method_Identifier#" -column_spec "integer" content::type::attribute::new -content_type imsld_class -attribute_name identifier -datatype string -pretty_name "#imsld.lt_IMS-LD_Class_Ideintif#" -column_spec "varchar(200)" + content::type::attribute::new -content_type imsld_class -attribute_name with_control_p -datatype string -pretty_name "#imsld.With_Control_1#" -column_spec "char(1)" ### IMS-LD Content Packaging @@ -773,6 +774,7 @@ # classes content::type::attribute::delete -content_type imsld_class -attribute_name method_id content::type::attribute::delete -content_type imsld_class -attribute_name identifier + content::type::attribute::delete -content_type imsld_class -attribute_name with_control_p ### IMS-LD Content Packaging Index: openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl 19 Jul 2006 15:06:10 -0000 1.8 +++ openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl 20 Jul 2006 16:18:49 -0000 1.9 @@ -478,8 +478,10 @@ # 7. classes db_foreach class { select cla.class_id, - cla.identifier - from imsld_classes cla, imsld_methodsi im + cla.identifier, + cla.with_control_p, + cla.title + from imsld_classesi cla, imsld_methodsi im where cla.method_id = im.item_id and im.imsld_id = :run_imsld_item_id } { @@ -488,7 +490,7 @@ where identifier = :identifier and run_id = :run_id }] } { - set instance_id [package_exec_plsql -var_list [list [list instance_id ""] [list owner_id ""] [list type "class"] [list identifier $identifier] [list run_id $run_id] [list is_visible_p "t"] [list title ""] [list with_control_p ""]] imsld_attribute_instance new] + set instance_id [package_exec_plsql -var_list [list [list instance_id ""] [list owner_id ""] [list type "class"] [list identifier $identifier] [list run_id $run_id] [list is_visible_p "t"] [list title $title] [list with_control_p ""]] imsld_attribute_instance new] } } Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v diff -u -r1.53 -r1.54 --- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 19 Jul 2006 15:06:10 -0000 1.53 +++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 20 Jul 2006 16:18:49 -0000 1.54 @@ -3247,8 +3247,8 @@ set property_nodes_list [$expression selectNodes {//*[local-name()='property-ref']}] foreach property $property_nodes_list { #TODO que funcion la get_property_id con el play_id - set property_id [imsld::get_property_id -identifier [$property getAttribute ref] -play_id $play_id] - relation_add imsld_prop_whct_rel $property_id $when_condition_true_id +# set property_id [imsld::get_property_id -identifier [$property getAttribute ref] -play_id $play_id] +# relation_add imsld_prop_whct_rel $property_id $when_condition_true_id } } @@ -3578,9 +3578,13 @@ @param parent_id Parent folder ID } { set class_identifier [imsld::parse::get_attribute -node $class_node -attr_name class] + set title [imsld::parse::get_attribute -node $class_node -attr_name title] + set with_control_p [imsld::parse::get_attribute -node $class_node -attr_name with-control] set class_id [imsld::item_revision_new -attributes [list [list identifier $class_identifier] \ - [list method_id $method_id]] \ + [list method_id $method_id] \ + [list with_control_p $with_control_p]] \ -content_type imsld_class \ + -title $title \ -parent_id $parent_id] } @@ -4025,8 +4029,8 @@ set property_nodes_list [$imsld_if selectNodes { //*[local-name()='property-ref'] }] foreach property $property_nodes_list { - set property_id [imsld::get_property_id -identifier [$property getAttribute ref] -imsld_id $imsld_id] - #relation_add imsld_prop_cond_rel $property_id $contition_id +# set property_id [imsld::get_property_id -identifier [$property getAttribute ref] -imsld_id $imsld_id] +# relation_add imsld_prop_cond_rel $property_id $contition_id } } }