Index: openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl 13 Mar 2004 00:40:26 -0000 1.6 +++ openacs-4/contrib/packages/portal/tcl/datasource-procs.tcl 21 Mar 2004 02:39:57 -0000 1.7 @@ -69,6 +69,7 @@ set datasource(admin_p) f set datasource(shadeable_p) t set datasource(hideable_p) t + set datasource(params) {} array set datasource $spec @@ -94,29 +95,17 @@ foreach {param value} $datasource(params) { - if { ![regexp {^([^ \t:]+)(?::([a-zA-Z0-9_,(|)]*))} \ - $param match param_name flags] } { - ad_return -code error "Parameter name '$param' doesn't have the right format. It must be var\[:flag\[,flag ...\]\]" - } + # set defaults for attributes - these are IGNORED and I (DRB) only left + # them in the datamodel to make re-integration with .LRN ever-so-slightly easy. - # set defaults for attributes set config_required_p f set configured_p f - # now set the parameter flags - foreach flag [split [string tolower $flags] ","] { - switch -exact $flag { - configured { set configured_p t } - config_required { set config_required_p t} - default { ad_return -code error "\"$flag\" is not a legal portal datasource attribute" } - } - } - # and define the parameter set_def_param -datasource_id $datasource_id \ -config_required_p $config_required_p \ -configured_p $configured_p \ - -key $param_name \ + -key $param \ -value $value }