Changeset 26977

Timestamp:

2013-03-04T18:40:03+13:00 (11 years ago)

Author:

ak19

Message:

Second commit for RSS support: GS Apache on Linux needs to have mod-rewrite enabled during configure, so that its httpd.conf file can use the new Rewrite rules to work with pretty URLs. These pretty URLs are defined in the documenthandle line in base.dm.

Location:

main/trunk/greenstone2

Files:

• macros/base.dm (modified) (1 diff)
• runtime-src/packages/apache-httpd/httpd.conf.in (modified) (1 diff)
• runtime-src/packages/configure (modified) (1 diff)

main/trunk/greenstone2/macros/base.dm

@@ -173 +173 @@
 _httpdoc_  {_gwcgi_?e=_compressedoptions_&a=d}
 
-_httpdocumenthandle_ {_httpprefix_handle/_1_/_2_}
+#_httpdocumenthandle_ {_httpprefix_handle/_1_/_2_}
+_httpdocumenthandle_ {_httpprefix_/collect/_1_/document/_2_}
 
 #httpsamepagelink is for Greenstone 3 (which uses RESTful urls), 

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

@@ -434 +434 @@
      **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/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-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L]
+
   </Directory>  
   

main/trunk/greenstone2/runtime-src/packages/configure

@@ -221 +221 @@
   cd httpd-2.2.11&& \
 
-CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib -L${GSDLHOME}/common-src/packages/sqlite/lib" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv
+CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib -L${GSDLHOME}/common-src/packages/sqlite/lib" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --enable-rewrite --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv
 
 else