Index: openacs-4/packages/xowiki/tcl/import-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v diff -u -r1.38 -r1.39 --- openacs-4/packages/xowiki/tcl/import-procs.tcl 9 Apr 2018 07:58:06 -0000 1.38 +++ openacs-4/packages/xowiki/tcl/import-procs.tcl 18 May 2018 09:28:49 -0000 1.39 @@ -25,11 +25,11 @@ set href [$obj pretty_link] set name [[$obj package_id] external_name -parent_id [$obj parent_id] [$obj name]] switch -- $operation { - "added" { set operation "[_ xowiki.added]" } - "replaced" { set operation "[_ xowiki.replaced]" } - "updated" { set operation "[_ xowiki.updated]" } - "inherited" { set operation "[_ xowiki.inherited]" } - } + "added" { set operation [_ xowiki.added] } + "replaced" { set operation [_ xowiki.replaced] } + "updated" { set operation [_ xowiki.updated] } + "inherited" { set operation [_ xowiki.inherited] } + } append :log "$operation$name\n" } Importer instproc report {} { @@ -43,7 +43,7 @@ # Import a single object. In essence, this method demarshalls a # single object and inserts it (or updates it) in the database. It # takes as well care about categories. - # + # $object demarshall -parent_id [$object parent_id] -package_id ${:package_id} \ -creation_user ${:user_id} -create_user_ids $create_user_ids @@ -119,7 +119,7 @@ $o parent_id "" } set todo($o) 1 - + # # Handle import of categories in the first pass # @@ -155,7 +155,7 @@ :msg "need name for $old_template_id. Maybe item_ids for PageTemplate missing?" break } - + set template_name_key $parent_ids($old_template_id)-$old_names($old_template_id) if {![info exists name_map($template_name_key)]} { #:msg "... delay import of $o (no object with name $template_name_key) imported" @@ -179,8 +179,8 @@ # or a workflow) with the same name can be found in the # target, don't materialize the inherited page. # - if {$keep_inherited - && [$o exists __export_reason] + if {$keep_inherited + && [$o exists __export_reason] && [$o set __export_reason] eq "implicit_page_template"} { $o unset __export_reason set page [${:package_id} get_page_from_item_ref \ @@ -220,15 +220,15 @@ #:msg "[:isobject [$o page_template]] loaded" } } - + if {[info exists item_ids($old_parent_id)]} { $o set parent_id $id_map($old_parent_id) } else { $o set parent_id ${:parent_id} } - + # Everything is mapped, we can now do the import. - + #:msg "start import for $o, name=[$o name]" :import \ -object $o \ @@ -247,7 +247,7 @@ } set name_map($old_parent_id-$old_name) [$o item_id] #:msg "setting name_map($old_parent_id-$old_name)=$name_map($old_parent_id-$old_name), o=$o, old_item_id=$old_item_id" - + set new 1 } if {$new == 0} { @@ -269,7 +269,7 @@ # A small helper for exporting objects # - Object create exporter + Object create exporter exporter proc include_needed_objects {item_ids} { # # Load the objects @@ -315,7 +315,7 @@ if {![info exists items($item_id)]} { ::xo::db::CrClass get_instance_from_db -item_id $item_id ns_log notice "--export including child $item_id [$item_id name]" - set items($item_id) 1 + set items($item_id) 1 set new 1 $item_id set __export_reason implicit_child_page } @@ -350,8 +350,8 @@ # ns_set put [ns_conn outputheaders] "Content-Type" "text/plain" ns_set put [ns_conn outputheaders] "Content-Disposition" "attachment;filename=export.xotcl" - ad_return_top_of_page "" - + ad_return_top_of_page "" + foreach item_id $item_ids { ns_log notice "--exporting $item_id [$item_id name]" set pretty_link [expr {[$item_id package_id] ne "" ? [$item_id pretty_link] : "(not visible)"}] @@ -361,7 +361,7 @@ } on error {errorMsg} { ns_log error "Error while exporting $item_id [$item_id name]\n$errorMsg\n$::errorInfo" } finally { - ns_write "$obj\n" + ns_write "$obj\n" } } } @@ -509,7 +509,7 @@ } } } -::xo::library source_dependent +::xo::library source_dependent # # Local variables: Index: openacs-4/packages/xowiki/tcl/yui-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-init.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/tcl/yui-init.tcl 14 Mar 2018 15:40:49 -0000 1.1 +++ openacs-4/packages/xowiki/tcl/yui-init.tcl 18 May 2018 09:28:49 -0000 1.2 @@ -34,8 +34,8 @@ utilities/utilities yahoo-dom-event/yahoo-dom-event } - + # # The following asset files is up to my knowledge not available via CDN # @@ -52,28 +52,35 @@ if {[file isdirectory $::acs::rootdir/packages/ajaxhelper/www/resources]} { foreach path $YUI_CSS_PATHS { - template::register_urn \ - -urn urn:ad:css:yui2:$path \ - -resource /resources/ajaxhelper/yui/$path.css + template::register_urn \ + -urn urn:ad:css:yui2:$path \ + -resource /resources/ajaxhelper/yui/$path.css } foreach path $YUI_JS_PATHS { - template::register_urn \ - -urn urn:ad:js:yui2:$path \ - -resource /resources/ajaxhelper/yui/$path.js + template::register_urn \ + -urn urn:ad:js:yui2:$path \ + -resource /resources/ajaxhelper/yui/$path.js } - + } else { set version 2.7.0 foreach path $YUI_CSS_PATHS { - template::register_urn \ - -urn urn:ad:css:yui2:$path \ - -resource //yui.yahooapis.com/$version/build/$path.css + template::register_urn \ + -urn urn:ad:css:yui2:$path \ + -resource //yui.yahooapis.com/$version/build/$path.css } foreach path $YUI_JS_PATHS { - template::register_urn \ - -urn urn:ad:js:yui2:$path \ - -resource //yui.yahooapis.com/$version/build/$path.js + template::register_urn \ + -urn urn:ad:js:yui2:$path \ + -resource //yui.yahooapis.com/$version/build/$path.js } } + +# +# Local variables: +# mode: tcl +# tcl-indent-level: 2 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/xotcl-core/lib/revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/lib/revisions.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/xotcl-core/lib/revisions.tcl 7 Aug 2017 23:48:30 -0000 1.7 +++ openacs-4/packages/xotcl-core/lib/revisions.tcl 18 May 2018 09:32:08 -0000 1.8 @@ -28,47 +28,47 @@ -elements { version_number {label "" html {align right}} name { label "" - display_template { - view - } - sub_class narrow - link_url_col version_link + display_template { + view + } + sub_class narrow + link_url_col version_link } author { label #file-storage.Author# - display_template {@revisions.author_link;noquote@} + display_template {@revisions.author_link;noquote@} } content_size { label #file-storage.Size# html {align right} - display_col content_size_pretty + display_col content_size_pretty } last_modified_ansi { label #file-storage.Last_Modified# - display_col last_modified_pretty + display_col last_modified_pretty } description { label #file-storage.Version_Notes#} live_revision { label #xotcl-core.live_revision# - display_template { - \ - @revisions.live_revision@ - } - html {align center} - sub_class narrow + display_template { + \ + @revisions.live_revision@ + } + html {align center} + sub_class narrow } version_delete { label "" link_url_col version_delete_link - display_template { - delete - } - html {align center} + display_template { + delete + } + html {align center} } } -db_multirow -unclobber -extend { - author_link last_modified_pretty - content_size_pretty version_link version_delete version_delete_link +db_multirow -unclobber -extend { + author_link last_modified_pretty + content_size_pretty version_link version_delete version_delete_link live_revision live_revision_icon live_revision_link } revisions revisions_info {} { set version_number $version_number: @@ -79,12 +79,12 @@ } else { set content_size_pretty "[lc_numeric [format %.2f [expr {$content_size/1024.0}]]] [_ file-storage.kb]" } - + if {$name eq ""} {set name [_ file-storage.untitled]} set live_revision_link [export_vars -base make-live-revision \ - {page_id name {revision_id $version_id}}] + {page_id name {revision_id $version_id}}] set version_delete_link [export_vars -base delete-revision \ - {page_id name {revision_id $version_id}}] + {page_id name {revision_id $version_id}}] set version_link [export_vars -base view {{revision_id $version_id} {item_id $page_id}}] if {$version_id != $live_revision_id} { set live_revision "Make this Revision Current" Index: openacs-4/packages/xotcl-core/tcl/doc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/doc-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/xotcl-core/tcl/doc-procs.tcl 9 May 2018 15:33:34 -0000 1.5 +++ openacs-4/packages/xotcl-core/tcl/doc-procs.tcl 18 May 2018 09:32:08 -0000 1.6 @@ -3,29 +3,29 @@ @creation-date 2015-04-30 @author Gustaf Neumann - @cvs-id $Id$ + @cvs-id $Id$ } namespace eval ::xo { proc dotquote {e} { - return \"$e\" + return \"$e\" } proc dotquotel {l} { - set result [list] - foreach e $l { lappend result \"$e\" } - return $result + set result [list] + foreach e $l { lappend result \"$e\" } + return $result } - + ad_proc dot_append_method {{-documented_methods 1} e methods_ref kind} { } { - upvar $methods_ref methods - set infokind $kind - if {$kind eq "instproc"} {append infokind s} - ::xo::api scope_from_object_reference scope e + upvar $methods_ref methods + set infokind $kind + if {$kind eq "instproc"} {append infokind s} + ::xo::api scope_from_object_reference scope e if {$kind eq "proc"} {set prefix "→ "} {set prefix ""} - foreach methodName [xo::getObjectProperty $e $kind] { + foreach methodName [xo::getObjectProperty $e $kind] { if {$documented_methods} { set proc_index [::xo::api proc_index $scope $e $kind $methodName] #my msg "check $methodName => [nsv_exists api_proc_doc $proc_index]" @@ -37,71 +37,71 @@ } } } - + ad_proc dotclass {{-is_focus 0} {-documented_methods 1} e} { } { - set definition "" + set definition "" if {$is_focus} { - set style "style=filled,penwidth=1.5,color=bisque4,fillcolor=beige," - } else { - set style "" - } - set url [export_vars -base show-object [list [list object $e]]] - append definition "[dotquote $e] \[${style}URL=\"$url\",label=\"\{$e|" - foreach slot [$e info slots] { - set name "" - catch {set name $slot name} - if {$name ne ""} { - append definition "[$slot name]\\l" - } - } - append definition "|" - ::xo::api scope_from_object_reference scope e - set methods [list] + set style "style=filled,penwidth=1.5,color=bisque4,fillcolor=beige," + } else { + set style "" + } + set url [export_vars -base show-object [list [list object $e]]] + append definition "[dotquote $e] \[${style}URL=\"$url\",label=\"\{$e|" + foreach slot [$e info slots] { + set name "" + catch {set name $slot name} + if {$name ne ""} { + append definition "[$slot name]\\l" + } + } + append definition "|" + ::xo::api scope_from_object_reference scope e + set methods [list] dot_append_method -documented_methods $documented_methods $e methods proc dot_append_method -documented_methods $documented_methods $e methods instproc - dot_append_method -documented_methods $documented_methods $e methods instforward - foreach method [lsort $methods] {append definition "$method\\l" } - append definition "\}\"\];\n" + dot_append_method -documented_methods $documented_methods $e methods instforward + foreach method [lsort $methods] {append definition "$method\\l" } + append definition "\}\"\];\n" } ad_proc dotobject {e} { } { - set url [export_vars -base show-object [list [list object $e]]] - set definition "[dotquote $e] \[URL=\"$url\"\];\n"; + set url [export_vars -base show-object [list [list object $e]]] + set definition "[dotquote $e] \[URL=\"$url\"\];\n"; } ad_proc dotcode { - {-with_children 0} - {-with_instance_relations 0} - {-omit_base_classes 1} - {-documented_methods 1} - {-current_object ""} - {-dpi 96} - things + {-with_children 0} + {-with_instance_relations 0} + {-omit_base_classes 1} + {-documented_methods 1} + {-current_object ""} + {-dpi 96} + things } { } { - set classes {} - set objects {} - set iclasses {} - set mclasses {} - - foreach e $things { + set classes {} + set objects {} + set iclasses {} + set mclasses {} + + foreach e $things { if {![::nsf::is object $e] || ($omit_base_classes && [::nsf::is baseclass $e])} continue lappend [expr {[::nsf::is class $e] ? "classes" : "objects"}] $e - } - set instances "" - if {$with_instance_relations} { + } + set instances "" + if {$with_instance_relations} { foreach e $things { if {![::nsf::is object $e] || ($omit_base_classes && [::nsf::is baseclass $e])} continue set c [$e info class] if {$omit_base_classes && [::nsf::is baseclass $c]} continue if {$c ni $things} {lappend iclasses $c} append instances "[dotquote $e]->[dotquote $c];\n" } - } - set superclasses "" - foreach e $classes { + } + set superclasses "" + foreach e $classes { if {![::nsf::is object $e]} continue set reduced_sc [list] foreach sc [::xo::getObjectProperty $e superclass] { @@ -114,7 +114,7 @@ append superclasses "[dotquote $e]->[dotquotel $sc];\n" } } - } + } set children "" set mixins "" foreach e $things { @@ -164,7 +164,7 @@ foreach e $iclasses { append ticlasses [dotobject $e] } - + #label = \".\\n.\\nObject relations of [self]\" #edge \[dir=back, constraint=0\] \"::Decorate_Action\" -> \"::Action\"; set objects [join [dotquotel $objects] {; }]