Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.71 -r1.72 --- openacs-4/packages/xowiki/xowiki.info 19 Nov 2007 12:44:00 -0000 1.71 +++ openacs-4/packages/xowiki/xowiki.info 26 Nov 2007 09:14:43 -0000 1.72 @@ -8,7 +8,7 @@ f xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) @@ -54,12 +54,12 @@ BSD-Style 0 - + - + Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v diff -u -r1.27 -r1.28 --- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 22 Nov 2007 10:32:57 -0000 1.27 +++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 26 Nov 2007 09:14:43 -0000 1.28 @@ -1,5 +1,5 @@ - + Verwalten Zur�ck @@ -26,6 +26,7 @@ Eindeutige Kurzbezeichnung f�r einen Eintrag im Ordner; enth�lt meist nur Kleinbuchstaben Sprache Abschnitt + Ver�ffentlichungsdatum Inhalt Titel der Seite Another item with the name '%value%' exists already in this folder Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v diff -u -r1.33 -r1.34 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 22 Nov 2007 10:32:57 -0000 1.33 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 26 Nov 2007 09:14:43 -0000 1.34 @@ -1,5 +1,5 @@ - + Admin Back @@ -49,6 +49,7 @@ Shortname to identify an entry within a folder, typically lowercase characters Language Section + Publish Date Content Page Title Another item with the name '%value%' exists already in this folder Index: openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml,v diff -u -r1.8 -r1.9 --- openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml 21 Nov 2007 09:13:26 -0000 1.8 +++ openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml 26 Nov 2007 09:14:43 -0000 1.9 @@ -1,5 +1,5 @@ - + Administrar Volver @@ -11,12 +11,14 @@ Forme �ndice Nueva P�gina + Origen Notificaciones Autor Descripci�n Nombre Idioma Secci�n + Fecha de publicaci�n Contenido T�tulo de la P�gina Tipo de P�gina Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.39 -r1.40 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 16 Nov 2007 18:25:34 -0000 1.39 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 26 Nov 2007 09:14:43 -0000 1.40 @@ -886,8 +886,9 @@ } FormField::date instproc set_compound_value {} { - set value [my value] - #my msg "date: value set to '$value'" + #my msg "original value '[my value]'" + set value [::xo::db::tcl_date [my value] tz] + #my msg "transformed value '$value'" if {$value ne ""} { set ticks [clock scan [string map [list _ " "] $value]] } else { 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.98 -r1.99 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 23 Nov 2007 11:20:22 -0000 1.98 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 26 Nov 2007 09:14:43 -0000 1.99 @@ -597,12 +597,12 @@ } else { ::xo::db::CrClass get_instance_from_db -item_id $item_id $item_id copy_content_vars -from_object $o - $item_id save + $item_id save -use_given_publish_date true incr updated } } if {$item_id == 0} { - set n [$o save_new] + set n [$o save_new -use_given_publish_date true] incr added } } @@ -624,13 +624,13 @@ ::xo::db::CrClass get_instance_from_db -item_id $item_id $item_id copy_content_vars -from_object $o $item_id set page_template $template_id - $item_id save + $item_id save -use_given_publish_date true incr updated } } if {$item_id == 0} { ;# the item does not exist -> update reference and save $o set page_template $template_id - $o save_new + $o save_new -use_given_publish_date true incr added } } @@ -841,11 +841,25 @@ # application pages, the package_level method is used from the admin pages. # my instvar folder_id id + # + # if no item_id given, take it from the query parameter + # if {![info exists item_id]} { set item_id [my query_parameter item_id] #my log "--D item_id from query parameter $item_id" - set name [my query_parameter name] } + # + # if name given, take it from the query parameter + # + if {![info exists name]} { + set name [my query_parameter name] + } + if {$item_id eq "" && $name ne ""} { + if {[set item_id [::xo::db::CrClass lookup -name $name -parent_id $folder_id]] == 0} { + ns_log notice "lookup of '$name' failed" + set item_id "" + } + } if {$item_id ne ""} { #my log "--D trying to delete $item_id $name" set object_type [::xo::db::CrClass get_object_type -item_id $item_id] Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 19 Nov 2007 12:37:03 -0000 1.27 +++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 26 Nov 2007 09:14:43 -0000 1.28 @@ -106,7 +106,7 @@ } if {$days ne ""} { append extra_where_clause "and " \ - [::xo::db::sql since_interval_condition p.last_modified "$days days"] + [::xo::db::sql since_interval_condition p.publish_date "$days days"] } if {$entries_of ne ""} { set form_items [list] @@ -149,14 +149,14 @@ set sql [::xo::db::sql select \ -vars "s.body, s.rss_xml_frag, p.name, p.creator, p.title, p.page_id, instance_attributes, \ - p.object_type as content_type, p.last_modified, p.description" \ + p.object_type as content_type, p.publish_date, p.description" \ -from "syndication s, cr_items ci, $base_table p $extra_from" \ -where "ci.parent_id = $folder_id \ and ci.live_revision = s.object_id \ and ci.publish_status <> 'production' \ and s.object_id = p.page_id \ $extra_where_clause"\ - -orderby "p.last_modified desc" \ + -orderby "p.publish_date desc" \ -limit [my limit]] # set content [my head] @@ -167,7 +167,7 @@ # set description [string trim $description] # if {$description eq ""} {set description $body} # if {$title eq ""} {set title $name} -# set time [::xo::db::tcl_date $last_modified tz] +# set time [::xo::db::tcl_date $publish_date tz] # set link [::xowiki::Includelet detail_link \ # -package_id $package_id -name $name \ # -absolute true \ Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v diff -u -r1.36 -r1.37 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 19 Nov 2007 12:44:00 -0000 1.36 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 26 Nov 2007 09:14:43 -0000 1.37 @@ -378,6 +378,17 @@ } copy_parameter top_portlet top_includelet } + set v 0.79 + if {[apm_version_names_compare $from_version_name $v] == -1 && + [apm_version_names_compare $to_version_name $v] > -1} { + ns_log notice "-- upgrading to $v" + # load for all xowiki package instances the weblog-portlet prototype page + foreach package_id [::xowiki::Package instances] { + ::xowiki::Package initialize -package_id $package_id -init_url false + $package_id import_prototype_page news-item + } + copy_parameter top_portlet top_includelet + } } proc copy_parameter {from to} { 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.90 -r1.91 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 5 Oct 2007 11:34:59 -0000 1.90 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 26 Nov 2007 09:14:43 -0000 1.91 @@ -698,15 +698,17 @@ upvar text text if {$text eq ""} { return 1 } if {[llength $text] != 2} { return 0 } + regsub -all "­" $text "" text ;# get rid of strange utf-8 characters hex C2AD (firefox bug?) foreach {content mime} $text break if {$content eq ""} {return 1} + #ns_log notice "VALUE='$content'" set clean_content $content regsub -all "
" $clean_content "" clean_content regsub -all "" $clean_content "" clean_content #ns_log notice "--validate_form_content '$content' clean='$clean_content', \ # stripped='[string trim $clean_content]'" if {[string trim $clean_content] eq ""} { set text [list "" $mime]} - #my msg "final text='$text'" + #my log "final text='$text'" return 1 } Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.192 -r1.193 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 24 Nov 2007 14:06:25 -0000 1.192 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 26 Nov 2007 09:14:43 -0000 1.193 @@ -35,6 +35,8 @@ -spec "richtext" ::xo::Attribute create nls_language \ -spec {select,options=[xowiki::locales]} + ::xo::Attribute create publish_date \ + -spec date ::xo::Attribute create last_modified \ -spec date ::xo::Attribute create creation_user \ @@ -928,6 +930,7 @@ my update_references $item_id [lsort -unique $references] } set html [expr {$render_adp ? [my adp_subst $content] : $content}] +ns_log notice "render of '$content' gives '$html'" append html "
" if {![my exists __no_footer]} { append html [my footer] @@ -1477,7 +1480,7 @@ return [expr {[my publish_status] eq "production" && $old_name eq [my revision_id]}] } - FormPage instproc save_data {old_name category_ids} { + FormPage instproc save_data {{-use_given_publish_date:boolean false} old_name category_ids} { #my log "-- [self args]" my instvar package_id name db_transaction { @@ -1493,8 +1496,8 @@ # could be optimized, if we do not want to have categories (form constraints?) category::map_object -remove_old -object_id [my item_id] $category_ids - my save - my log "-- old_name $old_name, name $name" + my save -use_given_publish_date $use_given_publish_date + # my log "-- old_name $old_name, name $name" if {$old_name ne $name} { my log "--formpage renaming" db_dml [my qn update_rename] "update cr_items set name = :name \ 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.23 -r1.24 --- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 19 Nov 2007 12:44:00 -0000 1.23 +++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 26 Nov 2007 09:14:43 -0000 1.24 @@ -41,7 +41,7 @@ #set text [ad_text_to_html $html]; #this could be used for entity encoded html text in rss entries set found [string first {[1]} $text] - $page log "search=$found,text=$text" + $page log "search=$found,html=$html,text=$text" if {$found > -1} { append description {} } else { @@ -76,7 +76,7 @@ } #ns_log notice "--sc keywords $revision_id -> [array names word]" - set pubDate [::xo::db::tcl_date [$page set last_modified] tz] + set pubDate [::xo::db::tcl_date [$page set publish_date] tz] set link [::xowiki::Includelet detail_link \ -package_id $package_id -name [$page set name] \ -absolute true \ 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.115 -r1.116 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 22 Nov 2007 10:32:57 -0000 1.115 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 26 Nov 2007 09:14:43 -0000 1.116 @@ -513,6 +513,10 @@ set f [my lookup_form_field -name $att $form_fields] set value [$f value [::xo::cc form_parameter $att]] set varname [string range $att 1 end] + # get rid of strange utf-8 characters hex C2AD (firefox bug?) + # ns_log notice "FORM_DATA var=$varname, value='$value' s=$s" + if {$varname eq "text"} {regsub -all "­" $value "" value} + # ns_log notice "FORM_DATA var=$varname, value='$value' s=$s" if {![string match *.* $att]} {my set $varname $value} } default { @@ -699,7 +703,10 @@ # # we have no validation erros, so we can save the content # - my save_data [::xo::cc form_parameter __object_name ""] $category_ids + my save_data \ + -use_given_publish_date [expr {[lsearch $field_names _publish_date] > -1}] \ + [::xo::cc form_parameter __object_name ""] $category_ids + #my log "--forminstance redirect to [$package_id pretty_link [my name]]" $package_id returnredirect \ [my query_parameter "return_url" [$package_id pretty_link [my name]]] Index: openacs-4/packages/xowiki/www/admin/bulk-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/bulk-delete.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/admin/bulk-delete.tcl 26 Nov 2007 09:14:44 -0000 1.1 @@ -0,0 +1,18 @@ +::xowiki::Package initialize -ad_doc { + this file is called by the bulk action of admin/list + + @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at) + @creation-date Nov 11, 2007 + @cvs-id $Id: bulk-delete.tcl,v 1.1 2007/11/26 09:14:44 gustafn Exp $ + + @param object_type +} -parameter { + {-objects ""} +} + +foreach o $objects { + ns_log notice "DELETE $o" + $package_id delete -name $o +} + +ad_returnredirect "./list" Index: openacs-4/packages/xowiki/www/admin/list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/xowiki/www/admin/list.tcl 18 Sep 2007 13:28:33 -0000 1.17 +++ openacs-4/packages/xowiki/www/admin/list.tcl 26 Nov 2007 09:14:44 -0000 1.18 @@ -56,8 +56,9 @@ -actions $actions \ -columns { BulkAction objects -id name -actions { - Action new -label export -tooltip export -url export - } + Action new -label export -tooltip export -url export + Action new -label delete -tooltip delete -url bulk-delete + } ImageField_EditIcon edit -label "" -html {style "padding: 2px;"} if {$::individual_permissions} { ImageAnchorField permissions -src /resources/xowiki/permissions.png -width 16 \ Index: openacs-4/packages/xowiki/www/prototypes/news-item.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/news-item.page,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/prototypes/news-item.page 22 Nov 2007 10:33:25 -0000 1.3 +++ openacs-4/packages/xowiki/www/prototypes/news-item.page 26 Nov 2007 09:15:03 -0000 1.4 @@ -4,15 +4,16 @@ -set name en:news-item \ -title "News Item" \ -set anon_instances t \ - -set form {{
@_title@ @detail_link@ @_text@ @_description@ @_nls_language@ @_publish_status@
} text/html} \ + -set form {{
@_title@ @detail_link@ @_text@ @_description@ @_publish_date@ @_nls_language@ @_publish_status@
} text/html} \ -set text {@_text@
@detail_link@} \ -set form_constraints { _page_order:hidden - {_description:textarea,rows=3,label=#xowiki.news-teaser#} - {_publish_status:radio,options={live ready} {draft production},label=#xowiki.publish_status#} _creator:hidden _title:text,label=#acs-kernel.common_Title# {detail_link:detail_link,label=#xowiki.news-source#} + _publish_date:date + {_publish_status:radio,options={live ready} {draft production},label=#xowiki.publish_status#} + {_description:textarea,rows=3,label=#xowiki.news-teaser#} }