use db23 from cgilite

[shellwiki] / macros / pagelist

diff --git a/macros/pagelist b/macros/pagelist
index 94273fcb4d269b5c787cacdf4a5bfe98864ccafd..35263feef1fda37db239a87e0778395d5ce26587 100755 (executable)
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -17,7 +17,7 @@
 . "$_EXEC/cgilite/cgilite.sh"
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
-. "$_EXEC/db23.sh"
+. "$_EXEC/cgilite/db23.sh"
 
 tags='' ntags='' dir='' depth='' glob_system_pages=false
 label='' labeltype='' altlabel='' titles='' db3_data=''
@@ -27,7 +27,7 @@ set -- "$@" --
 while [ $# -gt 0 ]; do case $1 in
   --system) glob_system_pages=true; shift 1;;
   --depth)  depth="$2"; shift 2;;
-  --titles) titles=true; shift 1;;
+  --title|--titles) titles=true; shift 1;;
   \#*) tags="${tags}${tags:+ }${1###}"; shift 1;;
   \!*) ntags="${ntags}${ntags:+ }${1##!}"; shift 1;;
   --h1|--h2|--h3|--h4|--h5|--h6|--label)
@@ -58,7 +58,7 @@ print_page() {
   # resolve name of each path element
   while [ "${pfrag%/*}" -a "${pfrag%/*}" != "${pfrag}" ]; do
     pfrag="${pfrag%/*}"
-    title="$(DB3 get "${pfrag}" || ! page_title "${pfrag}")/${title}" && break
+    title="$(DB3 get "${pfrag}" || ! page_title "$(page_abs "${pfrag}")")/${title}" && break
   done
   # keep resolved names in cache
   DB3 set "${page%/*}" "${title%/}"