Changeset 26978 for main/trunk

Timestamp:

2013-03-04T19:46:28+13:00 (11 years ago)

Author:

ak19

Message:

Third and final commit for RSS support. This time the windows-httpd.conf.in is also updated with the Rewrite rules for pretty URLs. For this to work, windows needs to load the rewrite module so file as well, so that LoadModule line is uncommented. Fortunately, it was already being compiled up by default for Windows.

Location:

main/trunk/greenstone2/runtime-src/packages/apache-httpd

Files:

• httpd.conf.in (modified) (2 diffs)
• windows-httpd.conf.in (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/packages/apache-httpd/httpd.conf.in

@@ -418 +418 @@
 </IfModule>
 
+
   ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**"
   <Directory "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**">
@@ -436 +437 @@
 
      RewriteEngine On
-     RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.\
-cgi?c=$1&a=p&p=about [L]
-     RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.\
-cgi?c=$1&a=q [L]
-     RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/librar\
-y.cgi?c=$1&a=d&d=$2 [L]
-     RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/lib\
-rary.cgi?c=$1&a=d&d=$2&$3 [L]
-     RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.\
-cgi?c=$1&a=p&p=about [L]
+     RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L]
+     RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L]
+     RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L]
+     RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L]
+     RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L]
      # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L]
-
   </Directory>  
   

main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

@@ -127 +127 @@
 #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
 #LoadModule proxy_http_module modules/mod_proxy_http.so
-#LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so
 #LoadModule speling_module modules/mod_speling.so
@@ -512 +512 @@
      **CONNECTPERMISSION** from all
      Allow from 127.0.0.1 **HOST_IP** **HOSTS** localhost 
+     
+     RewriteEngine On
+     RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L]
+     RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.cgi?c=$1&a=q [L]
+     RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2 [L]
+     RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/library.cgi?c=$1&a=d&d=$2&$3 [L]
+     RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.cgi?c=$1&a=p&p=about [L]
+     # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L]
   </Directory>