Index: openacs-4/packages/cms/www/modules/types/widget-register-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-1.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/cms/www/modules/types/widget-register-1.tcl	20 Aug 2002 04:18:00 -0000	1.4
+++ openacs-4/packages/cms/www/modules/types/widget-register-1.tcl	13 Feb 2003 22:58:16 -0000	1.4.2.1
@@ -13,9 +13,8 @@
 }
 
 
-set form_widgets [db_list_of_lists get_form_widgets ""]
+set form_widgets [db_list_of_lists get_form_widgets "" ]
 
-
 element create widget_register widget \
 	-datatype keyword \
 	-widget select \
@@ -37,7 +36,7 @@
 
     db_1row get_attr_info ""
 
-    db_1row get_reg_widget ""
+    db_0or1row get_reg_widget ""
 
     element set_properties widget_register content_type_pretty \
 	    -value $content_type_pretty
@@ -67,29 +66,17 @@
 
     db_transaction {
 
-        set already_registered [db_string registered "" -default ""]
+        set already_registered [db_string check_registered "" -default ""]
 
         # just update the is_required column if this widget is already registered
         #   this way we don't overwrite the existing attribute widget params
         if { ![string equal $already_registered ""] && \
                  $already_registered } {
-            db_dml update_widgets "
-	  update cm_attribute_widgets
-            set is_required = decode(is_required,'t','f','t')
-            where attribute_id = :attribute_id
-            and widget = :widget"
+            db_dml update_widgets ""
         } else {
 
             # (re)register a widget to an attribute
-            db_exec_plsql register_widget "
-	  begin
-	  cm_form_widget.register_attribute_widget(
-              content_type   => :content_type,
-              attribute_name => :attribute_name,
-              widget         => :widget,
-              is_required    => :is_required
-          );
-	  end;"
+            db_exec_plsql register_widget ""
         }
     }
     
Index: openacs-4/packages/cms/www/modules/types/widget-register-1.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-1.xql,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/cms/www/modules/types/widget-register-1.xql	8 Jun 2001 01:44:53 -0000	1.2
+++ openacs-4/packages/cms/www/modules/types/widget-register-1.xql	13 Feb 2003 22:58:16 -0000	1.2.4.1
@@ -1,8 +1,15 @@
 <?xml version="1.0"?>
 <queryset>
 
+<fullquery name="get_form_widgets"> 
+      <querytext>
+ select
+    widget, widget
+  from
+    cm_form_widgets    
+      </querytext>
+</fullquery>
 
- 
 <fullquery name="check_registered">      
       <querytext>
       
@@ -17,5 +24,31 @@
       </querytext>
 </fullquery>
 
- 
+<fullquery name="get_reg_widget">
+      <querytext>
+      select
+        widget as registered_widget, is_required
+      from
+        cm_attribute_widgets
+      where
+        attribute_id = :attribute_id"
+      </querytext>
+</fullquery>
+
+<fullquery name="get_attr_info">      
+      <querytext>
+      select
+        a.pretty_name as attribute_name_pretty, 
+        t.pretty_name as content_type_pretty,
+        t.object_type as content_type,
+        a.attribute_name
+      from
+        acs_attributes a, acs_object_types t
+      where
+        a.object_type = t.object_type
+      and
+        a.attribute_id = :attribute_id
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/cms/www/modules/types/widget-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/cms/www/modules/types/widget-register.tcl	20 Aug 2002 11:17:30 -0000	1.3
+++ openacs-4/packages/cms/www/modules/types/widget-register.tcl	13 Feb 2003 22:58:16 -0000	1.3.2.1
@@ -5,7 +5,7 @@
 request set_param content_type -datatype keyword
 request set_param widget -datatype keyword -optional
 
-seet module_id [db_string get_module_id ""]
+set module_id [db_string get_module_id ""]
 
 # permissions check - need cm_write on types module to edit a widget
 content::check_access $module_id cm_write -user_id [User::getID]