$content" - } else { - ns_return 200 text/html $content - } - } else { - # use adp file - set template_file [$folder_id get_payload template_file] - if {$template_file ne ""} {template::set_file "[file dir $__adp_stub]/$template_file"} - } -} else { - ns_return 200 text/html $content - ad_script_abort -} Index: openacs-4/packages/xowiki/tcl/link-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 27 May 2006 12:05:16 -0000 1.5 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 26 Jul 2006 22:56:46 -0000 1.6 @@ -29,16 +29,18 @@ Link instproc render {} { set page [my info parent] set item_id [my resolve] + #my log "--u resolve returns $item_id" if {$item_id} { $page lappend references [list $item_id [my type]] set href [::xowiki::Page pretty_link -package_id [my package_id] -lang [my lang] \ [my stripped_name]] my render_found $href [my label] } else { + my instvar package_id $page incr unresolved_references set object_type [[$page info class] set object_type] set name [my label] - set href [export_vars -base [::xowiki::Page url_prefix -package_id [my package_id]]edit {object_type name}] + set href [export_vars -base [$package_id package_url] {{edit-new 1} object_type name}] my render_not_found $href [my label] } } @@ -49,12 +51,15 @@ set package_id [site_node::get_children -node_id $a -package_key xowiki \ -filters [list name $name] -element package_id] if {$package_id ne ""} { - set folder_id [::xowiki::Page require_folder -package_id $package_id \ - -name xowiki -store_folder_id false] - return [list package_id $package_id folder_id $folder_id] + my log "--LINK found package_id=$package_id [my isobject ::$package_id]" + if {![my isobject ::$package_id]} { + my log "--LINK creating package object" + ::xowiki::Package create ::$package_id + } + return $package_id } } - return [list] + return 0 } @@ -65,7 +70,7 @@ Class create ::xowiki::Link::language -superclass ::xowiki::Link ::xowiki::Link::language instproc render {} { set page [my info parent] - my instvar lang + my instvar lang name package_id set item_id [my resolve] if {$item_id} { set css_class "found" @@ -74,7 +79,7 @@ set css_class "undefined" set last_page_id [$page set item_id] set object_type [[$page info class] set object_type] - set link [export_vars -base [::xowiki::Page url_prefix]edit {object_type name last_page_id}] + set link [export_vars -base [$package_id package_url] {{edit-new 1} object_type name last_page_id}] } $page lappend lang_links \ "
"
}
- Page ad_proc select_query {
- {-select_attributes ""}
- {-order_clause ""}
- {-where_clause ""}
- {-count:boolean false}
- {-folder_id}
- {-page_size 20}
- {-page_number ""}
- {-syndication:boolean false}
- {-extra_where_clause ""}
- {-extra_from_clause ""}
- } {
- returns the SQL-query to select the xowiki pages of the specified folder
- @select_attributes attributes for the sql query to be retrieved, in addion
- to ci.item_id acs_objects.object_type, which are always returned
- @param order_clause clause for ordering the solution set
- @param where_clause clause for restricting the answer set
- @param count return the query for counting the solutions
- @param folder_id parent_id
- @return sql query
- } {
- my instvar object_type_key
- if {![info exists folder_id]} {my instvar folder_id}
+ #
+ # URL and naming management
+ #
+ Page proc pretty_link {{-fully_qualified:boolean false} -lang -package_id name} {
+ my instvar folder_id
+ my log "--u name=<$name>"
- set attributes [list ci.item_id ci.name p.page_id]
- foreach a $select_attributes {
- if {$a eq "title"} {set a p.title}
- lappend attributes $a
+ if {![info exists package_id]} {set package_id [$folder_id set package_id]}
+ if {![my isobject ::$package_id]} {
+ my log "--u we create package ::xowiki::Package create ::$package_id -folder_id $folder_id"
+ ::xowiki::Package create ::$package_id -folder_id $folder_id
}
- if {$count} {
- set attribute_selection "count(*)"
- set order_clause "" ;# no need to order when we count
- set page_number "" ;# no pagination when count is used
+ set url [::$package_id package_url]
+
+ if {![info exists lang]} {
+ regexp {^(..):(.*)$} $name _ lang name
+ }
+ if {![info exists lang] && ![string match :* $name]} {
+ set lang [string range [lang::conn::locale] 0 1]
+ }
+ set host [expr {$fully_qualified ? [ad_url] : ""}]
+ if {[info exists lang]} {
+ return $host${url}$lang/[ad_urlencode $name]
} else {
- set attribute_selection [join $attributes ,]
+ return $host${url}[ad_urlencode $name]
}
+ }
- if {$where_clause ne ""} {set where_clause "and $where_clause "}
-# if {$syndication} {
-# append where_clause "and syndication.object_id = p.page_id"
-# set extra_tables ", syndication "
-# } else {
-# set extra_tables ""
-# }
- if {$page_number ne ""} {
- set pagination "offset [expr {$page_size*($page_number-1)}] limit $page_size"
- } else {
- set pagination ""
+ Page proc normalize_name {-package_id string} {
+ set string [string trim $string]
+ # if subst_blank_in_name is turned on, turn spaces into _
+ if {[$package_id get_parameter subst_blank_in_name 1] != 0} {
+ regsub -all { } $string "_" string
}
- return "select $attribute_selection from xowiki_pagei p, cr_items ci $extra_from_clause \
- where ci.parent_id = $folder_id and ci.item_id = p.item_id and \
- ci.live_revision = p.page_id $where_clause $extra_where_clause $order_clause $pagination"
+ return $string
}
+ Page instproc make_link {-privilege -url object method args} {
+ my instvar package_id
+
+ if {[info exists privilege]} {
+ set granted [expr {$privilege eq "public" ? 1 :
+ [permission::permission_p -object_id $package_id -privilege $privilege]
+ }]
+ } else {
+ # determine privilege from policy
+ set granted [$package_id permission_p $object $method]
+ my log "--p $package_id permission_p $object $method ==> $granted"
+ }
+ if {$granted} {
+ if {[$object istype ::xowiki::Package]} {
+ set base [$package_id package_url]
+ if {[info exists url]} {
+ return [uplevel export_vars -base $base$url [list $args]]
+ } else {
+ lappend args [list $method 1]
+ return [uplevel export_vars -base $base [list $args]]
+ }
+ } elseif {[$object istype ::xowiki::Page]} {
+ set base [$package_id url]
+ lappend args [list m $method]
+ return [uplevel export_vars -base $base [list $args]]
+ }
+ }
+ return ""
+ }
+
#
- # data definitions
+ # tag management, get_tags works on instance or gobally
#
- Page parameter {
- page_id
- {revision_id 0}
- object_type
- {folder_id -100}
- {lang_links ""}
- {lang en}
- {render_adp 1}
+ Page proc save_tags {-package_id:required -item_id:required -user_id:required tags} {
+ db_dml delete_tags \
+ "delete from xowiki_tags where item_id = $item_id and user_id = $user_id"
+ foreach tag $tags {
+ db_dml insert_tag \
+ "insert into xowiki_tags (item_id,package_id, user_id, tag, time) \
+ values ($item_id, $package_id, $user_id, :tag, current_timestamp)"
+ }
+ }
+ Page proc get_tags {-package_id:required -item_id -user_id} {
+ if {[info exists item_id]} {
+ if {[info exists user_id]} {
+ # tags for item and user
+ set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where user_id=$user_id and item_id=$item_id and package_id=$package_id"]
+ } else {
+ # all tags for this item
+ set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where item_id=$item_id and package_id=$package_id"]
+ }
+ } else {
+ if {[info exists user_id]} {
+ # all tags for this user
+ set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where user_id=$user_id and package_id=$package_id"]
+ } else {
+ # all tags for the package
+ set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where package_id=$package_id"]
+ }
+ }
+ join $tags " "
}
- Page set recursion_count 0
- Page array set RE {
- include {([^\\]){{(.+)}}[ \n\r]*}
- anchor {([^\\])\\\[\\\[([^\]]+)\\\]\\\]}
- div {()([^\\])>>([^&]*)<<}
- clean {[\\](\{\{|>>|\[\[)}
- }
- PlainPage parameter {
- {render_adp 0}
- }
- PlainPage array set RE {
- include {([^\\]){{(.+)}}[ \n\r]}
- anchor {([^\\])\\\[\\\[([^\]]+)\\\]\\\]}
- div {()([^\\])>>([^<]*)<<}
- clean {[\\](\{\{|>>|\[\[)}
- }
- PageTemplate parameter {
- {render_adp 0}
- }
-
#
# Methods of ::xowiki::Page
#
+ Page instforward query_parameter {%my set package_id} %proc
+ Page instforward exists_query_parameter {%my set package_id} %proc
+ Page instforward form_parameter {%my set package_id} %proc
+ Page instforward exists_form_parameter {%my set package_id} %proc
+
+ Page instproc condition {method attr value} {
+ switch $attr {
+ has_class {return [expr {[my set object_type] eq $value}]}
+ }
+ return 0
+ }
+
+ Page instproc get_user_name {uid} {
+ if {$uid ne "" && $uid != 0} {
+ acs_user::get -user_id $uid -array user
+ return "$user(first_names) $user(last_name)"
+ } else {
+ return nobody
+ }
+ }
+
+
+ Page instproc initialize_loaded_object {} {
+ my instvar title creator
+ if {[info exists title] && $title eq ""} {set title [my set name]}
+ #if {$creator eq ""} {set creator [my get_user_name [my set creation_user]]}
+ next
+ }
+
Page instproc regsub-eval {re string cmd} {
subst [regsub -all $re [string map {\[ \\[ \] \\] \$ \\$ \\ \\\\} $string] \
"\[$cmd\]"]
@@ -688,7 +689,7 @@
return "$ch$label"
}
- my instvar parent_id
+ my instvar parent_id package_id
# do we have a language link (it starts with a ':')
if {[regexp {^:(..):(.*)$} $link _ lang stripped_name]} {
set link_type language
@@ -702,20 +703,14 @@
regexp {^(..):(.+)$} $link _ lang stripped_name
}
}
- set stripped_name [string trim $stripped_name]
- if {$lang eq ""} {set lang [my lang]}
+ set stripped_name [Page normalize_name -package_id $package_id $stripped_name]
+ if {$lang eq ""} {set lang [my lang]}
if {$label eq $arg} {set label $stripped_name}
- # if subst_blank_in_name is turned on, turn spaces into _
- if {[$parent_id get_payload subst_blank_in_name] == 1} {
- regsub -all { } $stripped_name "_" stripped_name
- }
-
- #my log "--LINK lang=$lang type=$link_type stripped_name=$stripped_name"
Link create [self]::link \
-type $link_type -name $lang:$stripped_name -lang $lang \
-stripped_name $stripped_name -label $label \
- -folder_id $parent_id -package_id [$parent_id set package_id]
+ -folder_id $parent_id -package_id $package_id
return $ch[[self]::link render]
}
@@ -754,7 +749,7 @@
}
Page instproc adp_subst {content} {
- set __ignorelist [list RE __defaults name_method object_type_key url_prefix]
+ set __ignorelist [list RE __defaults name_method object_type_key]
foreach __v [my info vars] {
if {[info exists $__v]} continue
my instvar $__v
@@ -783,7 +778,7 @@
}
Page instproc get_content {} {
- my log "--"
+ #my log "--"
set content [my substitute_markup [my set text]]
}
@@ -838,11 +833,10 @@
Page instproc record_last_visited {-user_id} {
- my instvar parent_id item_id
+ my instvar item_id package_id
if {![info exists user_id]} {set user_id [ad_conn user_id]}
if {$user_id > 0} {
# only record information for authenticated users
- set package_id [$parent_id set package_id]
db_dml update_last_visisted \
"update xowiki_last_visited set time = current_timestamp, count = count + 1 \
where page_id = $item_id and user_id = $user_id"
@@ -858,6 +852,16 @@
# Methods of ::xowiki::PlainPage
#
+ PlainPage parameter {
+ {render_adp 0}
+ }
+ PlainPage array set RE {
+ include {([^\\]){{(.+)}}[ \n\r]}
+ anchor {([^\\])\\\[\\\[([^\]]+)\\\]\\\]}
+ div {()([^\\])>>([^<]*)<<}
+ clean {[\\](\{\{|>>|\[\[)}
+ }
+
PlainPage instproc get_content {} {
#my log "-- my class=[my info class]"
return [my substitute_markup [my set text]]
@@ -878,9 +882,15 @@
}
#
- # PageInstance methods
+ # PageTemplate specifics
#
+ PageTemplate parameter {
+ {render_adp 0}
+ }
+ #
+ # PageInstance methods
+ #
PageInstance instproc get_field_type {name template default_spec} {
# get the widget field specifications from the payload of the folder object
# for a field with a specified name in a specified page template
@@ -932,6 +942,11 @@
# Methods of ::xowiki::Object
#
+ #Object instproc save_new {} {
+ #my set text [::Serializer deepSerialize [self]]
+ #next
+ #}
+
Object instproc get_content {} {
if {[[self]::payload info procs content] ne ""} {
return [my substitute_markup [[self]::payload content]]
@@ -946,15 +961,18 @@
}
Object instproc set_payload {cmd} {
set payload [self]::payload
- if {![my isobject $payload]} {::xotcl::Object create $payload -requireNamespace}
+ if {[my isobject $payload]} {$payload destroy}
+ ::xotcl::Object create $payload -requireNamespace
if {[catch {$payload eval $cmd} error ]} {
ns_log error "XoWiki folder object: content lead to error: $error"
}
}
- Object instproc get_payload {var} {
+ Object instproc get_payload {var {default ""}} {
set payload [self]::payload
if {![my isobject $payload]} {::xotcl::Object create $payload -requireNamespace}
- expr {[$payload exists $var] ? [$payload set $var] : ""}
+ expr {[$payload exists $var] ? [$payload set $var] : $default}
}
-}
\ No newline at end of file
+}
+
+source [file dirname [info script]]/xowiki-www-procs.tcl
\ No newline at end of file
Index: openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 7 Jun 2006 17:08:24 -0000 1.10
+++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 26 Jul 2006 22:56:46 -0000 1.11
@@ -15,13 +15,9 @@
} {
ns_log notice "--datasource called with revision_id = $revision_id"
- set page [::Generic::CrItem instantiate -item_id 0 -revision_id $revision_id]
+ set page [::xowiki::Package instantiate_from_page -revision_id $revision_id]
$page volatile
- # ensure context for dependencies of folder object
- set folder_id [$page set parent_id]
- ::xowiki::Page require_folder_object -folder_id $folder_id
-
set html [$page render]
set text [ad_html_text_convert -from text/html -to text/plain -- $html]
#set text [ad_text_to_html $html]; #this could be used for entity encoded html text in rss entries
@@ -30,15 +26,15 @@
#$page set unresolved_references 0
$page instvar item_id
- return [list object_id $revision_id title [$page set title] \
+ return [list object_id $revision_id title [$page title] \
content $text keywords {} \
storage_type text mime text/plain \
syndication [list \
link [::xowiki::Page pretty_link -fully_qualified 1 [$page set name]] \
description $text \
author [$page set creator] \
category "" \
- guid "[ad_url]/o/$item_id" \
+ guid "$item_id" \
pubDate [$page set last_modified]] \
]
}
@@ -48,18 +44,9 @@
returns a url for a message to the search package
} {
- set page [::Generic::CrItem instantiate -item_id 0 -revision_id $revision_id]
+ set page [::xowiki::Package instantiate_from_page -revision_id $revision_id]
$page volatile
- set folder_id [$page set parent_id]
- set pid [db_string get_pid "select package_id from cr_folders where folder_id = $folder_id"]
- if {$pid > 0} {
- return [::xowiki::Page pretty_link -package_id $pid [$page set name]]
- } else {
- # cannot determine package_id; one page from the directory should be viewed to update
- # package id for the content folder...
- return "cannot determine package_id, view a page from the folder containing page \
- [$page set name]"
- }
+ return [::[$page package_id] url]
}
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 26 Jul 2006 22:56:46 -0000 1.1
@@ -0,0 +1,291 @@
+# different template testing DONE
+# orphan creation DONE
+# orphan deletions completion DONE
+# link resolver DONE
+# edit-new parameter name DONE
+# cgi package_id missing DONE
+# delete all DONE
+# $parent_id set package_id DONE
+# lang link DONE
+# unknown link DONE
+# weblog DONE
+# tag edit DONE
+# tag new DONE
+# weblog on the fly creation DONE
+# behavior without index page DONE
+# renaming objects DONE
+# handling of sc DONE
+# make subst_blank_in_name default DONE
+# package parameters and payload of folder object DONE
+# permissions management DONE
+# permissions admin DONE
+# include DONE
+# edit page template DONE
+# edit page instance DONE
+# delete folder object DONE
+# the flag store_folder_id should not be necessary
+# move require folder object code
+# edit-new last_page_id (needed?)
+# edit last_page_id (needed?)
+
+
+namespace eval ::xowiki {
+
+ Page instproc view {} {
+ # view is used only for the toplevel call, when the xowiki page is viewed
+ # this is not inteded for embedded wiki pages
+ my instvar package_id item_id
+ $package_id instvar folder_id ;# this is the root folder
+ ::xowiki::Page set recursion_count 0
+
+ set content [my render]
+ my log "--after render"
+
+ if {[$package_id get_parameter "use_user_tracking" 1]} {
+ my record_last_visited
+ }
+
+ my log "--after user_tracking"
+ set references [my references]
+ my log "--after references"
+
+ # export title, text, and lang_links to current scope
+ my instvar title name text lang_links
+
+ set tags ""
+ set no_tags 1
+ if {[$package_id get_parameter "use_tags" 1] &&
+ ![my exists_query_parameter no_tags]} {
+ # only activate tags when the user is logged in
+ set no_tags [expr {[ad_conn user_id] == 0}]
+ set tags ""
+ if {!$no_tags} {
+ ::xowiki::Page requireJS "/resources/xowiki/get-http-object.js"
+ set entries [list]
+ set tags [lsort [::xowiki::Page get_tags -user_id [ad_conn user_id] \
+ -item_id $item_id -package_id $package_id]]
+ set href [site_node::get_url_from_object_id -object_id $package_id]weblog?summary=1
+ foreach tag $tags {lappend entries "$tag"}
+ set tags_with_links [join $entries {, }]
+ }
+ }
+
+ my log "--after tags"
+ set return_url [$package_id url] ;# for the time being
+
+ if {[$package_id get_parameter "use_gc"] &&
+ ![my exists_query_parameter no_gc]} {
+ set gc_link [general_comments_create_link -object_name $title $item_id $return_url]
+ set gc_comments [general_comments_get_comments $item_id $return_url]
+ } else {
+ set gc_link ""
+ set gc_comments ""
+ }
+
+ set header_stuff [::xowiki::Page header_stuff]
+ set master [my query_parameter "master" 1]
+ if {[my exists_query_parameter "edit_return_url"]} {
+ set return_url [my query_parameter "edit_return_url"]
+ }
+
+ my log "--after gc title=$title"
+ if {$master} {
+ set context [list $title]
+ set object_type [my info class]
+ set rev_link [my make_link [self] revisions]
+ set edit_link [my make_link [self] edit return_url]
+ set delete_link [my make_link [self] delete]
+ set new_link [my make_link $package_id edit-new object_type]
+ set admin_link [my make_link -privilege admin -url admin/ $package_id {} {}]
+ set index_link [my make_link -privilege public -url "" $package_id {} {}]
+ set save_tag_link [my make_link [self] save-tags]
+ set popular_tags_link [my make_link [self] popular-tags]
+
+ my log "--after context delete_link=$delete_link "
+ set template [$folder_id get_payload template]
+
+ if {$template ne ""} {
+ set __including_page $page
+ set template_code [template::adp_compile -string $template]
+ if {[catch {set content [template::adp_eval template_code]} errmsg]} {
+ set content "Error in Page $name: $errmsg
$content"
+ } else {
+ ns_return 200 text/html $content
+ }
+ } else {
+ # use adp file
+ set template_file [my query_parameter "template_file" \
+ [$folder_id get_payload template_file view-default]]
+ if {![regexp {^[./]} $template_file]} {
+ set template_file /packages/xowiki/www/$template_file
+ }
+ set page [self]
+ $package_id return_page -adp $template_file -variables {
+ references name title item_id page context header_stuff return_url
+ content references lang_links
+ rev_link edit_link delete_link new_link admin_link index_link
+ tags no_tags tags_with_links save_tag_link popular_tags_link
+ gc_link gc_comments
+ }
+ }
+ } else {
+ ns_return 200 text/html $content
+ }
+ }
+
+ Page instproc edit {{-new:boolean false}} {
+ my instvar package_id item_id revision_id
+ $package_id instvar folder_id ;# this is the root folder
+
+ #-query {
+ # item_id:integer,optional
+ # name:optional
+ # last_page_id:integer,optional
+ # folder_id:integer,optional
+ # {object_type:optional ::xowiki::Page}
+ # page_template:integer,optional
+ # return_url:optional
+ #}
+
+ # set some default values if they are provided
+ foreach key {name} {
+ if {[$package_id exists_query_parameter $key]} {my set $key [$package_id query_parameter $key]}
+ }
+
+ set object_type [my info class]
+ if {!$new && $object_type eq "::xowiki::Object" && [my set name] eq "::$folder_id"} {
+ # if we edit the folder object, we have to do some extra magic here,
+ # since the folder object has slightly different naming conventions.
+ # ns_log notice "--editing folder object ::$folder_id, FLUSH $page"
+ ns_cache flush xotcl_object_cache [self]
+ ns_cache flush xotcl_object_cache ::$folder_id
+ my move ::$folder_id
+ set page ::$folder_id
+ #ns_log notice "--move page=$page"
+ }
+
+ #
+ # setting up folder id for file selector (use community folder if available)
+ #
+ set fs_folder_id ""
+ if {[info commands dotlrn_fs::get_community_shared_folder] ne ""} {
+ set fs_folder_id [dotlrn_fs::get_community_shared_folder \
+ -community_id [dotlrn_community::get_community_id]]
+ }
+
+ # the following line is like [$package_id url], but works as well with renames of the object
+ set myurl [expr {$new ? [$package_id url] :
+ [Page pretty_link -package_id $package_id [my form_parameter name]]}]
+ if {[my exists_query_parameter "return_url"]} {
+ set submit_link [my query_parameter "return_url" $myurl]
+ set return_url $submit_link
+ } else {
+ set submit_link $myurl
+ }
+ my log "--u sumit_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
+ 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"}]
+ [$object_type getFormClass -data [self]] create ::xowiki::f1 -volatile \
+ -action [export_vars -base [$package_id url] $action_vars] \
+ -data [self] \
+ -folderspec [expr {$fs_folder_id ne "" ?"folder_id $fs_folder_id":""}] \
+ -submit_link $submit_link
+
+ if {[info exists return_url]} {
+ ::xowiki::f1 generate -export [list [list return_url $return_url]]
+ } else {
+ ::xowiki::f1 generate
+ }
+ ::xowiki::f1 instvar edit_form_page_title context formTemplate
+
+ if {[info exists item_id]} {
+ set rev_link [my make_link [self] revisions]
+ set view_link [my make_link [self] view]
+ }
+ if {[info exists last_page_id]} {
+ set back_link [$package_id url]
+ }
+
+ set index_link [my make_link -privilege public -url "" $package_id {} {}]
+ set html [$package_id return_page -adp /packages/xowiki/www/edit \
+ -form f1 \
+ -variables {item_id edit_form_page_title context formTemplate
+ view_link back_link rev_link index_link}]
+ template::util::lpop parse_level
+ my log "--e html length [string length $html]"
+ return $html
+ }
+
+
+
+ Page instproc revisions {} {
+ my instvar package_id name item_id
+ set context [list [list [$package_id url] $name ] [_ xotcl-core.revisions]]
+ set title "[_ xotcl-core.revision_title] '$name'"
+ set content [next]
+ $package_id return_page -adp /packages/xowiki/www/revisions -variables {
+ content context {page_id $item_id} title
+ }
+ }
+
+
+ Page instproc make-live-revision {} {
+ my instvar revision_id item_id package_id
+ my log "--M set_live_revision($revision_id)"
+ db_exec_plsql make_live {select content_item__set_live_revision(:revision_id)}
+ set page_id [my query_parameter "page_id"]
+ ns_cache flush xotcl_object_cache ::$item_id
+ ad_returnredirect [my query_parameter "return_url" \
+ [export_vars -base [$package_id url] {{m revisions}}]]
+ }
+
+
+ Page instproc delete-revision {} {
+ my instvar revision_id package_id item_id
+ my log "--M delete revision($revision_id)"
+ db_exec_plsql delete_revision {select content_revision__del(:revision_id)}
+ ns_cache flush xotcl_object_cache ::$item_id
+ ns_cache flush xotcl_object_cache ::$revision_id
+ ad_returnredirect [my query_parameter "return_url" \
+ [export_vars -base [$package_id url] {{m revisions}}]]
+ }
+
+ Page instproc delete {} {
+ my instvar package_id item_id name parent_id
+ my log "--D trying to delete $item_id"
+ ::Generic::CrItem delete -item_id $item_id
+ ns_cache flush xotcl_object_cache ::$item_id
+ # we should probably flush as well cached revisions
+ if {$name eq "::$parent_id"} {
+ my log "--D deleting folder object ::$parent_id"
+ ns_cache flush xotcl_object_cache ::$parent_id
+ ns_cache flush xotcl_object_type_cache item_id-of-$parent_id
+ ::$parent_id destroy
+ }
+ ad_returnredirect [my query_parameter "return_url" [$package_id package_url]]
+ }
+
+ Page instproc save-tags {} {
+ my instvar package_id item_id
+ ::xowiki::Page save_tags -user_id [ad_conn user_id] -item_id $item_id \
+ -package_id $package_id [my form_parameter tags]
+ ad_returnredirect [my query_parameter "return_url" [$package_id url]]
+ }
+
+ Page instproc popular-tags {} {
+ my instvar package_id item_id parent_id
+ set limit [my query_parameter "limit" 20]
+ set href [$package_id package_url]weblog?summary=1
+ set entries [list]
+ db_foreach get_popular_tags \
+ "select count(*) as nr,tag from xowiki_tags \
+ where item_id=$item_id group by tag order by nr limit $limit" {
+ lappend entries "$tag ($nr)"
+ }
+ ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]"
+ }
+}
\ No newline at end of file
Index: openacs-4/packages/xowiki/www/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/edit.adp 9 Feb 2006 22:53:03 -0000 1.2
+++ openacs-4/packages/xowiki/www/edit.adp 26 Jul 2006 22:56:46 -0000 1.3
@@ -12,14 +12,12 @@
#xowiki.references_label# @references;noquote@ +@lang_links;noquote@ +
+
+
#general-comments.Comments# +
- @gc_comments;noquote@
@gc_link;noquote@
+>>content<<
-
{{adp portlets/weblog {name Weblog}}}
-
>><<
-
>>sidebar<<
-
{{adp portlets/weblog-mini-calendar}}
-
{{adp portlets/categories {count 1 skin plain-include}}}
-
{{adp portlets/tags {skin plain-include}}}
-
>><<
-