Index: openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_cont.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/lifecyclemd/Attic/lifecycle_cont.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_cont.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_cont.tcl	5 Dec 2006 10:42:47 -0000	1.3.4.1
@@ -75,43 +75,21 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {
-     select * from 
-        ims_md_life_cycle_contrib lfc, 
-        ims_md_life_cycle_contrib_entity lfce 
-    where
-        lfc.ims_md_lf_cont_id = :ims_md_lf_cont_id
-    and
-        lfc.ims_md_id = :ims_md_id
-    and
-        lfce.ims_md_lf_cont_id = :ims_md_lf_cont_id
-
-} -edit_data {
+} -select_query_name select_ims_contrib  \
+  -edit_data {
     db_transaction {
-	    db_dml update_lfc "
-            update ims_md_life_cycle_contrib
-            set role_v = :role_v, 
-            role_s = :role_s, 
-            cont_date = :cont_date, 
-            cont_date_l = :cont_date_l, 
-            cont_date_s = :cont_date_s
-            where ims_md_lf_cont_id = :ims_md_lf_cont_id"
+	    db_dml update_lfc ""
             
-            db_dml update_lfce "
-            update ims_md_life_cycle_contrib_entity
-            set entity = :entity
-            where ims_md_lf_cont_id = :ims_md_lf_cont_id"
+            db_dml update_lfce ""
     }
          
 } -new_data {
     db_transaction {
-	    db_dml insert_lfc "
-            insert into ims_md_life_cycle_contrib (ims_md_lf_cont_id, ims_md_id, role_s, role_v, cont_date, cont_date_l, cont_date_s)
-            values (:ims_md_lf_cont_id, :ims_md_id, :role_s, :role_v, :cont_date, :cont_date_l, :cont_date_s)"
+	    db_dml insert_lfc ""
 
-	    db_dml insert_lfce "
-            insert into ims_md_life_cycle_contrib_entity (ims_md_lf_cont_enti_id, ims_md_lf_cont_id, entity)
-            values (nextval('ims_md_life_cycle_contrib_entity_seq'), :ims_md_lf_cont_id, :entity)"
+            set ims_md_lf_cont_enti_id [db_nextval ims_md_lf_c_contrib_enty_seq]
+
+	    db_dml insert_lfce ""
     }
 
 } -after_submit {
@@ -128,6 +106,7 @@
     -elements {
         role {
             label "[_ lorsm.Role]"
+	    display_eval {[concat $role_v \[$role_s\]]}
         }
         entity {
             label "[_ lorsm.Entity_1]"
@@ -137,6 +116,7 @@
 	}
 	cont_date_ls {
 	    label "[_ lorsm.Description_1]"
+	    display_eval {[concat \[$cont_date_l\] $cont_date_s]}
 	}
         export {
             display_eval {\[Edit\]}
@@ -146,20 +126,5 @@
         }
     }
 
-db_multirow d_lf_cont select_lf_cont {
-    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
-}
+db_multirow d_lf_cont select_lf_cont {}
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_cont.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_stat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/lifecyclemd/Attic/lifecycle_stat.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_stat.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_stat.tcl	5 Dec 2006 10:42:47 -0000	1.3.4.1
@@ -45,19 +45,13 @@
 } -on_submit {
     # Checks whether LC status exist...
 
-    if {[db_0or1row select_lc_version {select ims_md_id from ims_md_life_cycle where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_lc_version {}]} {
 
-        db_dml do_update "
-            update ims_md_life_cycle
-            set status_s = :status_s, status_v = :status_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_life_cycle (ims_md_id, status_s, status_v)
-            values
-            (:ims_md_id, :status_s, :status_v)"
+        db_dml do_insert ""
 
     }
 
@@ -81,13 +75,5 @@
         }
     }
 
-db_multirow d_lf_stat select_lf_stat {
-    select status_s,
-           status_v, 
-           ims_md_id
-    from 
-           ims_md_life_cycle
-    where
-           ims_md_id = :ims_md_id
-}
+db_multirow d_lf_stat select_lf_stat {}
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_stat.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_version.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/lifecyclemd/Attic/lifecycle_version.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_version.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_version.tcl	5 Dec 2006 10:42:47 -0000	1.3.4.1
@@ -47,20 +47,14 @@
 
     # check if the LC version already exists...
 
-    if {[db_0or1row select_lc_version {select ims_md_id from ims_md_life_cycle where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_lc_version {}]} {
 
-        db_dml do_update "
-            update ims_md_life_cycle
-            set version_l = :version_l, version_s = :version_s
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_life_cycle (ims_md_id, version_l, version_s)
-            values
-            (:ims_md_id, :version_l, :version_s)"
+        db_dml do_insert ""
 
     }
 
@@ -84,13 +78,5 @@
         }
     }
 
-db_multirow d_lf_ver select_lf_ver {
-    select version_l,
-           version_s, 
-           ims_md_id
-    from 
-           ims_md_life_cycle
-    where
-           ims_md_id = :ims_md_id
-}
+db_multirow d_lf_ver select_lf_ver {}
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/lifecyclemd/lifecycle_version.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/metamd/meta_cata.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/metamd/Attic/meta_cata.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/lorsm/www/md/metamd/meta_cata.tcl	17 May 2005 17:03:42 -0000	1.2
+++ openacs-4/packages/lorsm/www/md/metamd/meta_cata.tcl	5 Dec 2006 10:43:49 -0000	1.2.4.1
@@ -57,18 +57,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_metadata_cata where ims_md_md_cata_id = :ims_md_md_cata_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_metadata_cata
-            set catalog = :catalog, entry_l = :entry_l, entry_s = :entry_s
-            where ims_md_md_cata_id = :ims_md_md_cata_id"
+} -select_query_name select_md_metadata_cata \
+  -edit_data {
+        db_dml do_update ""
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_metadata_cata (ims_md_md_cata_id, ims_md_id, catalog, entry_l, entry_s)
-            values
-            (:ims_md_md_cata_id, :ims_md_id, :catalog, :entry_l, :entry_s)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "../metamd" {ims_md_id}]
@@ -87,6 +80,7 @@
 	}
         entry_ls {
             label "Language Entry"
+	    display_eval {[contat \[$entry_l\] $entry_s]}
         }
         export {
             display_eval {\[Edit\]}
@@ -96,14 +90,5 @@
         }
     }
 
-db_multirow d_md_cata select_md_cata {
-    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
-} 
+db_multirow d_md_cata select_md_cata {} 
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/metamd/meta_cata.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/metamd/meta_cont.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/metamd/Attic/meta_cont.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/metamd/meta_cont.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/metamd/meta_cont.tcl	5 Dec 2006 10:43:49 -0000	1.3.4.1
@@ -76,43 +76,21 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {
-     select * from 
-        ims_md_metadata_contrib mdc, 
-        ims_md_metadata_contrib_entity mdce 
-    where
-        mdc.ims_md_md_cont_id = :ims_md_md_cont_id
-    and
-        mdc.ims_md_id = :ims_md_id
-    and
-        mdce.ims_md_md_cont_id = :ims_md_md_cont_id
-
-} -edit_data {
+} -select_query_name select_md_contrib \
+  -edit_data {
     db_transaction {
-	    db_dml update_mdc "
-            update ims_md_metadata_contrib
-            set role_v = :role_v, 
-            role_s = :role_s, 
-            cont_date = :cont_date, 
-            cont_date_l = :cont_date_l, 
-            cont_date_s = :cont_date_s
-            where ims_md_md_cont_id = :ims_md_md_cont_id"
+	    db_dml update_mdc ""
             
-            db_dml update_mdce "
-            update ims_md_metadata_contrib_entity
-            set entity = :entity
-            where ims_md_md_cont_id = :ims_md_md_cont_id"
+            db_dml update_mdce ""
     }
          
 } -new_data {
     db_transaction {
-	    db_dml insert_mdc "
-            insert into ims_md_metadata_contrib (ims_md_md_cont_id, ims_md_id, role_s, role_v, cont_date, cont_date_l, cont_date_s)
-            values (:ims_md_md_cont_id, :ims_md_id, :role_s, :role_v, :cont_date, :cont_date_l, :cont_date_s)"
+	    db_dml insert_mdc ""
+	
+	    set ims_md_md_cont_enti_id [db_nextval ims_md_metadata_contrib_enty_seq]
 
-	    db_dml insert_mdce "
-            insert into ims_md_metadata_contrib_entity (ims_md_md_cont_enti_id, ims_md_md_cont_id, entity)
-            values (nextval('ims_md_metadata_contrib_entity_seq'), :ims_md_md_cont_id, :entity)"
+	    db_dml insert_mdce ""
     }
 
 } -after_submit {
@@ -129,6 +107,7 @@
     -elements {
         role {
             label "[_ lorsm.Role]"
+	    display_eval {[concat $role_v \[$role_s\]]}
         }
         entity {
             label "[_ lorsm.Entity_1]"
@@ -138,6 +117,7 @@
 	}
 	cont_date_ls {
 	    label "[_ lorsm.Description_1]"
+	    display_eval {[concat \[$cont_date_l\] $cont_date_s]}
 	}
         export {
             display_eval {\[Edit\]}
@@ -147,20 +127,5 @@
         }
     }
 
-db_multirow d_md_cont select_md_cont {
-    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.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
-    and
-        mdc.ims_md_id = :ims_md_id
-}
+db_multirow d_md_cont select_md_cont {}
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/metamd/meta_cont.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/metamd/meta_lang.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/metamd/Attic/meta_lang.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/metamd/meta_lang.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/metamd/meta_lang.tcl	5 Dec 2006 10:43:49 -0000	1.3.4.1
@@ -38,19 +38,13 @@
 } -on_submit {
     # check if the mdmd language details already exist...
 
-    if {[db_0or1row select_lang {select ims_md_id from ims_md_metadata where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_lang {}]} {
 
-        db_dml do_update "
-            update ims_md_metadata
-            set language = :language
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_metadata (ims_md_id, language)
-            values
-            (:ims_md_id, :language)"
+        db_dml do_insert ""
 
     }
 
@@ -71,11 +65,4 @@
         }
     }
 
-db_multirow d_md_lang select_md_lang {
-    select language, 
-           ims_md_id
-    from 
-           ims_md_metadata
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_md_lang select_md_lang {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/metamd/meta_lang.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/metamd/meta_scheme.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/metamd/Attic/meta_scheme.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/metamd/meta_scheme.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/metamd/meta_scheme.tcl	5 Dec 2006 10:43:49 -0000	1.3.4.1
@@ -45,19 +45,12 @@
     }
 
 
-} -select_query  {select * from ims_md_metadata_scheme where ims_md_md_sch_id = :ims_md_md_sch_id and ims_md_id = :ims_md_id
+} -select_query_name select_md_md_scheme \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_metadata_scheme
-            set scheme = :scheme
-            where ims_md_md_sch_id = :ims_md_md_sch_id "
-
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_metadata_scheme (ims_md_md_sch_id, ims_md_id, scheme)
-            values
-            (:ims_md_md_sch_id, :ims_md_id, :scheme)"
+        db_dml do_insert ""
 
 
 } -after_submit {
@@ -83,11 +76,4 @@
         }
     }
 
-db_multirow d_md_scheme select_md_scheme {
-    select scheme, 
-           ims_md_id, ims_md_md_sch_id, scheme
-    from 
-           ims_md_metadata_scheme
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_md_scheme select_md_scheme {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/metamd/meta_scheme.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/relationmd/relation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/relationmd/Attic/relation.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/relationmd/relation.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/relationmd/relation.tcl	5 Dec 2006 10:44:59 -0000	1.3.4.1
@@ -32,15 +32,7 @@
 	}
     }
 
-db_multirow d_re_kind select_re_kind {
-    select kind_s,
-           kind_v
-    from 
-           ims_md_relation
-    where
-           ims_md_re_id = :ims_md_re_id 
-    and    ims_md_id = :ims_md_id
-} 
+db_multirow d_re_kind select_re_kind {} 
 
 # Relation Resource Identifier
 template::list::create \
@@ -55,14 +47,7 @@
 	}
     }
 
-db_multirow d_re_ident select_re_ident {
-    select identifier
-    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
-}
+db_multirow d_re_ident select_re_ident {}
 
 # Relation Resource Catalog-Entry
 template::list::create \
@@ -83,15 +68,7 @@
 	}
     }
 
-db_multirow d_re_cata select_re_cata {
-    select catalog,
-           entry_l,
-           entry_s
-    from 
-           ims_md_relation_resource_catalog
-    where
-           ims_md_re_re_id = :ims_md_re_re_id
-}
+db_multirow d_re_cata select_re_cata {}
 
 # Relation Resource Description
 template::list::create \
@@ -103,16 +80,10 @@
     -elements {
         descrip {
 	    label ""
+	    display_eval {[concat \[$descrip_l\] $descrip_s]}
 	}
     }
 
-db_multirow d_re_desc select_re_desc {
-    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
-}
+db_multirow d_re_desc select_re_desc {}
 
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/relationmd/relation.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/relationmd/relation_add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/relationmd/Attic/relation_add.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/relationmd/relation_add.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/relationmd/relation_add.tcl	5 Dec 2006 10:44:59 -0000	1.3.4.1
@@ -32,13 +32,11 @@
 
 } -new_data {
     db_transaction {
-        db_dml do_insert_relation "
-            insert into ims_md_relation (ims_md_re_id, ims_md_id) 
-            values (:ims_md_re_id, :ims_md_id)"
+        db_dml do_insert_relation ""
 
-	db_dml do_insert_resource "
-            insert into ims_md_relation_resource (ims_md_re_re_id, ims_md_re_id)
-            values (nextval('ims_md_relation_resource_seq'), :ims_md_re_id)"
+	set ims_md_re_re_id [db_nextval ims_md_relation_resource_seq]
+
+	db_dml do_insert_resource ""
     }
 
 } -after_submit {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/relationmd/relation_add.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/relationmd/relation_cata.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/relationmd/Attic/relation_cata.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/relationmd/relation_cata.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/relationmd/relation_cata.tcl	5 Dec 2006 10:44:59 -0000	1.3.4.1
@@ -35,7 +35,7 @@
     -mode edit \
     -form {
 
-    ims_md_re_re_ca_id:key(ims_md_relation_resource_catalog_seq)
+    ims_md_re_re_ca_id:key(ims_md_relation_resource_cat_seq)
 
     {catalog:text,nospell
 	{section "[_ lorsm.lt_AddEdit_Relation_MD_R]"}	
@@ -65,21 +65,12 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_relation_resource_catalog where ims_md_re_re_ca_id = :ims_md_re_re_ca_id and ims_md_re_re_id = :ims_md_re_re_id
+} -select_query_name select_md_resource \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_relation_resource_catalog
-            set catalog = :catalog,
-            entry_l = :entry_l,
-            entry_s = :entry_s
-            where ims_md_re_re_ca_id = :ims_md_re_re_ca_id"
-
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_relation_resource_catalog (ims_md_re_re_ca_id, ims_md_re_re_id, catalog, entry_l, entry_s)
-            values 
-            (:ims_md_re_re_ca_id, :ims_md_re_re_id, :catalog, :entry_l, :entry_s)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "relation" {ims_md_re_id ims_md_re_re_id ims_md_id}]
@@ -110,20 +101,4 @@
         }
     }
 
-db_multirow d_re_cata select_re_cata {
-    select
-    reca.catalog,
-    reca.entry_l,
-    reca.entry_s,
-    reca.ims_md_re_re_ca_id,
-    reca.ims_md_re_re_id,
-    re.ims_md_id,
-    re.ims_md_re_id
-    from 
-           ims_md_relation_resource_catalog reca,
-           ims_md_relation re
-    where
-           reca.ims_md_re_re_id = :ims_md_re_re_id
-    and
-           re.ims_md_re_id = :ims_md_re_id
-} 
+db_multirow d_re_cata select_re_cata {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/relationmd/relation_cata.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/relationmd/relation_desc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/relationmd/Attic/relation_desc.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/relationmd/relation_desc.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/relationmd/relation_desc.tcl	5 Dec 2006 10:44:59 -0000	1.3.4.1
@@ -50,15 +50,10 @@
     {ims_md_re_id:text(hidden) {value $ims_md_re_id}
     }
 
-} -select_query  {select * from ims_md_relation_resource where ims_md_re_re_id = :ims_md_re_re_id and ims_md_re_id = :ims_md_re_id
+} -select_query_name select_md_relation_re \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_relation_resource
-            set descrip_l = :descrip_l,
-            descrip_s = :descrip_s
-            where ims_md_re_re_id = :ims_md_re_re_id "
-
 } -after_submit {
     ad_returnredirect [export_vars -base "relation" {ims_md_re_re_id ims_md_re_id ims_md_id}]
         ad_script_abort
@@ -73,18 +68,8 @@
     -elements {
 	descrip {
             label "[_ lorsm.Description_1]"
+	    display_eval {[concat \[$descrip_l\] $descrip_s]}
         }
     }
 
-db_multirow d_re_desc select_re_desc {
-   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
-    and    re.ims_md_re_id = :ims_md_re_id
-} 
+db_multirow d_re_desc select_re_desc {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/relationmd/relation_desc.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/relationmd/relation_ident.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/relationmd/Attic/relation_ident.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/relationmd/relation_ident.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/relationmd/relation_ident.tcl	5 Dec 2006 10:44:59 -0000	1.3.4.1
@@ -45,14 +45,10 @@
     {ims_md_re_id:text(hidden) {value $ims_md_re_id}
     }
 
-} -select_query  {select * from ims_md_relation_resource where ims_md_re_re_id = :ims_md_re_re_id and ims_md_re_id = :ims_md_re_id
+} -select_query_name select_rel_resource \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_relation_resource
-            set identifier = :identifier
-            where ims_md_re_re_id = :ims_md_re_re_id "
-
 } -after_submit {
     ad_returnredirect [export_vars -base "relation" {ims_md_re_re_id ims_md_re_id ims_md_id}]
         ad_script_abort
@@ -70,15 +66,4 @@
         }
     }
 
-db_multirow d_re_ident select_re_ident {
-   select rere.identifier,
-           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
-    and    re.ims_md_re_id = :ims_md_re_id
-} 
+db_multirow d_re_ident select_re_ident {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/relationmd/relation_ident.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/relationmd/relation_kind.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/relationmd/Attic/relation_kind.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/relationmd/relation_kind.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/relationmd/relation_kind.tcl	5 Dec 2006 10:44:59 -0000	1.3.4.1
@@ -51,15 +51,10 @@
     {ims_md_re_re_id:text(hidden) {value $ims_md_re_re_id}
     }
 
-} -select_query  {select * from ims_md_relation where ims_md_re_id = :ims_md_re_id and ims_md_id = :ims_md_id
+} -select_query_name select_md_rel \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_relation
-            set kind_s = :kind_s,
-            kind_v = :kind_v
-            where ims_md_re_id = :ims_md_re_id"
-
 } -after_submit {
     ad_returnredirect [export_vars -base "relation" {ims_md_re_re_id ims_md_re_id ims_md_id}]
         ad_script_abort
@@ -80,16 +75,4 @@
 	}
     }
 
-db_multirow d_re_kind select_re_kind {
-   select  re.kind_s,
-           re.kind_v,
-           re.ims_md_re_id,
-           re.ims_md_id,
-           rere.ims_md_re_re_id
-    from 
-           ims_md_relation re,
-           ims_md_relation_resource rere
-    where
-           re.ims_md_re_id = :ims_md_re_id
-    and    rere.ims_md_re_id = :ims_md_re_id
-} 
+db_multirow d_re_kind select_re_kind {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/relationmd/relation_kind.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/rightsmd/rights_caor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/rightsmd/Attic/rights_caor.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/rightsmd/rights_caor.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/rightsmd/rights_caor.tcl	5 Dec 2006 10:45:53 -0000	1.3.4.1
@@ -45,19 +45,13 @@
 } -on_submit {
     # check if the Rights Copyright details already exist...
 
-    if {[db_0or1row select_type {select ims_md_id from ims_md_rights where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_type {}]} {
 
-        db_dml do_update "
-            update ims_md_rights
-            set caor_s = :caor_s, caor_v = :caor_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_rights (ims_md_id, caor_s, caor_v)
-            values
-            (:ims_md_id, :caor_s, :caor_v) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -74,15 +68,8 @@
     -elements {
 	caor {
             label "[_ lorsm.Copyright_Info]"
+	    display_eval {[concat \[$caor_s\] $caor_v]}
         }
     }
 
-db_multirow d_ri_caor select_ri_caor {
-    select 
-        '[' || caor_s || '] ' || caor_v as caor,
-        ims_md_id
-    from 
-           ims_md_rights
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ri_caor select_ri_caor {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/rightsmd/rights_caor.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/rightsmd/rights_cost.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/rightsmd/Attic/rights_cost.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/rightsmd/rights_cost.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/rightsmd/rights_cost.tcl	5 Dec 2006 10:45:53 -0000	1.3.4.1
@@ -45,19 +45,13 @@
 } -on_submit {
     # check if the Rights Cost details already exist...
 
-    if {[db_0or1row select_type {select ims_md_id from ims_md_rights where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_type {}]} {
 
-        db_dml do_update "
-            update ims_md_rights
-            set cost_s = :cost_s, cost_v = :cost_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_rights (ims_md_id, cost_s, cost_v)
-            values
-            (:ims_md_id, :cost_s, :cost_v) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -74,15 +68,8 @@
     -elements {
 	cost {
             label "[_ lorsm.Cost_1]"
+	    display_eval {[concat \[$cost_s\] $cost_v]}
         }
     }
 
-db_multirow d_ri_cost select_ri_cost {
-    select 
-        '[' || cost_s || '] ' || cost_v as cost,
-        ims_md_id
-    from 
-           ims_md_rights
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ri_cost select_ri_cost {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/rightsmd/rights_cost.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/rightsmd/rights_desc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/rightsmd/Attic/rights_desc.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/rightsmd/rights_desc.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/rightsmd/rights_desc.tcl	5 Dec 2006 10:45:53 -0000	1.3.4.1
@@ -45,19 +45,13 @@
 } -on_submit {
     # check if the Rights Description details already exist...
 
-    if {[db_0or1row select_type {select ims_md_id from ims_md_rights where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_type {}]} {
 
-        db_dml do_update "
-            update ims_md_rights
-            set descrip_l = :descrip_l, descrip_s = :descrip_s
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_rights (ims_md_id, descrip_l, descrip_s)
-            values
-            (:ims_md_id, :descrip_l, :descrip_s) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -72,17 +66,10 @@
     -no_data "[_ lorsm.lt_No_Description_Availa]" \
     -html { align right style "width: 100%;" } \
     -elements {
-	desc {
+	descrip {
             label "[_ lorsm.Description_1]"
+	    display_eval {[concat \[$descrip_l\] $descrip_s]}
         }
     }
 
-db_multirow d_ri_desc select_ri_desc {
-    select 
-        '[' || descrip_l || '] ' || descrip_s as desc,
-        ims_md_id
-    from 
-           ims_md_rights
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ri_desc select_ri_desc {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/rightsmd/rights_desc.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_dur.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_dur.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_dur.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_dur.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -50,21 +50,13 @@
 } -on_submit {
     # check if the tech duration details already exist...
 
-    if {[db_0or1row select_duration {select ims_md_id from ims_md_technical where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_duration {}]} {
 
-        db_dml do_update "
-            update ims_md_technical
-            set duration_s = :duration_s,
-            duration_l = :duration_l,
-            duration = :duration
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_technical (ims_md_id, duration_l, duration_s)
-            values
-            (:ims_md_id, :duration_l, :duration_s)"
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -91,14 +83,4 @@
 
     }
 
-db_multirow d_te_dur select_te_dur {
-    select 
-        duration_l,
-        duration_s,
-        duration || 's' as duration_sec,
-        ims_md_id
-    from 
-           ims_md_technical
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_te_dur select_te_dur {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_dur.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_form.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_form.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_form.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -19,10 +19,10 @@
 
 # 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]"]
+    set context [list [list [export_vars -base ".." ims_md_id] "I[_ 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]"]
+    set context [list [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]"
 }
 
@@ -44,19 +44,12 @@
 
     {ims_md_id:text(hidden) {value $ims_md_id}}
     
-} -select_query  {select * from ims_md_technical_format where ims_md_te_fo_id = :ims_md_te_fo_id and ims_md_id = :ims_md_id
+} -select_query_name select_md_tech_format \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_technical_format
-            set format = :format
-            where ims_md_te_fo_id = :ims_md_te_fo_id "
-
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_technical_format (ims_md_te_fo_id, ims_md_id, format)
-            values
-            (:ims_md_te_fo_id, :ims_md_id, :format)"
+       db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "../technicalmd" {ims_md_id}]
@@ -81,12 +74,4 @@
         }
     }
 
-db_multirow d_te_form select_te_form {
-    select format,
-           ims_md_te_fo_id,
-           ims_md_id
-    from 
-           ims_md_technical_format
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_te_form select_te_form {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_form.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_inst.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_inst.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_inst.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_inst.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -44,20 +44,13 @@
 } -on_submit {
     # check if the tech size details already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_technical where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_technical
-            set instl_rmrks_l = :instl_rmrks_l,
-            instl_rmrks_s = :instl_rmrks_s
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_technical (ims_md_id, instl_rmrks_l, instl_rmrks_s)
-            values
-            (:ims_md_id, :instl_rmrks_l, :instl_rmrks_s) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -74,15 +67,8 @@
     -elements {
         instl_rmrks {
             label "[_ lorsm.Installation_Remarks_1]"
+	    display_eval {[concat \[$instl_rmrks_l\] $instl_rmrks_s]}
         }
     }
 
-db_multirow d_te_inst select_te_inst {
-    select 
-        '[' || instl_rmrks_l || ']' || ' ' || instl_rmrks_s as instl_rmrks,
-        ims_md_id
-    from 
-           ims_md_technical
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_te_inst select_te_inst {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_inst.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_loca.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_loca.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_loca.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_loca.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -52,20 +52,12 @@
     }
     
 
-} -select_query  {select * from ims_md_technical_location where ims_md_te_lo_id = :ims_md_te_lo_id and ims_md_id = :ims_md_id
+} -select_query_name select_md_tech_loc  \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_technical_location
-            set type = :type,
-            location = :location
-            where ims_md_te_lo_id = :ims_md_te_lo_id "
-
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_technical_location (ims_md_te_lo_id, ims_md_id, type, location)
-            values
-            (:ims_md_te_lo_id, :ims_md_id, :type, :location)"
+       db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "../technicalmd" {ims_md_id}]
@@ -93,13 +85,4 @@
         }
     }
 
-db_multirow d_te_loca select_te_loca {
-    select type,
-           location,
-           ims_md_te_lo_id,
-           ims_md_id
-    from 
-           ims_md_technical_location
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_te_loca select_te_loca {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_loca.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_otr.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_otr.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_otr.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_otr.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -44,20 +44,13 @@
 } -on_submit {
     # check if the tech other platform req details already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_technical where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_technical
-            set otr_plt_l = :otr_plt_l,
-            otr_plt_s = :otr_plt_s
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_technical (ims_md_id, otr_plt_l, otr_plt_s)
-            values
-            (:ims_md_id, :otr_plt_l, :otr_plt_s)"
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -74,15 +67,8 @@
     -elements {
         otr_plt {
             label "[_ lorsm.Other_Platform_Req]"
+	    display_eval {[concat \[$otr_plt_l\] $otr_plt_s]}
         }
     }
 
-db_multirow d_te_otr select_te_otr {
-    select 
-        '[' || otr_plt_l || ']' || ' ' || otr_plt_s as otr_plt,
-        ims_md_id
-    from 
-           ims_md_technical
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_te_otr select_te_otr {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_otr.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_req.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_req.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_req.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_req.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -33,7 +33,7 @@
     -mode edit \
     -form {
 
-    ims_md_te_rq_id:key(ims_md_technical_requirement_seq)
+    ims_md_te_rq_id:key(ims_md_tech_requirement_seq)
 
     {type_s:text,nospell
 	{section "[_ lorsm.lt_AddEdit_Technical_MD__5]"}
@@ -69,27 +69,12 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {
-     select * from 
-        ims_md_technical_requirement
-    where
-        ims_md_te_rq_id = :ims_md_te_rq_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-    db_dml do_update "
-            update ims_md_technical_requirement
-            set type_v = :type_v, 
-            type_s = :type_s,
-            name_v = :name_v,
-            name_s = :type_s,
-            min_version = :min_version, 
-            max_version = :max_version
-            where ims_md_te_rq_id = :ims_md_te_rq_id"
+} -select_query_name select_tech_req \
+  -edit_data {
+    db_dml do_update ""
             
 } -new_data {
-    db_dml do_insert "
-            insert into ims_md_technical_requirement (ims_md_te_rq_id, ims_md_id, type_s, type_v, name_s, name_v, min_version, max_version)
-            values (:ims_md_te_rq_id, :ims_md_id, :type_s, :type_v, :type_s, :name_v, :min_version, :max_version)"
+    db_dml do_insert ""
    
 } -after_submit {
     ad_returnredirect [export_vars -base "../technicalmd" {ims_md_id}]
@@ -105,9 +90,11 @@
     -elements {
         type {
             label "[_ lorsm.Type]" 
+	    display_eval {[concat \[$type_s\] $type_v]}
         }
         name {
             label "[_ lorsm.Name]"
+	    display_eval {[concat \[$name_s\] $name_v]}
         }
 	min_version {
 	    label "[_ lorsm.Min_Version]"
@@ -123,17 +110,5 @@
         }
     }
 
-db_multirow d_te_req select_te_req {
-    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
-}
+db_multirow d_te_req select_te_req {}
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_req.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/technicalmd/technical_size.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/technicalmd/Attic/technical_size.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/technicalmd/technical_size.tcl	17 May 2005 17:03:43 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/technicalmd/technical_size.tcl	5 Dec 2006 10:47:11 -0000	1.3.4.1
@@ -38,19 +38,13 @@
 } -on_submit {
     # check if the tech size details already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_technical where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_technical
-            set t_size = :t_size
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-	db_dml do_insert "
-            insert into ims_md_technical (ims_md_id, t_size) 
-            values
-            (:ims_md_id, :t_size) "
+	db_dml do_insert ""
     }
 
 } -after_submit {
@@ -76,11 +70,4 @@
         }
     }
 
-db_multirow d_te_size select_te_size {
-    select t_size || ' bytes' as t_size_bytes,
-           ims_md_id
-    from 
-           ims_md_technical
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_te_size select_te_size {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/technicalmd/technical_size.xql'.
Fisheye: No comparison available.  Pass `N' to diff?