Index: openacs-4/packages/ams/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ams/www/index.tcl	21 Oct 2004 01:53:50 -0000	1.2
+++ openacs-4/packages/ams/www/index.tcl	22 Oct 2004 01:17:31 -0000	1.3
@@ -20,8 +20,13 @@
 set package_key      "ams"
 set object_type      "ams_list"
 set list_name        "ams_list_demo"
-set list_name_pretty "The Fields used to Add/Edit a Contact Person"
-ams::define_list $list_name $list_name_pretty $package_key $object_type {
+set pretty_name      "The Fields used to Add/Edit a Contact Person"
+
+ams::define_list -package_key $package_key \
+    -object_type $object_type \
+    -list_name $list_name \
+    -pretty_name $pretty_name \
+    -attributes {
         {first_names textbox {First Name(s)} {First Names} required}
         {middle_names textbox {Middle Name(s)} {Middle Names}}
         {last_name textbox {Last Name} {Last Names} required}
@@ -31,26 +36,38 @@
         {organization_address address {Organization Address} {Organization Addresses}}
     }
 
-set object_id [db_string get_list_id {
-    select list_id
-      from ams_lists
-     where short_name = :list_name
-       and package_key = :package_key
-       and object_type = :object_type
-}]
+set object_id [ams::list::get_list_id \
+                   -package_key $package_key \
+                   -object_type $object_type \
+                   -list_name $list_name]
 
-ad_form -name entry \
-    -form [ams::ad_form::elements -key object_id $package_key $object_type $list_name] \
-    -edit_request {
-        ams::object::attribute::values -names -varenv $object_id
-    } -on_submit {
-        ams::ad_form::save entry $package_key $object_type $list_name $object_id
-    } -after_submit {
-        if { ![exists_and_not_null return_url] } {
-            set return_url "./"
-        }
-    }
+#ad_form -name entry \
+#    -form [ams::ad_form::elements -package_key $package_key \
+#               -object_type $object_type \
+#               -list_name $list_name \
+#              -key "object_id"] \
+#    -edit_request {
+#        ams::object::attribute::values -vars -object_id $object_id
+#    } -on_submit {
+#        ams::ad_form::save -package_key $package_key \
+#            -object_type $object_type \
+#            -list_name $list_name \
+#            -form_name "entry" \
+#            -object_id $object_id
+#    } -after_submit {
+#        if { ![exists_and_not_null return_url] } {
+#            set return_url "./"
+#        }
+#    }
+#
 
-set attr_list [ams::object::attribute::values -names $object_id]
+ams_form -package_key $package_key \
+    -object_type $object_type \
+    -list_name $list_name \
+    -form_name "entry" \
+    -object_id $object_id \
+    -return_url "./"
 
+set attr_list [ams::object::attribute::values -object_id $object_id]
+
 ad_return_template