Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -r1.125 -r1.126 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 2 Sep 2008 22:18:28 -0000 1.125 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 5 Sep 2008 17:18:23 -0000 1.126 @@ -434,9 +434,9 @@ # # second, resolve object level methods # - #my log "--o try index '$object'" + #my log "--o try '$object'" set page [my resolve_request -simple $simple -path $object method] - #my log "--o page is '$page'" + #my log "--o page is '$page' simple=$simple" if {$simple || $page ne ""} { if {$page ne ""} { } @@ -564,16 +564,15 @@ set item_id 0 if {$path ne ""} { - + # todo: caching opportunity? set item_id [::xo::db::CrClass lookup -name $path -parent_id $folder_id] - my log "--try $path ($folder_id) -> $item_id" if {$simple} { if {$item_id != 0} { set r [::xo::db::CrClass get_instance_from_db -item_id $item_id] } return [expr {$item_id ? $item_id : ""}] } - + my log "--try $path ($folder_id) -> $item_id" if {$item_id == 0} { my get_name_and_lang_from_path $path lang local_name set name ${lang}:$local_name Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v diff -u -r1.100 -r1.101 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 18 Aug 2008 12:10:52 -0000 1.100 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 5 Sep 2008 17:18:23 -0000 1.101 @@ -54,7 +54,6 @@ set form_fields [list] foreach __field $field_list { - # if there is no field spec, use the default from the slot definitions set __spec [expr {[my exists f.$__field] ? [my set f.$__field] : "="}] set __wspec [lindex $__spec 0] @@ -83,14 +82,14 @@ if {$__name eq "options"} {eval lappend __value [my folderspec]} lappend __newspec [list $__name $__value] } - #my log "--F rewritten spec is '$__newspec'" + #my msg "--F rewritten spec is '$__newspec'" set __spec $__newspec } } elseif {[lindex $__wspec 0] eq "="} { # # get the information from the attribute definitions & given specs # - #my msg "spec=$__spec,wspec=$__wspec" + set f [$data create_raw_form_field \ -name $__field \ -slot [$data find_slot $__field] \ Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.161 -r1.162 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 4 Sep 2008 23:34:33 -0000 1.161 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 5 Sep 2008 17:18:23 -0000 1.162 @@ -246,11 +246,13 @@ Page instproc edit { {-new:boolean false} {-autoname:boolean false} - {-validaton_errors ""} + {-validation_errors ""} } { my instvar package_id item_id revision_id $package_id instvar folder_id ;# this is the root folder + #my msg "--edit new=$new autoname=$autoname, valudation_errors=$validation_errors" + # set some default values if they are provided foreach key {name title page_order last_page_id} { if {[$package_id exists_query_parameter $key]} { @@ -298,9 +300,9 @@ } #my log "--u submit_link=$submit_link qp=[my query_parameter return_url]" - # we have to do template mangling here; ad_form_template writes form - # variables into the actual parselevel, so we have to be in our - # own level in order to access an pass these + # We have to do template mangling here; ad_form_template writes + # form variables into the actual parselevel, so we have to be in + # our own level in order to access an pass these. variable ::template::parse_level lappend parse_level [info level] set action_vars [expr {$new ? "{edit-new 1} object_type return_url" : "{m edit} return_url"}] @@ -311,7 +313,6 @@ -folderspec [expr {$fs_folder_id ne "" ?"folder_id $fs_folder_id":""}] \ -submit_link $submit_link \ -autoname $autoname - if {[info exists return_url]} { ::xowiki::f1 generate -export [list [list return_url $return_url]] } else {