Show
Ignore:
Timestamp:
28.04.2014 15:09:51 (5 years ago)
Author:
ak19
Message:

Rewrite rules now allow for underscore in collection names. Thanks to Pascal D. Angst, who discovered the need for this, for coming up with the fix.

Location:
main/trunk/greenstone2/runtime-src/packages/apache-httpd
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/httpd.conf.in

    r28350 r28998  
    437437 
    438438     RewriteEngine On 
    439      RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
    440      RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L] 
    441      RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L] 
    442      RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L] 
    443      RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
    444      # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
     439     RewriteRule ^([A-Za-z0-9-_]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     440     RewriteRule ^([A-Za-z0-9-_]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L] 
     441     RewriteRule ^([A-Za-z0-9-_]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L] 
     442     RewriteRule ^([A-Za-z0-9-_]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L] 
     443     RewriteRule ^([A-Za-z0-9-_]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     444     # RewriteRule ^([A-Za-z0-9-_]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
    445445  </Directory>   
    446446   
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

    r28350 r28998  
    514514      
    515515     RewriteEngine On 
    516      RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
    517      RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L] 
    518      RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L] 
    519      RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L] 
    520      RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
    521      # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
     516     RewriteRule ^([A-Za-z0-9-_]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     517     RewriteRule ^([A-Za-z0-9-_]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L] 
     518     RewriteRule ^([A-Za-z0-9-_]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L] 
     519     RewriteRule ^([A-Za-z0-9-_]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L] 
     520     RewriteRule ^([A-Za-z0-9-_]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L] 
     521     # RewriteRule ^([A-Za-z0-9-_]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
    522522  </Directory> 
    523523