Index: openacs-4/packages/lorsm/www/admin/md/addmd.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/addmd.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/addmd.tcl 12 Dec 2008 14:25:36 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/addmd.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -21,9 +21,9 @@ # set context & title set context [list \ - [list [export_vars -base "." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - "[_ lorsm.lt_Edit_Metadata_Schema_]"] + [list [export_vars -base "." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + "[_ lorsm.lt_Edit_Metadata_Schema_]"] set title "[_ lorsm.lt_AddEdit_MD_Schema_and]" Index: openacs-4/packages/lorsm/www/admin/md/educationalmd.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -3,63 +3,63 @@ - select '[' || int_type_s || '] ' || int_type_v as intt + select '(' || int_type_s || ') ' || int_type_v as intt from ims_md_educational where ims_md_id = :ims_md_id - select '[' || lrt_s || '] ' || lrt_v as lrt + select '(' || lrt_s || ') ' || lrt_v as lrt from ims_md_educational_lrt where ims_md_id = :ims_md_id - select '[' || int_level_s || '] ' || int_level_v as intl + select '(' || int_level_s || ') ' || int_level_v as intl from ims_md_educational where ims_md_id = :ims_md_id - select '[' || sem_density_s || '] ' || sem_density_v as semd + select '(' || sem_density_s || ') ' || sem_density_v as semd from ims_md_educational where ims_md_id = :ims_md_id - select '[' || ieur_s || '] ' || ieur_v as ieur + select '(' || ieur_s || ') ' || ieur_v as ieur from ims_md_educational_ieur where ims_md_id = :ims_md_id - select '[' || context_s || '] ' || context_v as context + select '(' || context_s || ') ' || context_v as context from ims_md_educational_context where ims_md_id = :ims_md_id - select '[' || tar_l || '] ' || tar_s as tar + select '(' || tar_l || ') ' || tar_s as tar from ims_md_educational_tar where ims_md_id = :ims_md_id - select '[' || difficulty_s || '] ' || difficulty_v as diff + select '(' || difficulty_s || ') ' || difficulty_v as diff from ims_md_educational where ims_md_id = :ims_md_id @@ -68,15 +68,15 @@ select type_lrn_time as tlt, - '[' || type_lrn_time_l || '] ' || type_lrn_time_s as tlt_ls + '(' || type_lrn_time_l || ') ' || type_lrn_time_s as tlt_ls from ims_md_educational where ims_md_id = :ims_md_id - select '[' || descrip_l || '] ' || descrip_s as desc + select '(' || descrip_l || ') ' || descrip_s as desc from ims_md_educational_descrip where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/index.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/index.adp 17 Nov 2008 13:36:44 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/index.adp 16 Apr 2010 21:35:12 -0000 1.4 @@ -4,16 +4,6 @@ -

- - #lorsm.You_can# - #lorsm.lt_upload_a_XML_LOM_meta# - #lorsm.lt_to_addchange_the_meta# - - -
- - #lorsm.lt_Heres_a_link_to_the_a#

@@ -24,4 +14,3 @@ - Index: openacs-4/packages/lorsm/www/admin/md/lifecyclemd.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/lifecyclemd.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/lifecyclemd.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/lifecyclemd.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -19,9 +19,9 @@ - select lfc.role_v || ' ' || '[' || lfc.role_s || ']' as role, + select lfc.role_v || ' ' || '(' || lfc.role_s || ')' as role, lfce.entity, lfc.cont_date, - '[' || lfc.cont_date_l || ']' || ' ' || lfc.cont_date_s as cont_date_ls + '(' || lfc.cont_date_l || ')' || ' ' || lfc.cont_date_s as cont_date_ls from ims_md_life_cycle_contrib lfc, ims_md_life_cycle_contrib_entity lfce where lfc.ims_md_lf_cont_id = lfce.ims_md_lf_cont_id and lfc.ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/metamd.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/metamd.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/metamd.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -24,12 +24,12 @@ -actions [list "[_ lorsm.Add_Catalog-Entry]" \ [export_vars -base metamd/meta_cata {ims_md_id}] \ "[_ lorsm.lt_Add_another_Catalog-E]"] \ - -html { style "width: 100%; align: right;" } \ -elements { catalog { label "[_ lorsm.Catalog_1]" } entry_ls { label "[_ lorsm.Language_Entry]" } } + db_multirow d_md_cata select_md_cata {} @@ -41,7 +41,6 @@ -actions [list "[_ lorsm.Add_Contributors]" \ [export_vars -base metamd/meta_cont {ims_md_id}] \ "[_ lorsm.lt_Add_another_Contribut]"] \ - -html { style "width: 100%; align:right; " } \ -elements { role { label "[_ lorsm.Role]" } Index: openacs-4/packages/lorsm/www/admin/md/metamd.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/metamd.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/metamd.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -3,17 +3,17 @@ - select catalog, '[' || entry_l || ']' || ' ' || entry_s as entry_ls + select catalog, '(' || entry_l || ')' || ' ' || entry_s as entry_ls from ims_md_metadata_cata where ims_md_id = :ims_md_id - select mdc.role_v || ' ' || '[' || mdc.role_s || ']' as role, + select mdc.role_v || ' ' || '(' || mdc.role_s || ')' as role, mdce.entity, mdc.cont_date, - '[' || mdc.cont_date_l || ']' || ' ' || mdc.cont_date_s as cont_date_ls + '(' || mdc.cont_date_l || ')' || ' ' || mdc.cont_date_s as cont_date_ls from ims_md_metadata_contrib mdc, ims_md_metadata_contrib_entity mdce where mdc.ims_md_md_cont_id = mdce.ims_md_md_cont_id and mdc.ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/rightsmd.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/rightsmd.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -3,23 +3,23 @@ - select '[' || cost_s || '] ' || cost_v as cost + select '(' || cost_s || ') ' || cost_v as cost from ims_md_rights where ims_md_id = :ims_md_id - select '[' || caor_s || '] ' || caor_v as caor + select '(' || caor_s || ') ' || caor_v as caor from ims_md_rights where ims_md_id = :ims_md_id - select '[' || descrip_l || '] ' || descrip_s as desc + select '(' || descrip_l || ') ' || descrip_s as desc from ims_md_rights where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/technicalmd.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -43,7 +43,7 @@ -elements { t_size_bytes { label "" } } -db_multirow d_te_size {} +db_multirow d_te_size select_te_size {} # Technical Location template::list::create \ Index: openacs-4/packages/lorsm/www/admin/md/technicalmd.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/technicalmd.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -1,7 +1,7 @@ - + select format from ims_md_technical_format @@ -27,24 +27,24 @@ - select '[' || type_s || ']' || ' ' || type_v as type, - '[' || name_s || ']' || ' ' || name_v as name, min_version, max_version + select '(' || type_s || ')' || ' ' || type_v as type, + '(' || name_s || ')' || ' ' || name_v as name, min_version, max_version from ims_md_technical_requirement where ims_md_id = :ims_md_id - select '[' || instl_rmrks_l || ']' || ' ' || instl_rmrks_s as instl_rmrks + select '(' || instl_rmrks_l || ')' || ' ' || instl_rmrks_s as instl_rmrks from ims_md_technical where ims_md_id = :ims_md_id - select '[' || otr_plt_l || ']' || ' ' || otr_plt_s as otr_plt + select '(' || otr_plt_l || ')' || ' ' || otr_plt_s as otr_plt from ims_md_technical where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.tcl 12 Dec 2008 14:25:37 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -13,11 +13,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - [list [export_vars -base "../annotationmd" ims_md_id] \ - "[_ lorsm.Annotation_MD]"] \ - "[_ lorsm.Annotation_Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../annotationmd" ims_md_id] \ + "[_ lorsm.Annotation_MD]"] \ + "[_ lorsm.Annotation_Entry]"] set title "[_ lorsm.Annotation_MD]" Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -11,15 +11,15 @@ - select date, '[' || date_l || '] ' || date_s as datels + select date, '(' || date_l || ') ' || date_s as datels from ims_md_annotation where ims_md_an_id = :ims_md_an_id - select '[' || descrip_l || '] ' || descrip_s as desc + select '(' || descrip_l || ') ' || descrip_s as desc from ims_md_annotation_descrip where ims_md_an_id = :ims_md_an_id Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_add.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_add.tcl 12 Dec 2008 14:25:37 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_add.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -18,11 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] - "[_ lorsm.IMS_Metadata_Editor]"] \ - [list [export_vars -base "../annotationmd" ims_md_id] \ - "[_ lorsm.Annotation_MD]"] \ - "[_ lorsm.Annotation_Entry]"] + [list [export_vars -base "../" ims_md_id] \ + [_ lorsm.IMS_Metadata_Editor]] \ + [list [export_vars -base "../annotationmd" ims_md_id] \ + [_ lorsm.Annotation_MD]] \ + [_ lorsm.Annotation_Entry]] set title "[_ lorsm.lt_Add_Annotation_MD_Ent]" Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -19,13 +19,13 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - [list [export_vars -base "../annotationmd" ims_md_id] \ - "[_ lorsm.Annotation_MD]"] \ - [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ - "[_ lorsm.Annotation_Entry]"] \ - "[_ lorsm.AddEdit_Date]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../annotationmd" ims_md_id] \ + "[_ lorsm.Annotation_MD]"] \ + [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ + "[_ lorsm.Annotation_Entry]"] \ + "[_ lorsm.AddEdit_Date]"] set title "[_ lorsm.lt_Edit_Annotation_MD_Da]" @@ -35,6 +35,7 @@ -name annotationmd_date \ -cancel_url annotation?ims_md_id=$ims_md_id&ims_md_an_id=$ims_md_an_id \ -mode edit \ + -select_query_name annotationmd_date_ad_form \ -form { ims_md_an_id:key(ims_md_annotation_seq) @@ -55,8 +56,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name annotationmd_date_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_date.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -13,7 +13,7 @@ - select date, '[' || date_l || '] ' || date_s as datels, ims_md_an_id, ims_md_id + select date, '(' || date_l || ') ' || date_s as datels, ims_md_an_id, ims_md_id from ims_md_annotation where ims_md_an_id = :ims_md_an_id Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,24 +21,24 @@ # set context & title if { ![ad_form_new_p -key ims_md_an_de_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - [list [export_vars -base "../annotationmd" ims_md_id] \ - "[_ lorsm.Annotation_MD]"] \ - [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ - "[_ lorsm.Annotation_Entry]"] \ - "[_ lorsm.Edit_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../annotationmd" ims_md_id] \ + "[_ lorsm.Annotation_MD]"] \ + [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ + "[_ lorsm.Annotation_Entry]"] \ + "[_ lorsm.Edit_Description]"] set title "Edit Annotation MD Description" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - [list [export_vars -base "../annotationmd" ims_md_id] \ - "[_ lorsm.Annotation_MD]"] \ - [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ - "[_ lorsm.Annotation_Entry]"] \ - "[_ lorsm.Add_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../annotationmd" ims_md_id] \ + "[_ lorsm.Annotation_MD]"] \ + [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ + "[_ lorsm.Annotation_Entry]"] \ + "[_ lorsm.Add_Description]"] set title "[_ lorsm.lt_Add_Annotation_MD_Des]" } @@ -48,6 +48,7 @@ -name annotationmd_desc \ -cancel_url annotation?ims_md_id=$ims_md_id&ims_md_an_id=$ims_md_an_id \ -mode edit \ + -select_query_name annotationmd_desc_ad_form \ -form { ims_md_an_de_id:key(ims_md_annotation_descrip_seq) @@ -65,8 +66,6 @@ {ims_md_an_id:text(hidden) {value $ims_md_an_id}} - } -select_query_name annotationmd_desc_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_desc.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || ande.descrip_l || '] ' || ande.descrip_s as desc, + select '(' || ande.descrip_l || ') ' || ande.descrip_s as desc, ande.ims_md_an_de_id, an.ims_md_an_id, an.ims_md_id from ims_md_annotation_descrip ande, ims_md_annotation an where ande.ims_md_an_id = an.ims_md_an_id Index: openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_ent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_ent.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_ent.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/annotationmd/annotation_ent.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -19,13 +19,13 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - [list [export_vars -base "../annotationmd" ims_md_id] \ - "[_ lorsm.Annotation_MD]"] \ - [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ - "[_ lorsm.Annotation_Entry]"] \ - "[_ lorsm.AddEdit_Entity]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../annotationmd" ims_md_id] \ + "[_ lorsm.Annotation_MD]"] \ + [list [export_vars -base "annotation" {ims_md_id ims_md_an_id}] \ + "[_ lorsm.Annotation_Entry]"] \ + "[_ lorsm.AddEdit_Entity]"] set title "[_ lorsm.lt_Edit_Annotation_MD_En]" @@ -35,6 +35,7 @@ -name annotationmd_ent \ -cancel_url annotation?ims_md_id=$ims_md_id&ims_md_an_id=$ims_md_an_id \ -mode edit \ + -select_query_name annotationmd_ent_ad_form \ -form { ims_md_an_id:key(ims_md_annotation_seq) @@ -46,8 +47,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name annotationmd_ent_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.tcl 12 Dec 2008 14:25:37 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -13,14 +13,12 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + "[_ lorsm.Classification_Entry]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - "[_ lorsm.Classification_Entry]"] - set title "[_ lorsm.Classification_MD]" # Classification Purpose @@ -32,7 +30,6 @@ [export_vars \ -base classification_pur {ims_md_cl_id ims_md_id}] \ "[_ lorsm.Add_another_Purpose]"] \ - -html { align right style "width: 100%;" } \ -elements { purpose_s { label "" } @@ -51,7 +48,6 @@ -base classification_addpath \ {ims_md_cl_id ims_md_id}] \ "[_ lorsm.lt_Add_another_Taxonomic]"] \ - -html { align right style "width: 100%;" } \ -elements { source { label "" } @@ -75,7 +71,6 @@ -base classification_desc \ {ims_md_cl_id ims_md_id}] \ "[_ lorsm.lt_Add_another_Descripti]"] \ - -html { align right style "width: 100%;" } \ -elements { desc { label "" } @@ -89,11 +84,9 @@ -multirow d_cl_key \ -no_data "[_ lorsm.lt_No_Keywords_Available]" \ -actions [list "[_ lorsm.Add_Keyword]" \ - [export_vars - -base classification_key \ + [export_vars -base classification_key \ {ims_md_cl_id ims_md_id}] \ "[_ lorsm.Add_another_Keyword]"] \ - -html { align right style "width: 100%;" } \ -elements { keyword { label "" } Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -11,7 +11,7 @@ - select '[' || ctp.source_l || '] ' || ctp.source_v as source, + select '(' || ctp.source_l || ') ' || ctp.source_v as source, ctp.ims_md_cl_ta_id, ctp.ims_md_cl_id, cl.ims_md_id from ims_md_classification_taxpath ctp, ims_md_classification cl where ctp.ims_md_cl_id = :ims_md_cl_id @@ -21,15 +21,15 @@ - select '[' || descrip_l || '] ' || descrip_s as desc + select '(' || descrip_l || ') ' || descrip_s as desc from ims_md_classification_descrip where ims_md_cl_id = :ims_md_cl_id - select '[' || keyword_l || '] ' || keyword_s as keyword + select '(' || keyword_l || ') ' || keyword_s as keyword from ims_md_classification_keyword where ims_md_cl_id = :ims_md_cl_id Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.tcl 12 Dec 2008 14:25:37 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -19,19 +19,16 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" \ + {ims_md_id ims_md_cl_id}] \ + "[_ lorsm.Classification_Entry]"] \ + "[_ lorsm.lt_Add_Taxonomic_Path_En]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - "[_ lorsm.lt_Add_Taxonomic_Path_En]"] - set title "[_ lorsm.lt_Add_Classification_MD_1]" # Form Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_addpath.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -1,7 +1,7 @@ - + insert into ims_md_classification_taxpath (ims_md_cl_ta_id, ims_md_cl_id) Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,35 +21,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_cl_de_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../" ims_md_id] [_ lorsm.IMS_Metadata_Editor]] \ + [list [export_vars -base "../classificationmd" ims_md_id] [_ lorsm.Classification_MD]] \ + [list [export_vars -base "classification" {ims_md_id ims_md_cl_id}] [_ lorsm.Classification_Entry]] \ + [_ lorsm.Edit_Description]] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - "[_ lorsm.Edit_Description]"] - set title "[_ lorsm.lt_Edit_Classification_M_4]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] - - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - "[_ lorsm.Add_Description]"] - + [list [export_vars -base ".." ims_md_id] [_ lorsm.IMS_Metadata_Editor]] \ + [list [export_vars -base "../classificationmd" ims_md_id] [_ lorsm.Classification_MD]] \ + [list [export_vars -base "classification" {ims_md_id ims_md_cl_id}] [_ lorsm.Classification_Entry]] \ + [_ lorsm.Add_Description]] + set title "[_ lorsm.lt_Add_Classification_MD_2]" } @@ -59,6 +43,7 @@ -name classificationmd_desc \ -cancel_url classification?ims_md_id=$ims_md_id&ims_md_cl_id=$ims_md_cl_id \ -mode edit \ + -select_query_name classificationmd_desc_ad_form \ -form { ims_md_cl_de_id:key(ims_md_classification_desc_seq) @@ -78,8 +63,6 @@ {ims_md_cl_id:text(hidden) {value $ims_md_cl_id}} - } -select_query_name classificationmd_desc_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_desc.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || clde.descrip_l || '] ' || clde.descrip_s as desc, + select '(' || clde.descrip_l || ') ' || clde.descrip_s as desc, clde.ims_md_cl_de_id, cl.ims_md_cl_id, cl.ims_md_id from ims_md_classification_descrip clde, ims_md_classification cl where clde.ims_md_cl_id = cl.ims_md_cl_id Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,34 +21,29 @@ # set context & title if { ![ad_form_new_p -key ims_md_cl_ke_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" \ + {ims_md_id ims_md_cl_id}] \ + "[_ lorsm.Classification_Entry]"] \ + "[_ lorsm.Edit_Keyword_1]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - "[_ lorsm.Edit_Keyword_1]"] - set title "[_ lorsm.lt_Edit_Classification_M]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" \ + {ims_md_id ims_md_cl_id}] \ + "[_ lorsm.Classification_Entry]"] \ + "[_ lorsm.Add_Keyword]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id}] \ - "[_ lorsm.Classification_Entry]"] - - "[_ lorsm.Add_Keyword]"] set title "[_ lorsm.lt_Add_Classification_MD_3]" } @@ -57,6 +52,7 @@ -name classificationmd_key \ -cancel_url classification?ims_md_id=$ims_md_id&ims_md_cl_id=$ims_md_cl_id \ -mode edit \ + -select_query_name classificationmd_key_ad_form \ -form { ims_md_cl_ke_id:key(ims_md_classification_keyword_seq) @@ -76,8 +72,6 @@ {ims_md_cl_id:text(hidden) {value $ims_md_cl_id}} - } -select_query_name classificationmd_key_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_key.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -30,7 +30,7 @@ - select '[' || kw.keyword_l || '] ' || kw.keyword_s as keyword, + select '(' || kw.keyword_l || ') ' || kw.keyword_s as keyword, kw.ims_md_cl_ke_id, cl.ims_md_cl_id, cl.ims_md_id from ims_md_classification_keyword kw, ims_md_classification cl where kw.ims_md_cl_id = cl.ims_md_cl_id Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_pur.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_pur.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_pur.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_pur.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,18 +20,15 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" {ims_md_id ims_md_cl_id}] \ + "[_ lorsm.Classification_Entry]"] \ + "[_ lorsm.AddEdit_Purpose]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" {ims_md_id ims_md_cl_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - "[_ lorsm.AddEdit_Purpose]"] - set title "[_ lorsm.lt_Edit_Classification_M_1]" @@ -40,6 +37,7 @@ -name classificationmd_pur \ -cancel_url classification?ims_md_id=$ims_md_id&ims_md_cl_id=$ims_md_cl_id \ -mode edit \ + -select_query_name classificationmd_pur_ad_form \ -form { ims_md_cl_id:key(ims_md_classification_seq) @@ -57,8 +55,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name classificationmd_pur_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -22,40 +22,33 @@ # set context & title if { ![ad_form_new_p -key ims_md_cl_ta_ta_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" \ + {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ + "[_ lorsm.Classification_Entry]"] \ + [list [export_vars \ + -base "classification_tpath" \ + {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ + "[_ lorsm.Taxonomic_Paths_2]"] \ + "[_ lorsm.Edit_Taxonomy]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - [list [export_vars \ - -base "classification_tpath" \ - {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ - "[_ lorsm.Taxonomic_Paths_2]"] \ - - "[_ lorsm.Edit_Taxonomy]"] - set title "[_ lorsm.lt_Edit_Classification_M_2]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" \ + {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ + "[_ lorsm.lt_Classification_Entry_]"] \ + "[_ lorsm.Add_Taxonomy]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ - "[_ lorsm.lt_Classification_Entry_]"] \ - - "[_ lorsm.Add_Taxonomy]"] - set title "[_ lorsm.lt_Add_Classification_MD_4]" } @@ -64,6 +57,7 @@ -name classificationmd_taxon \ -cancel_url classification_tpath?ims_md_id=$ims_md_id&ims_md_cl_id=$ims_md_cl_id&ims_md_cl_ta_id=$ims_md_cl_ta_id \ -mode edit \ + -select_query_name classificationmd_taxon_ad_form \ -form { ims_md_cl_ta_ta_id:key(ims_md_classification_taxpath_taxon_seq) @@ -91,8 +85,6 @@ {ims_md_cl_ta_id:text(hidden) {value $ims_md_cl_ta_id}} - } -select_query_name classificationmd_taxon_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_taxon.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -22,7 +22,7 @@ - select ctt.identifier, '[' || ctt.entry_l || '] ' || ctt.entry_s as entry, + select ctt.identifier, '(' || ctt.entry_l || ') ' || ctt.entry_s as entry, ctt.ims_md_cl_ta_id, ctt.ims_md_cl_ta_ta_id, cl.ims_md_cl_id, cl.ims_md_id from ims_md_classification_taxpath_taxon ctt, ims_md_classification cl where ctt.ims_md_cl_ta_id = :ims_md_cl_ta_id Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.tcl 12 Dec 2008 14:25:37 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -14,18 +14,15 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars -base "classification" \ + {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ + "[_ lorsm.Classification_Entry]"] \ + "[_ lorsm.Taxonomic_Paths_1]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars -base "classification" \ - {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ - "[_ lorsm.Classification_Entry]"] \ - - "[_ lorsm.Taxonomic_Paths_1]"] - set title "[_ lorsm.lt_Classification_MD_Tax]" # Classification Taxonomic Path Source Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tpath.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -3,7 +3,7 @@ - select '[' || source_l || '] ' || source_v as source + select '(' || source_l || ') ' || source_v as source from ims_md_classification_taxpath where ims_md_cl_ta_id = :ims_md_cl_ta_id and ims_md_cl_id = :ims_md_cl_id @@ -12,7 +12,7 @@ - select identifier, '[' || entry_l || '] ' || entry_s as entry + select identifier, '(' || entry_l || ') ' || entry_s as entry from ims_md_classification_taxpath_taxon where ims_md_cl_ta_id = :ims_md_cl_ta_id Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,23 +21,19 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../classificationmd" ims_md_id] \ + "[_ lorsm.Classification_MD]"] \ + [list [export_vars \ + -base "classification" \ + {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ + "[_ lorsm.Classification_Entry]"] + [list [export_vars -base "classification_tpath" \ + {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ + "[_ lorsm.Taxonomic_Paths_1]"] \ + "[_ lorsm.AddEdit_Source]"] - [list [export_vars -base "../classificationmd" ims_md_id] \ - "[_ lorsm.Classification_MD]"] \ - - [list [export_vars \ - -base "classification" \ - {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ - "[_ lorsm.Classification_Entry]"] - - [list [export_vars -base "classification_tpath" \ - {ims_md_id ims_md_cl_id ims_md_cl_ta_id}] \ - "[_ lorsm.Taxonomic_Paths_1]"] \ - - "[_ lorsm.AddEdit_Source]"] - set title "[_ lorsm.lt_Edit_Classification_M_3]" @@ -46,6 +42,7 @@ -name classificationmd_tsource \ -cancel_url classification_tpath?ims_md_id=$ims_md_id&ims_md_cl_id=$ims_md_cl_id&ims_md_cl_ta_id=$ims_md_cl_ta_id \ -mode edit \ + -select_query_name classificationmd_tsource_ad_form \ -form { ims_md_cl_ta_id:key(ims_md_classification_taxpath_seq) @@ -63,8 +60,6 @@ {ims_md_cl_id:text(hidden) {value $ims_md_cl_id}} {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name classificationmd_tsource_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/classificationmd/classification_tsource.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -12,7 +12,7 @@ - select '[' || ctp.source_l || '] ' || ctp.source_v as source, ctp.ims_md_cl_ta_id, + select '(' || ctp.source_l || ') ' || ctp.source_v as source, ctp.ims_md_cl_ta_id, ctp.ims_md_cl_id, cl.ims_md_id from ims_md_classification_taxpath ctp, ims_md_classification cl where ctp.ims_md_cl_ta_id = :ims_md_cl_ta_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ed_co_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" im\s_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Edit_Context]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Edit_Context]"] set title "[_ lorsm.lt_Edit_Educational_MD_C]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" im\s_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Add_Context]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Add_Context]"] set title "[_ lorsm.lt_Add_Educational_MD_Co]" } @@ -46,6 +42,7 @@ -name educationalmd_cont \ -cancel_url ../educationalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name educationalmd_cont_ad_form \ -form { ims_md_ed_co_id:key(ims_md_educational_context_seq) @@ -63,8 +60,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name educationalmd_cont_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_cont.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || context_s || '] ' || context_v as context, ims_md_ed_co_id, ims_md_id + select '(' || context_s || ') ' || context_v as context, ims_md_ed_co_id, ims_md_id from ims_md_educational_context where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ed_de_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Edit_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Edit_Description]"] set title "[_ lorsm.lt_Edit_Educational_MD_D]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Add_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Add_Description]"] set title "[_ lorsm.lt_Add_Educational_MD_De]" } @@ -46,6 +42,7 @@ -name educationalmd_desc \ -cancel_url ../educationalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name educationalmd_desc_ad_form \ -form { ims_md_ed_de_id:key(ims_md_educational_descrip_seq) @@ -63,8 +60,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name educationalmd_desc_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_desc.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || descrip_l || '] ' || descrip_s as desc, ims_md_ed_de_id, ims_md_id + select '(' || descrip_l || ') ' || descrip_s as desc, ims_md_ed_de_id, ims_md_id from ims_md_educational_descrip where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,12 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - "[_ lorsm.AddEdit_Difficulty]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.AddEdit_Difficulty]"] set title "[_ lorsm.lt_AddEdit_Educational_M_13]" # Form Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_dif.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -28,7 +28,7 @@ - select '[' || difficulty_s || '] ' || difficulty_v as diff, ims_md_id + select '(' || difficulty_s || ') ' || difficulty_v as diff, ims_md_id from ims_md_educational where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.tcl 12 Dec 2008 14:25:37 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ed_ie_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_Edit_Intended_End_Use]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_Edit_Intended_End_Use]"] set title "[_ lorsm.lt_Edit_Educational_MD_I]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_Add_Intended_End_User]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_Add_Intended_End_User]"] set title "[_ lorsm.lt_Add_Educational_MD_In]" } @@ -45,6 +41,7 @@ -name educationalmd_ieur \ -cancel_url ../educationalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name educationalmd_ieur_ad_form \ -form { ims_md_ed_ie_id:key(ims_md_educational_ieur_seq) @@ -62,8 +59,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name educationalmd_ieur_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.xql 12 Dec 2008 14:25:37 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_ieur.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || ieur_s || '] ' || ieur_v as ieur, ims_md_ed_ie_id, ims_md_id + select '(' || ieur_s || ') ' || ieur_v as ieur, ims_md_ed_ie_id, ims_md_id from ims_md_educational_ieur where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" \im\\\s_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_AddEdit_Interactivity]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_AddEdit_Interactivity]"] set title "[_ lorsm.lt_Edit_Educational_MD_I_1]" # Form Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intl.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || int_level_s || '] ' || int_level_v as intl, ims_md_id + select '(' || int_level_s || ') ' || int_level_v as intl, ims_md_id from ims_md_educational where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_AddEdit_Interactivity]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_AddEdit_Interactivity]"] set title "[_ lorsm.lt_AddEdit_Educational_M_16]" # Form Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_intt.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || int_type_s || '] ' || int_type_v as intt, ims_md_id + select '(' || int_type_s || ') ' || int_type_v as intt, ims_md_id from ims_md_educational where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lang.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lang.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lang.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lang.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ed_la_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Edit_Language]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Edit_Language]"] set title "[_ lorsm.lt_Edit_Educational_MD_L]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Add_Language]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Add_Language]"] set title "[_ lorsm.lt_Add_Educational_MD_La]" } @@ -46,6 +42,7 @@ -name educationalmd_lang \ -cancel_url ../educationalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name educationalmd_lang_ad_form \ -form { ims_md_ed_la_id:key(ims_md_educational_lang_seq) @@ -57,8 +54,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name educationalmd_lang_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,23 +18,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ed_lr_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" \i\m\\\s_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_Edit_Learning_Resourc]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_Edit_Learning_Resourc]"] set title "[_ lorsm.lt_Edit_Educational_MD_L_1]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor] "] \ - - [list [export_vars -base "../educationalmd" \i\m\\\s_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_Add_Learning_Resource]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor] "] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_Add_Learning_Resource]"] set title "[_ lorsm.lt_Add_Educational_MD_Le]" } @@ -44,6 +40,7 @@ -name educationalmd_lrt \ -cancel_url ../educationalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name educationalmd_ltr_ad_form \ -form { ims_md_ed_lr_id:key(ims_md_educational_lrt_seq) @@ -61,8 +58,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name educationalmd_ltr_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_lrt.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || lrt_s || '] ' || lrt_v as lrt, ims_md_ed_lr_id, ims_md_id + select '(' || lrt_s || ') ' || lrt_v as lrt, ims_md_ed_lr_id, ims_md_id from ims_md_educational_lrt where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -19,12 +19,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - "[_ lorsm.lt_AddEdit_Semantic_Dens]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_AddEdit_Semantic_Dens]"] set title "[_ lorsm.lt_Edit_Educational_MD_S]" # Form Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_semd.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || sem_density_s || '] ' || sem_density_v as semd, ims_md_id + select '(' || sem_density_s || ') ' || sem_density_v as semd, ims_md_id from ims_md_educational where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ed_ta_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_Edit_Typical_Age_Rang]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_Edit_Typical_Age_Rang]"] set title "[_ lorsm.lt_Edit_Educational_MD_T]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.Add_Typical_Age_Rang]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.Add_Typical_Age_Rang]"] set title "[_ lorsm.lt_Add_Educational_MD_Ty]" } @@ -45,6 +41,7 @@ -name educationalmd_tar \ -cancel_url ../educationalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name educationalmd_tar_ad_form \ -form { ims_md_ed_ta_id:key(ims_md_educational_tar_seq) @@ -62,8 +59,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name educationalmd_tar_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tar.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -30,7 +30,7 @@ - select '[' || tar_l || '] ' || tar_s as tar, ims_md_ed_ta_id, ims_md_id + select '(' || tar_l || ') ' || tar_s as tar, ims_md_ed_ta_id, ims_md_id from ims_md_educational_tar where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../educationalmd" ims_md_id] \ - "[_ lorsm.Educational_MD]"] \ - - "[_ lorsm.lt_AddEdit_Typical_Learn]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../educationalmd" ims_md_id] \ + "[_ lorsm.Educational_MD]"] \ + "[_ lorsm.lt_AddEdit_Typical_Learn]"] set title "[_ lorsm.lt_Edit_Educational_MD_T_1]" # Form Index: openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/educationalmd/educational_tlt.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -30,7 +30,7 @@ - select type_lrn_time as tlt, '[' || type_lrn_time_l || '] ' || type_lrn_time_s as tlt_ls, ims_md_id + select type_lrn_time as tlt, '(' || type_lrn_time_l || ') ' || type_lrn_time_s as tlt_ls, ims_md_id from ims_md_educational where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_aggl.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_aggl.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_aggl.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_aggl.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\\\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.lt_Edit_Aggregation_Leve]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.lt_Edit_Aggregation_Leve]"] set title "[_ lorsm.lt_Edit_General_MD_Aggre]" # Form Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_cata.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_cata.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_cata.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_cata.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -20,22 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ge_cata_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Catalog-Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Catalog-Entry]"] set title "[_ lorsm.lt_Edit_General_MD_Catal]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\s_md_id] \ - "[_ lorsm.General_MD]"] \ - "[_ lorsm.Add_Catalog-Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Add_Catalog-Entry]"] set title "[_ lorsm.lt_Add_General_MD_Catalo]" } @@ -44,6 +41,7 @@ -name generalmd_cata \ -cancel_url ../generalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name generalmd_cata_ad_form \ -form { ims_md_ge_cata_id:key(ims_md_general_cata_seq) @@ -67,8 +65,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name generalmd_cata_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_cover.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_cover.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_cover.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_cover.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ge_cove_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Coverage]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Coverage]"] set title "[_ lorsm.lt_Edit_General_MD_Cover]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Add_Coverage]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Add_Coverage]"] set title "[_ lorsm.lt_Add_General_MD_Covera]" } @@ -45,6 +41,7 @@ -name generalmd_cover \ -cancel_url ../generalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name generalmd_cover_ad_form \ -form { ims_md_ge_cove_id:key(ims_md_general_cover_seq) @@ -62,8 +59,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name generalmd_cover_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_desc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_desc.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_desc.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_desc.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ge_desc_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" ims_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Description]"] set title "[_ lorsm.lt_Edit_General_MD_Descr]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" ims_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Add_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Add_Description]"] set title "[_ lorsm.lt_Add_General_MD_Descri]" } @@ -45,6 +41,7 @@ -name generalmd_desc \ -cancel_url ../generalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name generalmd_desc_ad_form \ -form { ims_md_ge_desc_id:key(ims_md_general_desc_seq) @@ -62,8 +59,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name generalmd_desc_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_key.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_key.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_key.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_key.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ge_key_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Keyword_1]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Keyword_1]"] set title "[_ lorsm.lt_Edit_General_MD_Keywo]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]" ] \ - - [list [export_vars -base "../generalmd" im\\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Add_Keyword]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]" ] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Add_Keyword]"] set title "[_ lorsm.lt_Add_General_MD_Keywor]" } @@ -46,6 +42,7 @@ -name generalmd_key \ -cancel_url ../generalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name generalmd_key_ad_form \ -form { ims_md_ge_key_id:key(ims_md_general_key_seq) @@ -63,8 +60,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name generalmd_key_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_lang.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_lang.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_lang.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_lang.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_ge_lang_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Language]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Language]"] set title "[_ lorsm.lt_Edit_General_MD_Langu]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Add_Language]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Add_Language]"] set title "[_ lorsm.lt_Add_General_MD_Langua]" } @@ -46,6 +42,7 @@ -name generalmd_lang \ -cancel_url ../generalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name generalmd_lang_ad_form \ -form { ims_md_ge_lang_id:key(ims_md_general_lang_seq) @@ -57,8 +54,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name generalmd_lang_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_struc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_struc.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_struc.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_struc.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -19,13 +19,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" im\\\\s_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Structure]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Structure]"] set title "[_ lorsm.lt_Edit_General_MD_Struc]" # Form Index: openacs-4/packages/lorsm/www/admin/md/generalmd/general_title.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/generalmd/general_title.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/admin/md/generalmd/general_title.tcl 12 Dec 2008 14:25:38 -0000 1.5 +++ openacs-4/packages/lorsm/www/admin/md/generalmd/general_title.tcl 16 Apr 2010 21:35:12 -0000 1.6 @@ -19,23 +19,20 @@ # set context & title if { ![ad_form_new_p -key ims_md_ge_ti_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" ims_md_id] \ - "[_ lorsm.General_MD]"] \ - - "[_ lorsm.Edit_Titles]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Edit_Titles]"] set title "[_ lorsm.lt_Edit_General_MD_Title]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../generalmd" ims_md_id] \ - "[_ lorsm.General_MD]"] \ - "[_ lorsm.Add_Titles]"] -# set context [list [list [export_vars -base ".." ims_md_id] "[_ lorsm.IMS_Metadata_Editor]"] "[_ lorsm.General_MD]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../generalmd" ims_md_id] \ + "[_ lorsm.General_MD]"] \ + "[_ lorsm.Add_Titles]"] + set title "[_ lorsm.Add_General_MD_Title]" } @@ -45,6 +42,7 @@ -name generalmd_title \ -cancel_url [export_vars -base "../generalmd" ims_md_id] \ -mode edit \ + -select_query_name generalmd_title_ad_form \ -form { ims_md_ge_ti_id:key(ims_md_general_title_seq) @@ -61,9 +59,6 @@ } {ims_md_id:text(hidden) {value $ims_md_id}} - - } -select_query_name generalmd_title_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,23 +21,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_lf_cont_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../lifecyclemd" im\\\\\\\s_md_id] \ - "[_ lorsm.Life_Cycle_MD]"] \ - - "[_ lorsm.Edit_Contributor]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../lifecyclemd" ims_md_id] \ + "[_ lorsm.Life_Cycle_MD]"] \ + "[_ lorsm.Edit_Contributor]"] set title "[_ lorsm.lt_Edit_Lifecycle_MD_Con]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../lifecyclemd" im\\\\\\\s_md_id] \ - "[_ lorsm.Life_Cycle_MD]"] \ - - "[_ lorsm.Add_Contributor]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../lifecyclemd" ims_md_id] \ + "[_ lorsm.Life_Cycle_MD]"] \ + "[_ lorsm.Add_Contributor]"] set title "[_ lorsm.lt_Add_Lifecycle_MD_Cont]" } @@ -46,6 +42,7 @@ -name lifecyclemd_cont \ -cancel_url ../lifecyclemd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name lifecyclemd_cont_ad_form \ -form { ims_md_lf_cont_id:key(ims_md_life_cycle_contrib_seq) @@ -87,9 +84,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name lifecyclemd_cont_ad_form { - - } -edit_data { db_transaction { db_dml update_lfc {} Index: openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_cont.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -51,8 +51,8 @@ - select lfc.role_v || ' ' || '[' || lfc.role_s || ']' as role, lfce.entity, lfc.cont_date, - '[' || lfc.cont_date_l || ']' || ' ' || lfc.cont_date_s as cont_date_ls, lfc.ims_md_lf_cont_id, lfc.ims_md_id + select lfc.role_v || ' ' || '(' || lfc.role_s || ')' as role, lfce.entity, lfc.cont_date, + '(' || lfc.cont_date_l || ')' || ' ' || lfc.cont_date_s as cont_date_ls, lfc.ims_md_lf_cont_id, lfc.ims_md_id from ims_md_life_cycle_contrib lfc, ims_md_life_cycle_contrib_entity lfce where lfc.ims_md_lf_cont_id = lfce.ims_md_lf_cont_id and lfc.ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_stat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_stat.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_stat.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_stat.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../lifecyclemd" im\\\\\\\s_md_id] \ - "[_ lorsm.Life_Cycle_MD]"] \ - - "[_ lorsm.Edit_Status]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../lifecyclemd" ims_md_id] \ + "[_ lorsm.Life_Cycle_MD]"] \ + "[_ lorsm.Edit_Status]"] set title "[_ lorsm.lt_Edit_Lifecycle_MD_Sta]" # Form Index: openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_version.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_version.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_version.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/lifecyclemd/lifecycle_version.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../lifecyclemd" im\\\\\\s_md_id] \ - "[_ lorsm.Life_Cycle_MD]"] \ - - "[_ lorsm.Edit_Version]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../lifecyclemd" ims_md_id] \ + "[_ lorsm.Life_Cycle_MD]"] \ + "[_ lorsm.Edit_Version]"] set title "[_ lorsm.lt_Edit_Lifecycle_MD_Ver]" # Form Index: openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_md_cata_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "IMS Metadata Editor"] \ - - [list [export_vars -base "../metamd" im\s_md_id] \ - "Meta Metadata"] \ - - "Edit Catalog-Entry"] + [list [export_vars -base ".." ims_md_id] \ + "IMS Metadata Editor"] \ + [list [export_vars -base "../metamd" ims_md_id] \ + "Meta Metadata"] \ + "Edit Catalog-Entry"] set title "Edit Meta MD Catalog-Entry" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "IMS Metadata Editor"] \ - - [list [export_vars -base "../metamd" im\s_md_id] \ - "Meta Metadata"] \ - - "Add Catalog-Entry"] + [list [export_vars -base ".." ims_md_id] \ + "IMS Metadata Editor"] \ + [list [export_vars -base "../metamd" ims_md_id] \ + "Meta Metadata"] \ + "Add Catalog-Entry"] set title "Add Meta MD Catalog-Entry" } @@ -46,6 +42,7 @@ -name metamd_cata \ -cancel_url ../metamd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name metamd_cata_ad_form \ -form { ims_md_md_cata_id:key(ims_md_metadata_cata_seq) @@ -69,8 +66,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name metamd_cata_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/metamd/meta_cata.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -31,7 +31,7 @@ - select catalog, '[' || entry_l || ']' || ' ' || entry_s as entry_ls, + select catalog, '(' || entry_l || ')' || ' ' || entry_s as entry_ls, ims_md_md_cata_id, ims_md_id from ims_md_metadata_cata where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,21 +21,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_md_cont_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../metamd" im\s_\md_id] \ - "[_ lorsm.Meta_Metadata]"] \ - "[_ lorsm.Add_Contributor]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../metamd" ims_\md_id] \ + "[_ lorsm.Meta_Metadata]"] \ + "[_ lorsm.Add_Contributor]"] set title "[_ lorsm.lt_Edit_Meta_MD_Contribu]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../metamd" im\s_\md_id] \ - "[_ lorsm.Meta_Metadata]"] \ - "[_ lorsm.Add_Contributor]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../metamd" ims_\md_id] \ + "[_ lorsm.Meta_Metadata]"] \ + "[_ lorsm.Add_Contributor]"] set title "[_ lorsm.lt_Add_Meta_MD_Contribut]" } @@ -45,6 +43,7 @@ -name metamd_cont \ -cancel_url ../metamd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name metamd_cont_ad_form \ -form { ims_md_md_cont_id:key(ims_md_metadata_contrib_seq) @@ -86,8 +85,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name metamd_cont_ad_form { - } -edit_data { db_transaction { db_dml update_mdc {} Index: openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/metamd/meta_cont.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -51,9 +51,9 @@ - select mdc.role_v || ' ' || '[' || mdc.role_s || ']' as role, + select mdc.role_v || ' ' || '(' || mdc.role_s || ')' as role, mdce.entity, mdc.cont_date, - '[' || mdc.cont_date_l || ']' || ' ' || mdc.cont_date_s as cont_date_ls, + '(' || mdc.cont_date_l || ')' || ' ' || mdc.cont_date_s as cont_date_ls, mdc.ims_md_md_cont_id, mdc.ims_md_id from ims_md_metadata_contrib mdc, ims_md_metadata_contrib_entity mdce where mdc.ims_md_md_cont_id = mdce.ims_md_md_cont_id Index: openacs-4/packages/lorsm/www/admin/md/metamd/meta_lang.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd/meta_lang.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/metamd/meta_lang.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/metamd/meta_lang.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../metamd" im\s_\\\md_id] \ - "[_ lorsm.Meta_Metadata]"] \ - - "[_ lorsm.Edit_Language]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../metamd" ims_md_id] \ + "[_ lorsm.Meta_Metadata]"] \ + "[_ lorsm.Edit_Language]"] set title "[_ lorsm.lt_Edit_Meta_MD_Language]" # Form Index: openacs-4/packages/lorsm/www/admin/md/metamd/meta_scheme.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/metamd/meta_scheme.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/metamd/meta_scheme.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/metamd/meta_scheme.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_md_sch_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../metamd" im\s_\\md_id] \ - "[_ lorsm.Meta_Metadata]"] \ - - "[_ lorsm.Edit_Scheme]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../metamd" ims_md_id] \ + "[_ lorsm.Meta_Metadata]"] \ + "[_ lorsm.Edit_Scheme]"] set title "[_ lorsm.Edit_Meta_MD_Scheme]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../metamd" im\s_\\md_id] \ - "[_ lorsm.Meta_Metadata]"] \ - - "[_ lorsm.Add_Scheme]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../metamd" ims_md_id] \ + "[_ lorsm.Meta_Metadata]"] \ + "[_ lorsm.Add_Scheme]"] set title "[_ lorsm.Add_Meta_MD_Scheme]" } @@ -45,6 +41,7 @@ -name metamd_scheme \ -cancel_url ../metamd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name metamd_scheme_ad_form \ -form { ims_md_md_sch_id:key(ims_md_metadata_scheme_seq) @@ -56,9 +53,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - - } -select_query_name metamd_scheme_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation.tcl 12 Dec 2008 14:25:38 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -14,13 +14,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - "[_ lorsm.Relation_Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + "[_ lorsm.Relation_Entry]"] set title "[_ lorsm.Relation_MD]" # Relation Kind Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || descrip_l || ']' || ' ' || descrip_s as descrip + select '(' || descrip_l || ')' || ' ' || descrip_s as descrip from ims_md_relation_resource where ims_md_re_id = :ims_md_re_id and ims_md_re_re_id = :ims_md_re_re_id Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation_add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation_add.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation_add.tcl 12 Dec 2008 14:25:38 -0000 1.3 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation_add.tcl 16 Apr 2010 21:35:12 -0000 1.4 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - "[_ lorsm.Add_Relation_Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + "[_ lorsm.Add_Relation_Entry]"] set title "[_ lorsm.lt_Add_Relation_MD_Entry]" # Form Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation_cata.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation_cata.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation_cata.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation_cata.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -22,32 +22,27 @@ # set context & title if { ![ad_form_new_p -key ims_md_re_re_ca_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - [list [export_vars \ - -base "relation" \ - {ims_md_id ims_md_re_id ims_md_re_re_id}] \ - "[_ lorsm.Relation_Entry]"] \ - - "[_ lorsm.Edit_Catalog-Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + [list [export_vars \ + -base "relation" \ + {ims_md_id ims_md_re_id ims_md_re_re_id}] \ + "[_ lorsm.Relation_Entry]"] \ + "[_ lorsm.Edit_Catalog-Entry]"] set title "[_ lorsm.lt_Edit_Relation_MD_Reso]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - [list [export_vars \ - -base "relation" \ - {ims_md_id ims_md_re_id ims_md_re_re_id}] \ - "[_ lorsm.Relation_Entry]"] \ - "[_ lorsm.Add_Catalog-Entry]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + [list [export_vars \ + -base "relation" \ + {ims_md_id ims_md_re_id ims_md_re_re_id}] \ + "[_ lorsm.Relation_Entry]"] \ + "[_ lorsm.Add_Catalog-Entry]"] set title "[_ lorsm.lt_Add_Relation_MD_Resou]" } @@ -57,6 +52,7 @@ -name relationmd_cata \ -cancel_url relation?ims_md_id=$ims_md_id&ims_md_re_id=$ims_md_re_id&ims_md_re_re_id=$ims_md_re_re_id \ -mode edit \ + -select_query_name relationmd_cata_ad_form \ -form { ims_md_re_re_ca_id:key(ims_md_relation_resource_catalog_seq) @@ -84,8 +80,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name relationmd_cata_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,18 +20,15 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - [list [export_vars \ - -base "relation" \ - {ims_md_id ims_md_re_id ims_md_re_re_id}] \ - "[_ lorsm.Relation_Entry]"] \ - - "[_ lorsm.AddEdit_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + [list [export_vars \ + -base "relation" \ + {ims_md_id ims_md_re_id ims_md_re_re_id}] \ + "[_ lorsm.Relation_Entry]"] \ + "[_ lorsm.AddEdit_Description]"] set title "[_ lorsm.lt_Edit_Relation_MD_Reso_1]" # Form @@ -40,6 +37,7 @@ -name relationmd_desc \ -cancel_url relation?ims_md_id=$ims_md_id&ims_md_re_id=$ims_md_re_id&ims_md_re_re_id=$ims_md_re_re_id \ -mode edit \ + -select_query_name relationmd_desc_ad_form \ -form { ims_md_re_re_id:key(ims_md_relation_resource_seq) @@ -59,8 +57,6 @@ {ims_md_re_id:text(hidden) {value $ims_md_re_id}} - } -select_query_name relationmd_desc_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation_desc.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -21,7 +21,7 @@ - select '[' || rere.descrip_l || ']' || ' ' || rere.descrip_s as descrip, + select '(' || rere.descrip_l || ')' || ' ' || rere.descrip_s as descrip, rere.ims_md_re_re_id, re.ims_md_re_id, re.ims_md_id from ims_md_relation_resource rere, ims_md_relation re where rere.ims_md_re_id = :ims_md_re_id Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation_ident.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation_ident.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation_ident.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation_ident.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,18 +20,15 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - [list [export_vars \ - -base "relation" \ - {ims_md_id ims_md_re_id ims_md_re_re_id}] \ - "[_ lorsm.Relation_Entry]"] \ - - "[_ lorsm.lt_AddEdit_Resource_Iden]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + [list [export_vars \ + -base "relation" \ + {ims_md_id ims_md_re_id ims_md_re_re_id}] \ + "[_ lorsm.Relation_Entry]"] \ + "[_ lorsm.lt_AddEdit_Resource_Iden]"] set title "[_ lorsm.lt_Edit_Relation_MD_Reso_2]" @@ -40,6 +37,7 @@ -name relationmd_ident \ -cancel_url relation?ims_md_id=$ims_md_id&ims_md_re_id=$ims_md_re_id&ims_md_re_re_id=$ims_md_re_re_id \ -mode edit \ + -select_query_name relationmd_ident_ad_form \ -form { ims_md_re_re_id:key(ims_md_relation_resource_seq) @@ -53,8 +51,6 @@ {ims_md_re_id:text(hidden) {value $ims_md_re_id}} - } -select_query_name relationmd_ident_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/relationmd/relation_kind.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/relationmd/relation_kind.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/relationmd/relation_kind.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/relationmd/relation_kind.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -21,17 +21,15 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../relationmd" ims_md_id] \ - "[_ lorsm.Relation_MD]"] \ - - [list [export_vars \ - -base "relation" \ - {ims_md_id ims_md_re_id ims_md_re_re_id}] \ - "[_ lorsm.Relation_Entry]"] \ - "[_ lorsm.AddEdit_Kind]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../relationmd" ims_md_id] \ + "[_ lorsm.Relation_MD]"] \ + [list [export_vars \ + -base "relation" \ + {ims_md_id ims_md_re_id ims_md_re_re_id}] \ + "[_ lorsm.Relation_Entry]"] \ + "[_ lorsm.AddEdit_Kind]"] set title "[_ lorsm.lt_AddEdit_Relation_MD_K]" # Form @@ -40,6 +38,7 @@ -name relationmd_kind \ -cancel_url relation?ims_md_id=$ims_md_id&ims_md_re_id=$ims_md_re_id&ims_md_re_re_id=$ims_md_re_re_id \ -mode edit \ + -select_query_name relationmd_kind_ad_form \ -form { ims_md_re_id:key(ims_md_relation_seq) @@ -59,8 +58,6 @@ {ims_md_re_re_id:text(hidden) {value $ims_md_re_re_id}} - } -select_query_name relationmd_kind_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,15 +18,13 @@ # set context & title set context [list \ - [list \ - [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list \ - [export_vars -base "../rightsmd" ims_md_id] \ - "[_ lorsm.Rights_MD]"] \ - - " <#_Add/Edit Copyrights or other Restrictions #>"] + [list \ + [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list \ + [export_vars -base "../rightsmd" ims_md_id] \ + "[_ lorsm.Rights_MD]"] \ + "Add/Edit Copyrights or other Restrictions"] set title "[_ lorsm.lt_Edit_Rights_MD_Copyri]" # Form Index: openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_caor.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -28,7 +28,7 @@ - select '[' || caor_s || '] ' || caor_v as caor, ims_md_id + select '(' || caor_s || ') ' || caor_v as caor, ims_md_id from ims_md_rights where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../rightsmd" ims_md_id] \ - "[_ lorsm.Rights_MD]"] \ - - "[_ lorsm.AddEdit_Cost]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../rightsmd" ims_md_id] \ + "[_ lorsm.Rights_MD]"] \ + "[_ lorsm.AddEdit_Cost]"] set title "[_ lorsm.lt_AddEdit_Rights_MD_Cos]" Index: openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_cost.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || cost_s || '] ' || cost_v as cost, ims_md_id + select '(' || cost_s || ') ' || cost_v as cost, ims_md_id from ims_md_rights where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../rightsmd" ims_md_id] \ - "[_ lorsm.Rights_MD]"] \ - - "[_ lorsm.AddEdit_Description]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../rightsmd" ims_md_id] \ + "[_ lorsm.Rights_MD]"] \ + "[_ lorsm.AddEdit_Description]"] set title "[_ lorsm.lt_Edit_Rights_MD_Descri]" Index: openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/rightsmd/rights_desc.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || descrip_l || '] ' || descrip_s as desc, ims_md_id + select '(' || descrip_l || ') ' || descrip_s as desc, ims_md_id from ims_md_rights where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_dur.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_dur.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_dur.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_dur.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \\\i\\m\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.AddEdit_Duration]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.AddEdit_Duration]"] set title "[_ lorsm.lt_Edit_Technical_MD_Dur]" # Form Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_form.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_form.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_form.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,21 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_te_fo_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "I[_ lorsm.MS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" im\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - "[_ lorsm.Edit_Format]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.MS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.Edit_Format]"] set title "[_ lorsm.lt_Edit_Technical_MD_For]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" im\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - "[_ lorsm.Add_Format]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.Add_Format]"] set title "[_ lorsm.lt_Add_Technical_MD_Form]" } @@ -43,6 +41,7 @@ -name technicalmd_form \ -cancel_url ../technicalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name technicalmd_form_ad_form \ -form { ims_md_te_fo_id:key(ims_md_technical_format_seq) @@ -54,8 +53,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - } -select_query_name technicalmd_form_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \\\im\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.lt_Edit_Installation_Rem]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.lt_Edit_Installation_Rem]"] set title "[_ lorsm.lt_AddEdit_Technical_MD__2]" # Form Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_inst.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || instl_rmrks_l || ']' || ' ' || instl_rmrks_s as instl_rmrks, ims_md_id + select '(' || instl_rmrks_l || ')' || ' ' || instl_rmrks_s as instl_rmrks, ims_md_id from ims_md_technical where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_loca.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_loca.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_loca.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_loca.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,23 +20,19 @@ # set context & title if { ![ad_form_new_p -key ims_md_te_lo_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \im\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - " [_ lorsm.Edit_Location]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + " [_ lorsm.Edit_Location]"] set title "[_ lorsm.lt_Edit_Technical_MD_Loc]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \im\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.Add_Location]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.Add_Location]"] set title "[_ lorsm.lt_Add_Technical_MD_Loca]" } @@ -45,6 +41,7 @@ -name technicalmd_loca \ -cancel_url ../technicalmd?ims_md_id=$ims_md_id \ -mode edit \ + -select_query_name technicalmd_loca_ad_form \ -form { ims_md_te_lo_id:key(ims_md_technical_location_seq) @@ -62,9 +59,6 @@ {ims_md_id:text(hidden) {value $ims_md_id}} - - } -select_query_name technicalmd_loca_ad_form { - } -edit_data { db_dml do_update {} Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.tcl 12 Dec 2008 14:25:38 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \\\i\m\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.lt_AddEdit_Other_Platfor]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.lt_AddEdit_Other_Platfor]"] set title "[_ lorsm.lt_AddEdit_Technical_MD__4]" # Form Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.xql 12 Dec 2008 14:25:38 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_otr.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -29,7 +29,7 @@ - select '[' || otr_plt_l || ']' || ' ' || otr_plt_s as otr_plt, ims_md_id + select '(' || otr_plt_l || ')' || ' ' || otr_plt_s as otr_plt, ims_md_id from ims_md_technical where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.tcl 12 Dec 2008 14:25:39 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -20,75 +20,61 @@ # set context & title if { ![ad_form_new_p -key ims_md_te_rq_id]} { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \\im\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.Edit_Requirement]"] + [list [export_vars -base "../" ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.Edit_Requirement]"] set title "[_ lorsm.lt_Edit_Technical_MD_Req]" } else { set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \\im\\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.Add_Requirement]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.Add_Requirement]"] set title "[_ lorsm.lt_Add_Technical_MD_Requ]" } # Form ad_form \ -name technicalmd_req \ - -cancel_url ../technicalmd?ims_md_id=$ims_md_id \ + -cancel_url "../technicalmd?ims_md_id=$ims_md_id" \ -mode edit \ + -select_query_name technicalmd_req_ad_form \ -form { ims_md_te_rq_id:key(ims_md_technical_requirement_seq) - {type_s:text,nospell {html {size 10}} {help_text "[_ lorsm.lt_Source_of_vocabulary_]"} {label "[_ lorsm.Source]"} } - {type_v:text,nospell {html {size 20}} {help_text "[_ lorsm.Type_of_requirement]"} {label "[_ lorsm.Type_1]"} } - {name_v:text,nospell {html {size 20}} {help_text "[_ lorsm.lt_Name_of_required_item]"} {label "[_ lorsm.Name_1]"} } - {min_version:text,nospell {html {size 10}} {help_text "[_ lorsm.lt_Lowest_version_of_the]"} {label "[_ lorsm.Minimum_Version]"} } - {max_version:text,nospell {html {size 10}} {help_text "[_ lorsm.lt_Highest_version_of_th]"} {label "[_ lorsm.Maximum_Version]"} } - {ims_md_id:text(hidden) {value $ims_md_id}} - - } -select_query_name technicalmd_req_ad_form { - } -edit_data { db_dml do_update {} - } -new_data { db_dml do_insert {} - } -after_submit { ad_returnredirect [export_vars -base "../technicalmd" {ims_md_id}] ad_script_abort Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.xql 12 Dec 2008 14:25:39 -0000 1.1 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_req.xql 16 Apr 2010 21:35:12 -0000 1.2 @@ -25,8 +25,8 @@ - select '[' || type_s || ']' || ' ' || type_v as type, - '[' || name_s || ']' || ' ' || name_v as name, + select '(' || type_s || ')' || ' ' || type_v as type, + '(' || name_s || ')' || ' ' || name_v as name, min_version, max_version, ims_md_te_rq_id, ims_md_id from ims_md_technical_requirement where ims_md_id = :ims_md_id Index: openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_size.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_size.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_size.tcl 12 Dec 2008 14:25:39 -0000 1.4 +++ openacs-4/packages/lorsm/www/admin/md/technicalmd/technical_size.tcl 16 Apr 2010 21:35:12 -0000 1.5 @@ -18,13 +18,11 @@ # set context & title set context [list \ - [list [export_vars -base ".." ims_md_id] \ - "[_ lorsm.IMS_Metadata_Editor]"] \ - - [list [export_vars -base "../technicalmd" \im\s_md_id] \ - "[_ lorsm.Technical_MD]"] \ - - "[_ lorsm.Edit_Size]"] + [list [export_vars -base ".." ims_md_id] \ + "[_ lorsm.IMS_Metadata_Editor]"] \ + [list [export_vars -base "../technicalmd" ims_md_id] \ + "[_ lorsm.Technical_MD]"] \ + "[_ lorsm.Edit_Size]"] set title "[_ lorsm.lt_AddEdit_Technical_MD__6]" # Form