moved wiki() and caching functions from page handler to tools

[shellwiki] / handlers / 30_page.sh

diff --git a/handlers/30_page.sh b/handlers/30_page.sh
index 5c3da0ccf77573169383d756ebe2593d38bbf079..cc30ca56a616f02d1daef0b72caa3bb90cc1fb30 100755 (executable)
--- a/handlers/30_page.sh
+++ b/handlers/30_page.sh
@@ -1,38 +1,20 @@
 #!/bin/sh
 
-. "$_EXEC/cgilite/file.sh"
-
-CACHE_AGE=${CACHE_AGE:-300}
-export MD_MACROS="$_EXEC/macros"
-export MD_HTML="${MD_HTML:-false}"
-
-wiki() {
-  # Print content of a wiki page
-  # Get page from data or underlay dir, handle caching
-  local page="$(PATH "$1")" mdfile cache cachetime
-
-  cache="$_DATA/pages/$page/#page:${LANGUAGE}.${USER_ID}.cache"
+# Copyright 2022 - 2024 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-  mdfile="$(mdfile "$page")" || return 4
-  acl_read "$page" || return 3
-
-  cachetime="$(stat -c %Y -- "$mdfile" "$cache" 2>/dev/null)"
-
-  if [ "${cachetime#*${BR}}" -gt "${cachetime%${BR}*}" \
-    -a "${cachetime#*${BR}}" -gt "$((_DATE - CACHE_AGE))" ]; then
-    cat "${cache}"
-  else
-    mkdir -p -- "$_DATA/pages/$page/"
-    # Macros expect to find page directory as working dir
-    ( cd -- "$_DATA/pages/$page/";
-      md <"$mdfile" \
-      | tee -- "${cache}.$$"
-    )
-    grep -q '^%nocache' "$mdfile" \
-    && rm -- "${cache}.$$" \
-    || mv -- "${cache}.$$" "${cache}"
-  fi
-}
+. "$_EXEC/cgilite/file.sh"
 
 case "${PATH_INFO}" in
   /"[.]"/*)