Index: openacs-4/packages/lorsm/www/md/annotationmd/annotation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/annotationmd/Attic/annotation.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/annotationmd/annotation.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/annotationmd/annotation.tcl	5 Dec 2006 09:14:04 -0000	1.3.4.1
@@ -28,13 +28,7 @@
         }
     }
 
-db_multirow d_an_ent select_an_ent {
-    select entity
-    from 
-           ims_md_annotation
-    where
-           ims_md_an_id = :ims_md_an_id
-} 
+db_multirow d_an_ent select_an_ent {} 
 
 # Annotation Date 
 template::list::create \
@@ -44,22 +38,16 @@
     -actions [list "[_ lorsm.Add_Date]" [export_vars -base annotation_date {ims_md_an_id ims_md_id}] "[_ lorsm.Add_another_Date]"] \
     -html { align right style "width: 100%;" } \
     -elements {
-        date {
+        annotation_date {
             label "[_ lorsm.Date_1]"
         }
 	datels {
 	    label "[_ lorsm.Description_1]"
+	    display_eval {[concat \[$date_l\] $date_s]}
 	}
     }
 
-db_multirow d_an_date select_an_date {
-    select date,
-    '[' || date_l || '] ' || date_s as datels
-    from 
-           ims_md_annotation
-    where
-           ims_md_an_id = :ims_md_an_id
-} 
+db_multirow d_an_date select_an_date {} 
 
 # Annotation Description
 template::list::create \
@@ -71,14 +59,8 @@
     -elements {
         desc {
             label ""
+	    display_eval {[concat \[$descrip_l\] $descrip_s]}
         }
     }
 
-db_multirow d_an_desc select_an_desc {
-    select 
-    '[' || descrip_l || '] ' || descrip_s as desc
-    from 
-           ims_md_annotation_descrip
-    where
-           ims_md_an_id = :ims_md_an_id
-} 
+db_multirow d_an_desc select_an_desc {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/annotationmd/annotation.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/annotationmd/annotation_add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/annotationmd/Attic/annotation_add.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/annotationmd/annotation_add.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/annotationmd/annotation_add.tcl	5 Dec 2006 09:14:04 -0000	1.3.4.1
@@ -32,10 +32,9 @@
     } 
 
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_annotation (ims_md_an_id, ims_md_id) 
-            values (:ims_md_an_id, :ims_md_id)"
+        db_dml do_insert ""
 
+
 } -after_submit {
     ad_returnredirect [export_vars -base "../annotationmd" {ims_md_id}]
         ad_script_abort
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/annotationmd/annotation_add.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/annotationmd/annotation_date.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/annotationmd/Attic/annotation_date.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/annotationmd/annotation_date.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/annotationmd/annotation_date.tcl	5 Dec 2006 09:14:04 -0000	1.3.4.1
@@ -53,16 +53,10 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     } 
 
-} -select_query  {select * from ims_md_annotation where ims_md_an_id = :ims_md_an_id
+} -select_query_name  select_md_ann \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_annotation
-            set date = :date,
-            date_l = :date_l,
-            date_s = :date_s
-            where ims_md_an_id = :ims_md_an_id "
-
 } -after_submit {
     ad_returnredirect [export_vars -base "annotation" {ims_md_an_id ims_md_id}]
         ad_script_abort
@@ -75,21 +69,13 @@
     -no_data "[_ lorsm.No_Date_Available]" \
     -html { align right style "width: 100%;" } \
     -elements {
-	date {
+	annotation_date {
             label "[_ lorsm.Date_1]"
         }
 	datels {
 	    label "[_ lorsm.Description_1]"
+	    display_eval {[concat \[$date_l\] $date_s]}
 	}
     }
 
-db_multirow d_an_date select_an_date {
-    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
-} 
+db_multirow d_an_date select_an_date {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/annotationmd/annotation_date.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/annotationmd/annotation_desc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/annotationmd/Attic/annotation_desc.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/annotationmd/annotation_desc.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/annotationmd/annotation_desc.tcl	5 Dec 2006 09:14:04 -0000	1.3.4.1
@@ -55,20 +55,12 @@
     {ims_md_an_id:text(hidden) {value $ims_md_an_id}
     }
 
-} -select_query  {select * from ims_md_annotation_descrip where ims_md_an_de_id = :ims_md_an_de_id and ims_md_an_id = :ims_md_an_id
+} -select_query_name select_md_ann_desc \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_annotation_descrip
-            set descrip_l = :descrip_l,
-            descrip_s = :descrip_s
-            where ims_md_an_de_id = :ims_md_an_de_id"
-
 } -new_data {
-        db_dml do_insert "
-            insert into ims_md_annotation_descrip (ims_md_an_de_id, ims_md_an_id, descrip_l, descrip_s)
-            values 
-            (:ims_md_an_de_id, :ims_md_an_id, :descrip_l, :descrip_s)"
+        db_dml do_insert ""
 
 } -after_submit {
     ad_returnredirect [export_vars -base "annotation" {ims_md_an_id ims_md_id}]
@@ -82,8 +74,9 @@
     -no_data "No Description Available" \
     -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_an_desc select_an_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
-    and
-           ande.ims_md_an_id = :ims_md_an_id
-} 
+db_multirow d_an_desc select_an_desc {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/annotationmd/annotation_desc.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/lorsm/www/md/annotationmd/annotation_ent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/md/annotationmd/Attic/annotation_ent.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lorsm/www/md/annotationmd/annotation_ent.tcl	17 May 2005 17:03:42 -0000	1.3
+++ openacs-4/packages/lorsm/www/md/annotationmd/annotation_ent.tcl	5 Dec 2006 09:14:04 -0000	1.3.4.1
@@ -41,14 +41,10 @@
     {ims_md_id:text(hidden) {value $ims_md_id}
     } 
 
-} -select_query  {select * from ims_md_annotation where ims_md_an_id = :ims_md_an_id
+} -select_query select_md_ann \
+  -edit_data {
+        db_dml do_update ""
 
-} -edit_data {
-        db_dml do_update "
-            update ims_md_annotation
-            set entity = :entity
-            where ims_md_an_id = :ims_md_an_id "
-
 } -after_submit {
     ad_returnredirect [export_vars -base "annotation" {ims_md_an_id ims_md_id}]
         ad_script_abort
@@ -66,13 +62,4 @@
         }
     }
 
-db_multirow d_an_ent select_an_ent {
-    select 
-        entity,
-        ims_md_an_id,
-        ims_md_id
-    from 
-           ims_md_annotation
-    where
-           ims_md_an_id = :ims_md_an_id
-} 
+db_multirow d_an_ent select_an_ent {} 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/lorsm/www/md/annotationmd/annotation_ent.xql'.
Fisheye: No comparison available.  Pass `N' to diff?