web staff : egweb stop-at-index supports /-ended paths

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 5305d0b..a99d9ce 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -791,11 +791,6 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     Options -MultiViews
     PerlSetVar OILSWebStopAtIndex "true"
 
-    # map /eg/staff to /eg/staff/index
-    RewriteEngine On
-    RewriteCond %{PATH_INFO} =/staff/
-    RewriteRule (.*) /eg/staff/index [L,DPI]
-
     <IfModule mod_headers.c>
         Header append Cache-Control "public"
     </IFModule>

diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index dfdeb55..c94ef54 100644 (file)
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -803,11 +803,6 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     Options -MultiViews
     PerlSetVar OILSWebStopAtIndex "true"
 
-    # map /eg/staff to /eg/staff/index
-    RewriteEngine On
-    RewriteCond %{PATH_INFO} =/staff/
-    RewriteRule (.*) /eg/staff/index [L,DPI]
-
     <IfModule mod_headers.c>
         Header append Cache-Control "public"
     </IFModule>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
index 4d00a3f..c952a0b 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
@@ -264,7 +264,11 @@ sub find_template {
             # file in the same directory instead.
             for my $tpath (@{$ctx->{template_paths}}) {
                 # replace the final path component with 'index'
-                $localpath =~ s|/[^/]+$|/index|;
+                if ($localpath =~ m|/$|) {
+                    $localpath .= 'index';
+                } else {
+                    $localpath =~ s|/[^/]+$|/index|;
+                }
                 my $fpath = "$tpath/$localpath.$ext";
                 $r->log->debug("egweb: looking at possible template $fpath");
                 if (-r $fpath) {