Index: openacs-4/packages/lorsm/www/md/classificationmd/classification.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -31,14 +31,7 @@
         }
     }
 
-db_multirow d_cl_pur select_cl_pur {
-    select purpose_s,
-           purpose_v
-    from 
-           ims_md_classification
-    where
-           ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_pur select_cl_pur {} 
 
 # Classification Taxonomic Path 
 template::list::create \
@@ -50,6 +43,7 @@
     -elements {
         source {
             label ""
+	    display_eval {[concat \[$source_l\] $source_v]}
         }
 	export {
             display_eval {\[[_ lorsm.View]\]}
@@ -59,19 +53,7 @@
         }
     }
 
-db_multirow d_cl_tpath select_cl_tpath {
-    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
-    and    cl.ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_tpath select_cl_tpath {} 
 
 # Classification Description
 template::list::create \
@@ -81,19 +63,13 @@
     -actions [list "[_ lorsm.Add_Description]" [export_vars -base classification_desc {ims_md_cl_id ims_md_id}] "[_ lorsm.lt_Add_another_Descripti]"] \
     -html { align right style "width: 100%;" } \
     -elements {
-        desc {
+        descrip {
             label ""
+	    display_eval {[concat \[$descrip_l\] $descrip_s]}
         }
     }
 
-db_multirow d_cl_desc select_cl_desc {
-    select 
-    '[' || descrip_l || '] ' || descrip_s as desc
-    from 
-           ims_md_classification_descrip
-    where
-           ims_md_cl_id = :ims_md_cl_id
-}
+db_multirow d_cl_desc select_cl_desc {}
 
 # Classification Keywords
 template::list::create \
@@ -105,14 +81,8 @@
     -elements {
         keyword {
             label ""
+	    display_eval {[concat \[$keyword_l\] $keyword_s]}
         }
     }
 
-db_multirow d_cl_key select_cl_key {
-    select 
-    '[' || keyword_l || '] ' || keyword_s as keyword
-    from 
-           ims_md_classification_keyword
-    where
-           ims_md_cl_id = :ims_md_cl_id
-}
+db_multirow d_cl_key select_cl_key {}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_add.tcl,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_add.tcl	3 Dec 2004 17:52:51 -0000	1.2
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_add.tcl	5 Dec 2006 09:15:05 -0000	1.2.6.1
@@ -30,12 +30,9 @@
     } 
 
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_classification (ims_md_cl_id, ims_md_id) 
-            values (:ims_md_cl_id, :ims_md_id)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "../classificationmd" {ims_md_id}]
         ad_script_abort
 } 
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_add.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_addpath.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_addpath.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_addpath.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_addpath.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -27,7 +27,7 @@
     -mode edit \
     -form {
 
-    ims_md_cl_ta_id:key(ims_md_classification_taxpath_seq)
+    ims_md_cl_ta_id:key(ims_md_classif_taxpath_seq)
     
     {ims_md_cl_id:text(hidden) {value $ims_md_cl_id}
     }
@@ -36,9 +36,7 @@
     } 
 
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_classification_taxpath (ims_md_cl_ta_id, ims_md_cl_id) 
-            values (:ims_md_cl_ta_id, :ims_md_cl_id)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "classification" {ims_md_cl_id ims_md_id}]
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_addpath.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_desc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_desc.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_desc.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_desc.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -55,20 +55,12 @@
     {ims_md_cl_id:text(hidden) {value $ims_md_cl_id}
     }
 
-} -select_query  {select * from ims_md_classification_descrip where ims_md_cl_de_id = :ims_md_cl_de_id and ims_md_cl_id = :ims_md_cl_id
+} -select_query_name select_md_class_desc \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_classification_descrip
-            set descrip_l = :descrip_l,
-            descrip_s = :descrip_s
-            where ims_md_cl_de_id = :ims_md_cl_de_id"
-
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_classification_descrip (ims_md_cl_de_id, ims_md_cl_id, descrip_l, descrip_s)
-            values 
-            (:ims_md_cl_de_id, :ims_md_cl_id, :descrip_l, :descrip_s)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "classification" {ims_md_cl_id ims_md_id}]
@@ -82,8 +74,9 @@
     -no_data "[_ lorsm.lt_No_Description_Availa]" \
     -html { align right style "width: 100%;" } \
     -elements {
-	desc {
+	descrip {
 	    label ""
+	    display_eval {[concat \[$descrip_l\] $descrip_s]}
 	}
         export {
             display_eval {\[Edit\]}
@@ -93,17 +86,4 @@
         }
     }
 
-db_multirow d_cl_desc select_cl_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
-    and
-           clde.ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_desc select_cl_desc {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_desc.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_key.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_key.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_key.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_key.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -34,7 +34,7 @@
     -mode edit \
     -form {
 
-    ims_md_cl_ke_id:key(ims_md_classification_keyword_seq)
+    ims_md_cl_ke_id:key(ims_md_classif_keyword_seq)
 
     {keyword_l:text,nospell
 	{section "[_ lorsm.lt_AddEdit_Classificatio_6]"}	
@@ -55,20 +55,12 @@
     {ims_md_cl_id:text(hidden) {value $ims_md_cl_id}
     }
 
-} -select_query  {select * from ims_md_classification_keyword where ims_md_cl_ke_id = :ims_md_cl_ke_id and ims_md_cl_id = :ims_md_cl_id
+} -select_query_name select_md_class_key \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_classification_keyword
-            set keyword_l = :keyword_l,
-            keyword_s = :keyword_s
-            where ims_md_cl_ke_id = :ims_md_cl_ke_id"
-
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_classification_keyword (ims_md_cl_ke_id, ims_md_cl_id, keyword_l, keyword_s)
-            values 
-            (:ims_md_cl_ke_id, :ims_md_cl_id, :keyword_l, :keyword_s)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "classification" {ims_md_cl_id ims_md_id}]
@@ -84,6 +76,7 @@
     -elements {
 	keyword {
 	    label ""
+	    display_eval {[concat \[$keyword_l\] $keyword_s]}
 	}
         export {
             display_eval {\[Edit\]}
@@ -93,17 +86,4 @@
         }
     }
 
-db_multirow d_cl_key select_cl_key {
-    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
-    and
-           kw.ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_key select_cl_key {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_key.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_pur.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_pur.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_pur.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_pur.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -48,15 +48,10 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     } 
 
-} -select_query  {select * from ims_md_classification where ims_md_cl_id = :ims_md_cl_id
+} -select_query_name select_md_class \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_classification
-            set purpose_s = :purpose_s,
-            purpose_v = :purpose_v
-            where ims_md_cl_id = :ims_md_cl_id "
-
 } -after_submit {
     ad_returnredirect [export_vars -base "classification" {ims_md_cl_id ims_md_id}]
         ad_script_abort
@@ -77,13 +72,4 @@
         }
     }
 
-db_multirow d_cl_pur select_cl_pur {
-    select purpose_s,
-           purpose_v,
-           ims_md_cl_id,
-           ims_md_id
-    from 
-           ims_md_classification
-    where
-           ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_pur select_cl_pur {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_pur.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_taxon.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_taxon.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_taxon.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_taxon.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -35,7 +35,7 @@
     -mode edit \
     -form {
 
-    ims_md_cl_ta_ta_id:key(ims_md_classification_taxpath_taxon_seq)
+    ims_md_cl_ta_ta_id:key(ims_md_classif_tpath_taxon_seq)
 
     {identifier:text,nospell
 	{section "[_ lorsm.lt_AddEdit_Classificatio_8]"}	
@@ -65,21 +65,12 @@
     {ims_md_cl_ta_id:text(hidden) {value $ims_md_cl_ta_id}
     }
 
-} -select_query  {select * from ims_md_classification_taxpath_taxon where ims_md_cl_ta_ta_id = :ims_md_cl_ta_ta_id and ims_md_cl_ta_id = :ims_md_cl_ta_id
+} -select_query_name select_md_class_tax \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_classification_taxpath_taxon
-            set identifier = :identifier,
-            entry_l = :entry_l,
-            entry_s = :entry_s
-            where ims_md_cl_ta_ta_id = :ims_md_cl_ta_ta_id"
-
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_classification_taxpath_taxon (ims_md_cl_ta_ta_id, ims_md_cl_ta_id, identifier, entry_l, entry_s)
-            values 
-            (:ims_md_cl_ta_ta_id, :ims_md_cl_ta_id, :identifier, :entry_l, :entry_s)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "classification_tpath" {ims_md_cl_ta_id ims_md_cl_id ims_md_id}]
@@ -98,6 +89,7 @@
 	}
 	entry {
 	    label "[_ lorsm.Entry_1]"
+	    display_eval {[concat \[$entry_l\] $entry_s]}
 	}
         export {
             display_eval {\[[_ lorsm.Edit_1]\]}
@@ -107,18 +99,4 @@
         }
     }
 
-db_multirow d_cl_taxon select_cl_taxon {
-    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
-    and
-           cl.ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_taxon select_cl_taxon {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_taxon.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_tpath.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_tpath.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_tpath.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_tpath.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -26,18 +26,11 @@
     -elements {
         source {
             label ""
+	    display_eval {[concat \[$source_l\] $source_v]}
         }
     }
 
-db_multirow d_cl_source select_cl_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
-} 
+db_multirow d_cl_source select_cl_source {} 
 
 # Classification Taxonomic Path Taxonomy
 template::list::create \
@@ -52,14 +45,8 @@
 	}
 	entry {
 	    label "[_ lorsm.Entry_1]"
+	    display_eval {[concat \[$entry_l\] $entry_s]}
 	}
     }
 
-db_multirow d_cl_taxon select_cl_taxon {
-    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
-}
+db_multirow d_cl_taxon select_cl_taxon {}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_tpath.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/classificationmd/classification_tsource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/classificationmd/Attic/classification_tsource.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/classificationmd/classification_tsource.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/classificationmd/classification_tsource.tcl	5 Dec 2006 09:15:05 -0000	1.3.4.1
@@ -32,7 +32,7 @@
     -mode edit \
     -form {
 
-    ims_md_cl_ta_id:key(ims_md_classification_taxpath_seq)
+    ims_md_cl_ta_id:key(ims_md_classif_taxpath_seq)
 
     {source_l:text,nospell
 	{section "[_ lorsm.lt_AddEdit_Classificatio_9]"}
@@ -53,15 +53,10 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     } 
 
-} -select_query  {select * 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
+} -select_query_name select_md_cl_tax \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_classification_taxpath
-            set source_l = :source_l,
-            source_v = :source_v
-            where ims_md_cl_ta_id = :ims_md_cl_ta_id"
-
 } -after_submit {
     ad_returnredirect [export_vars -base "classification_tpath" {ims_md_cl_ta_id ims_md_cl_id ims_md_id}]
         ad_script_abort
@@ -76,6 +71,7 @@
     -elements {
 	source {
             label ""
+	    display_eval {[concat \[$source_l\] $source_v]}
         }
         export {
             display_eval {\[[_ lorsm.Edit_1]\]}
@@ -85,16 +81,4 @@
         }
     }
 
-db_multirow d_cl_tsource select_cl_tsource {
-   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
-    and    cl.ims_md_cl_id = :ims_md_cl_id
-} 
+db_multirow d_cl_tsource select_cl_tsource {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/classificationmd/classification_tsource.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_cont.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_cont.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_cont.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_cont.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -51,18 +51,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_educational_context where ims_md_ed_co_id = :ims_md_ed_co_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_educational_context
-            set context_s = :context_s,
-            context_v = :context_v
-            where ims_md_ed_co_id = :ims_md_ed_co_id "
+} -select_query_name  select_md_edu \
+ -edit_data {
+        db_dml do_update ""
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_educational_context (ims_md_ed_co_id, ims_md_id, context_s, context_v) 
-            values (:ims_md_ed_co_id, :ims_md_id, :context_s, :context_v)"
+       db_dml do_insert ""
 } -after_submit {
     ad_returnredirect [export_vars -base "../educationalmd" {ims_md_id}]
         ad_script_abort
@@ -77,6 +70,7 @@
     -elements {
 	context {
             label "[_ lorsm.Context_1]"
+    	    display_eval {[concat \[$context_s\] $context_v]}
         }
         export {
             display_eval {\[[_ lorsm.Edit_1]\]}
@@ -86,13 +80,4 @@
         }
     }
 
-db_multirow d_ed_cont select_ed_cont {
-    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
-} 
+db_multirow d_ed_cont select_ed_cont {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_cont.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_desc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_desc.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_desc.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_desc.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -51,18 +51,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_educational_descrip where ims_md_ed_de_id = :ims_md_ed_de_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_educational_descrip
-            set descrip_l = :descrip_l,
-            descrip_s = :descrip_s
-            where ims_md_ed_de_id = :ims_md_ed_de_id "
+} -select_query_name select_md_edu_desc \
+  -edit_data {
+        db_dml do_update ""
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_educational_descrip (ims_md_ed_de_id, ims_md_id, descrip_l, descrip_s) 
-            values (:ims_md_ed_de_id, :ims_md_id, :descrip_l, :descrip_s)"
+       db_dml do_insert ""
 } -after_submit {
     ad_returnredirect [export_vars -base "../educationalmd" {ims_md_id}]
         ad_script_abort
@@ -75,8 +68,9 @@
     -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]}
         }
         export {
             display_eval {\[[_ lorsm.Edit_1]\]}
@@ -86,13 +80,4 @@
         }
     }
 
-db_multirow d_ed_desc select_ed_desc {
-    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
-} 
+db_multirow d_ed_desc select_ed_desc {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_desc.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_dif.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_dif.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_dif.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_dif.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -45,19 +45,13 @@
 } -on_submit {
     # check if the educational difficulty details already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_educational where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_educational
-            set difficulty_s = :difficulty_s, difficulty_v = :difficulty_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_educational (ims_md_id, difficulty_s, difficulty_v)
-            values
-            (:ims_md_id, :difficulty_s, :difficulty_v) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -74,15 +68,8 @@
     -elements {
 	diff {
             label "[_ lorsm.Difficulty_1]"
+	    display_eval {[concat \[$ difficulty_s\] $ difficulty_v]}
         }
     }
 
-db_multirow d_ed_dif select_ed_dif {
-    select 
-        '[' || difficulty_s || '] ' || difficulty_v as diff,
-        ims_md_id
-    from 
-           ims_md_educational
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ed_dif select_ed_dif {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_dif.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_ieur.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_ieur.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_ieur.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_ieur.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -51,18 +51,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_educational_ieur where ims_md_ed_ie_id = :ims_md_ed_ie_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_educational_ieur
-            set ieur_s = :ieur_s,
-            ieur_v = :ieur_v
-            where ims_md_ed_ie_id = :ims_md_ed_ie_id"
+} -select_query_name select_md_edu_ieur \
+  -edit_data {
+        db_dml do_update ""
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_educational_ieur (ims_md_ed_ie_id, ims_md_id, ieur_s, ieur_v) 
-            values (:ims_md_ed_ie_id, :ims_md_id, :ieur_s, :ieur_v)"
+       db_dml do_insert ""
 } -after_submit {
     ad_returnredirect [export_vars -base "../educationalmd" {ims_md_id}]
         ad_script_abort
@@ -77,6 +70,7 @@
     -elements {
 	ieur {
             label "[_ lorsm.lt_Intended_End_User_Rol_1]"
+	    display_eval {[concat \[$ieur_s\] $ieur_v]}
         }
         export {
             display_eval {\[[_ lorsm.Edit_1]\]}
@@ -86,13 +80,4 @@
         }
     }
 
-db_multirow d_ed_ieur select_ed_ieur {
-    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
-} 
+db_multirow d_ed_ieur select_ed_ieur {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_ieur.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_intl.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_intl.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_intl.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_intl.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -45,19 +45,13 @@
 } -on_submit {
     # check if the ED Interactivity Level already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_educational where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_educational
-            set int_level_s = :int_level_s, int_level_v = :int_level_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_educational (ims_md_id, int_level_s, int_level_v)
-            values
-            (:ims_md_id, :int_level_s, :int_level_v) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -74,15 +68,8 @@
     -elements {
 	intl {
             label "[_ lorsm.Interactivity_Level_1]"
+	    display_eval {[concat \[$int_level_s\] $int_level_v]}
         }
     }
 
-db_multirow d_ed_intl select_ed_intl {
-    select 
-        '[' || int_level_s || '] ' || int_level_v as intl,
-        ims_md_id
-    from 
-           ims_md_educational
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ed_intl select_ed_intl {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_intl.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_intt.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_intt.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_intt.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_intt.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -44,19 +44,13 @@
 } -on_submit {
     # check if the ED interactivity type details already exist...
 
-    if {[db_0or1row select_type {select ims_md_id from ims_md_educational where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_type {}]} {
 
-        db_dml do_update "
-            update ims_md_educational
-            set int_type_s = :int_type_s, int_type_v = :int_type_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_educational (ims_md_id, int_type_s, int_type_v)
-            values
-            (:ims_md_id, :int_type_s, :int_type_v) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -73,15 +67,8 @@
     -elements {
 	intt {
             label "[_ lorsm.Interactivity_Type_1]"
+	    display_eval {[concat \[$int_type_s\] $int_type_v]}
         }
     }
 
-db_multirow d_ed_intt select_ed_intt {
-    select 
-        '[' || int_type_s || '] ' || int_type_v as intt,
-        ims_md_id
-    from 
-           ims_md_educational
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ed_intt select_ed_intt {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_intt.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_lang.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_lang.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_lang.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_lang.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -45,17 +45,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_educational_lang where ims_md_ed_la_id = :ims_md_ed_la_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_educational_lang
-            set language = :language
-            where ims_md_ed_la_id = :ims_md_ed_la_id "
+} -select_query_name select_md_edu_lang \
+  -edit_data {
+        db_dml do_update ""
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_educational_lang (ims_md_ed_la_id, ims_md_id, language) 
-            values (:ims_md_ed_la_id, :ims_md_id, :language)"
+       db_dml do_insert ""
 } -after_submit {
     ad_returnredirect [export_vars -base "../educationalmd" {ims_md_id}]
         ad_script_abort
@@ -79,13 +73,4 @@
         }
     }
 
-db_multirow d_ed_lang select_ed_lang {
-    select 
-        language,
-        ims_md_ed_la_id,
-        ims_md_id
-    from 
-           ims_md_educational_lang
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ed_lang select_ed_lang {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_lang.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_lrt.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_lrt.tcl,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_lrt.tcl	3 Dec 2004 17:52:51 -0000	1.2
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_lrt.tcl	5 Dec 2006 09:16:27 -0000	1.2.6.1
@@ -49,18 +49,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_educational_lrt where ims_md_ed_lr_id = :ims_md_ed_lr_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_educational_lrt
-            set lrt_s = :lrt_s,
-            lrt_v = :lrt_v
-            where ims_md_ed_lr_id = :ims_md_ed_lr_id "
+} -select_query_name select_md_edu_lrt \
+  -edit_data {
+        db_dml do_update ""
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_educational_lrt (ims_md_ed_lr_id, ims_md_id, lrt_s, lrt_v) 
-            values (:ims_md_ed_lr_id, :ims_md_id, :lrt_s, :lrt_v)"
+       db_dml do_insert ""
 } -after_submit {
     ad_returnredirect [export_vars -base "../educationalmd" {ims_md_id}]
         ad_script_abort
@@ -84,13 +77,4 @@
         }
     }
 
-db_multirow d_ed_lrt select_ed_lrt {
-    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
-} 
+db_multirow d_ed_lrt select_ed_lrt {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_lrt.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_semd.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_semd.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_semd.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_semd.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -45,20 +45,13 @@
 } -on_submit {
     # check if the ED Semantic Density already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_educational where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_educational
-            set sem_density_s = :sem_density_s,
-            sem_density_v = :sem_density_v
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_educational (ims_md_id, sem_density_s, sem_density_v)
-            values
-            (:ims_md_id, :sem_density_s, :sem_density_v) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -75,15 +68,8 @@
     -elements {
 	semd {
             label "[_ lorsm.Semantic_Density_1]"
+	    display_eval {[concat \[$sem_density_s\] $sem_density_v]}
         }
     }
 
-db_multirow d_ed_semd select_ed_semd {
-    select 
-        '[' || sem_density_s || '] ' || sem_density_v as semd,
-        ims_md_id
-    from 
-           ims_md_educational
-    where
-           ims_md_id = :ims_md_id
-} 
+db_multirow d_ed_semd select_ed_semd {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_semd.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_tar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_tar.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_tar.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_tar.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -51,18 +51,11 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     }
 
-} -select_query  {select * from ims_md_educational_tar where ims_md_ed_ta_id = :ims_md_ed_ta_id and ims_md_id = :ims_md_id
-
-} -edit_data {
-        db_dml do_update "
-            update ims_md_educational_tar
-            set tar_l = :tar_l,
-            tar_s = :tar_s
-            where ims_md_ed_ta_id = :ims_md_ed_ta_id "
+} -select_query_name select_md_edu_tar \
+  -edit_data {
+        db_dml do_update ""
 } -new_data {
-       db_dml do_insert "
-            insert into ims_md_educational_tar (ims_md_ed_ta_id, ims_md_id, tar_l, tar_s) 
-            values (:ims_md_ed_ta_id, :ims_md_id, :tar_l, :tar_s)"
+       db_dml do_insert ""
 } -after_submit {
     ad_returnredirect [export_vars -base "../educationalmd" {ims_md_id}]
         ad_script_abort
@@ -77,6 +70,7 @@
     -elements {
 	tar {
             label "[_ lorsm.Typical_Age_Range_1]"
+	    display_eval {[concat \[$tar_l\] $tar_s]}
         }
         export {
             display_eval {\[Edit\]}
@@ -86,13 +80,4 @@
         }
     }
 
-db_multirow d_ed_tar select_ed_tar {
-    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
-} 
+db_multirow d_ed_tar select_ed_tar {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_tar.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/educationalmd/educational_tlt.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/educationalmd/Attic/educational_tlt.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/educationalmd/educational_tlt.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/educationalmd/educational_tlt.tcl	5 Dec 2006 09:16:27 -0000	1.3.4.1
@@ -50,21 +50,13 @@
 } -on_submit {
     # check if the educational typical learning time details already exist...
 
-    if {[db_0or1row select_size {select ims_md_id from ims_md_educational where ims_md_id = :ims_md_id}]} {
+    if {[db_0or1row select_size {}]} {
 
-        db_dml do_update "
-            update ims_md_educational
-            set type_lrn_time_s = :type_lrn_time_s, 
-            type_lrn_time_l = :type_lrn_time_l,
-            type_lrn_time = :type_lrn_time
-            where ims_md_id = :ims_md_id "
+        db_dml do_update ""
 
     } else {
 
-        db_dml do_insert "
-            insert into ims_md_educational (ims_md_id, type_lrn_time_s, type_lrn_time_l, type_lrn_time)
-            values
-            (:ims_md_id, :type_lrn_time_s, :type_lrn_time_l, :type_lrn_time) "
+        db_dml do_insert ""
     }
 
 } -after_submit {
@@ -84,16 +76,8 @@
         }
 	tlt_ls {
             label "[_ lorsm.Language_1]"
+	    display_eval {[concat \[$type_lrn_time_l\] $time_lrn_time_s]}
         }
     }
 
-db_multirow d_ed_tlt select_ed_tlt {
-    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
-} 
+db_multirow d_ed_tlt select_ed_tlt {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/educationalmd/educational_tlt.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/form-md-record/md-record.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/form-md-record/Attic/md-record.tcl,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/lorsm/www/md/form-md-record/md-record.tcl	3 Dec 2004 17:52:51 -0000	1.2
+++ openacs-4/packages/lorsm/www/md/form-md-record/md-record.tcl	5 Dec 2006 09:17:56 -0000	1.2.6.1
@@ -23,11 +23,4 @@
         }
     }
 
-db_multirow d_pres select_ge_titles {
-    select 
-           object_type
-    from 
-           acs_objects
-    where
-           object_id = :ims_md_id
-}
+db_multirow d_pres select_ge_titles {}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/form-md-record/md-record.xql'.
Fisheye: No comparison available.  Pass `N' to diff?