• last updated 10 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging back to HEAD all changes that happened in branch oacs-5-8 between tags: vg-merge-oacs-5-8-from-20141027 and vg-merge-oacs-5-8-from-20150427

  1. … 519 more files in changeset.
- fix comment

- fix inconsistent way to refer to ImageMagick binary (parameter

ImageMagickPath vs. image::identify_binary)

- fix incorrect way to refer to results of ImageMagick (foreach was

dangerous and incorrect)

- fix incorrect parameter to ImageMagick (-size geometry)

- fix broken switch statement

- fix typo in name (image::imagmagick_identify should be imagemagick_identify)

- fix incorrect comments

- provide default to optional argument of filename_mime_type

- try to use built-in support and fall back to external programs

(image magick). Built-in support is several hundred times faster.

- use NaviServer's extened functionality

- fix for issue #3242: for items with a latest_revision but no live_revision, content::item::get_revision_content was raising an exception

- Fix for Bug #3237

Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

    • -3
    • +3
    ./acs-content-repository-callback-procs.tcl
    • -0
    • +6
    ./acs-content-repository-procs-oracle.xql
    • -0
    • +17
    ./acs-content-repository-procs-postgresql.xql
    • -11
    • +74
    ./acs-content-repository-procs.tcl
  1. … 2533 more files in changeset.
cleanup in item::* namespace

most functions were already moved into the content::item namespace,

but a few were left.

- marked the following function as deprecated

* item::get_content

* item::content_is_null

* item::get_revision_content

* item::content_methods_by_type

* item::publish

* item::unpublish

- added new functions:

* content::item::content_is_null

* content::item::content_methods_by_type

* content::item::get_content

* content::item::get_revision_content

* content::item::publish

* content::item::unpublish

- updated regression test

    • -82
    • +86
    ./test/content-image-test-procs.tcl
    • -52
    • +60
    ./test/content-revision-test-procs.tcl
cleanup in cr::keyword::* namespace

one cannot advocate to create a keyword with

content::keyword::item_assign and query it with

cr::keyword::item_get_assigned)

- marked the following function as deprecaed

* cr::keyword::get_children

* cr::keyword::get_keyword_id

* cr::keyword::get_options_flat

* cr::keyword::item_get_assigned

* cr::keyword::item_unassign

* cr::keyword::item_unassign_children

- added new functions:

* content::keyword::get_children

* content::keyword::get_keyword_id

* content::keyword::get_options_flat

* content::keyword::item_get_assigned

* content::keyword::item_unassign_children

- updated regression test

    • -6
    • +6
    ./test/acs-content-repository-procs.tcl
  1. … 1 more file in changeset.
- replace calls to the deprecated functions

- mark more of the functions in the ::item::* namespace as deprecated,

since much of the detailed info is delivered by ::content::item::get

* item::get_mime_info

* item::get_extended_url

* item::get_element

- change spelling of TCL to Tcl

- change requirements to Tcl 8.5

  1. … 64 more files in changeset.
- fix api-doc variables @creation-date and @cvs-id

  1. … 3 more files in changeset.
- fix api-doc variable @creation-date

- fix invalid @param declaration for API browser

  1. … 4 more files in changeset.
- fix invalid @param declarations for API browser

  1. … 5 more files in changeset.
- replace call to deprecated proc cr::keyword::new by content::keyword::new

    • -3
    • +3
    ./test/acs-content-repository-procs.tcl
- use expand operator rathen than "eval" when possible

  1. … 5 more files in changeset.
Fixed proc cr_create_content_file_from_string

Because of an earlier copy/paste mistake:

* variable $dir was not set (replaced with cr_fs_path)

* rearranged blocks, so that $content_file is already set

- better handling of potentially incorrect file names in the content repository (checking for "" is not enough)

- improve safety of orphan file deletion (e.g in case, fetch_paths returns empty file names)

    • -34
    • +45
    ./acs-content-repository-procs.tcl
- make sure to delete cr_delete_orphans only files from the cr

- write entry to deletion log before writing to disk, extend mutex

- use 4-space tab indent

file content-init.tcl was initially added on branch oacs-5-8.

file content-procs-postgresql.xql was initially added on branch oacs-5-8.

    • -0
    • +0
    ./content-procs-postgresql.xql
acs-content-repository:

- new public function "cr_cleanup_orphaned_files" to clean up orphaned

files incrementally based on cr-file creation log

- added "cr_cleanup_orphaned_files" to "cr_delete_scheduled_files"

to perform cleanup automatically

- new function to handle cr-file creation log, which is used to

removed orphaned files (created by aborted transactions)

- the function "cr_check_orphaned_files" can still be used

for cleaning up orphaned files from times before the

cr-file creation log was in place (that is from the birth of

OpenACS until now).

acs-tcl:

- new function "ad_mutex_eval" for safely executing

tcl commands under a mutex lock

    • -9
    • +5
    ./acs-content-repository-procs-postgresql.xql
    • -13
    • +18
    ./acs-content-repository-procs.tcl
  1. … 1 more file in changeset.
Added check for trailing slash on cr folder, required for find command to work properly.

    • -17
    • +24
    ./acs-content-repository-procs.tcl
- use external command "find" instead of tcllib package fileutil for speed and better filtering

- add index for much quicker reverse lookup file names in the content repository

    • -0
    • +6
    ./acs-content-repository-procs-oracle.xql
    • -0
    • +21
    ./acs-content-repository-procs-postgresql.xql
  1. … 3 more files in changeset.
file acs-content-repository-procs-postgresql.xql was initially added on branch oacs-5-8.

    • -0
    • +0
    ./acs-content-repository-procs-postgresql.xql
- cr_check_orphaned_files: new helper proc to locate (or delete) orphaned files in the content repository (see also bug #2619)

- use $::acs::rootdir rather than [acs_root_dir] or [get_server_root]

    • -2
    • +2
    ./acs-content-repository-callback-procs.tcl
  1. … 1 more file in changeset.
- use $::acs::rootdir rather than [acs_root_dir] or [get_server_root]

    • -2
    • +2
    ./acs-content-repository-callback-procs.tcl
  1. … 9 more files in changeset.
- use "![info exists]" instead of "template::util::is_nil" on scalars

  1. … 4 more files in changeset.