From: Paul Hänsch Date: Mon, 19 Feb 2024 01:00:36 +0000 (+0100) Subject: bugfix: prevent accidental index invalidation by getting doc path from pwd instead... X-Git-Url: https://git.plutz.net/?p=shellwiki;a=commitdiff_plain;h=3fc5088d41513b69cf51d869d4d02e16e05a0f8a bugfix: prevent accidental index invalidation by getting doc path from pwd instead of path_info (preventing mixup with header/footer) --- diff --git a/parsers/40_indexer.sh b/parsers/40_indexer.sh index c26584a..d25aacf 100755 --- a/parsers/40_indexer.sh +++ b/parsers/40_indexer.sh @@ -14,10 +14,10 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR # IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -DOC="${PATH_INFO%/}/" P="$_DATA/pages${DOC}" I="$_DATA/index/" +P="$PWD" I="$_DATA/index/" _DATE=$((_DATE + 1)) if [ "$SEARCH_INDEX" != true ] || [ ! -d "$P" ] || \ - [ -f "$P/#index.flag" -a ! "$P/#page.md" -nt "$P/#index.flag" ] + [ -f "$P/#index.flag" -a ! "$P/#index.flag" -ot "$P/#page.md" ] then cat exit 0 @@ -29,6 +29,7 @@ exec 3>&1 touch -d "@$_DATE" "$P/#index.flag" mkdir -p "$I" +DOC="$(STRING "${P#"$_DATA/pages"}")" { cat; printf \\n; } \ | while IFS='' read -r line; do @@ -52,7 +53,6 @@ done \ | while read -r num total freq word; do [ "$word" ] || continue printf "%i %s %f %i %i\n" \ - "$_DATE" "$(STRING "$DOC")" \ - "$freq" "$num" "$total" \ + "$_DATE" "$DOC" "$freq" "$num" "$total" \ >>"$I/$word" done