Changeset 26977

Show
Ignore:
Timestamp:
04.03.2013 18:40:03 (7 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:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/macros/base.dm

    r25674 r26977  
    173173_httpdoc_  {_gwcgi_?e=_compressedoptions_&a=d} 
    174174 
    175 _httpdocumenthandle_ {_httpprefix_handle/_1_/_2_} 
     175#_httpdocumenthandle_ {_httpprefix_handle/_1_/_2_} 
     176_httpdocumenthandle_ {_httpprefix_/collect/_1_/document/_2_} 
    176177 
    177178#httpsamepagelink is for Greenstone 3 (which uses RESTful urls),  
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/httpd.conf.in

    r26541 r26977  
    434434     **CONNECTPERMISSION** from all 
    435435     Allow from 127.0.0.1 **HOST_IP** **HOSTS** localhost  
     436 
     437     RewriteEngine On 
     438     RewriteRule ^([A-Za-z0-9-]+)/about/?$         /greenstone/cgi-bin/library.\ 
     439cgi?c=$1&a=p&p=about [L] 
     440     RewriteRule ^([A-Za-z0-9-]+)/query/?$         /greenstone/cgi-bin/library.\ 
     441cgi?c=$1&a=q [L] 
     442     RewriteRule ^([A-Za-z0-9-]+)/document/([^/]+)$  /greenstone/cgi-bin/librar\ 
     443y.cgi?c=$1&a=d&d=$2 [L] 
     444     RewriteRule ^([A-Za-z0-9-]+)/document/(.*?)/(.*)$  /greenstone/cgi-bin/lib\ 
     445rary.cgi?c=$1&a=d&d=$2&$3 [L] 
     446     RewriteRule ^([A-Za-z0-9-]+)/$                /greenstone/cgi-bin/library.\ 
     447cgi?c=$1&a=p&p=about [L] 
     448     # RewriteRule ^([A-Za-z0-9-]+)/(.*?)$         /greenstone/cgi-bin/library.cgi?c=$1&$2 [L] 
     449 
    436450  </Directory>   
    437451   
  • main/trunk/greenstone2/runtime-src/packages/configure

    r26552 r26977  
    221221  cd httpd-2.2.11&& \ 
    222222 
    223 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 
     223CFLAGS="$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 
    224224 
    225225else