Subject: [Boost-commit] svn:boost r79661 - in website/public_html/beta: common/code development doc
From: dnljms_at_[hidden]
Date: 2012-07-22 03:22:39
Author: danieljames
Date: 2012-07-22 03:22:38 EDT (Sun, 22 Jul 2012)
New Revision: 79661
URL: http://svn.boost.org/trac/boost/changeset/79661
Log:
Website: Remove version-regex.
It isn't used anywhere and didn't work.
Text files modified:
website/public_html/beta/common/code/boost_archive.php | 32 +++++++++++++-------------
website/public_html/beta/development/testing_results.php | 2
website/public_html/beta/doc/display_build.php | 6 ++--
website/public_html/beta/doc/display_libs.php | 48 ++++++++++++++++++++--------------------
4 files changed, 44 insertions(+), 44 deletions(-)
Modified: website/public_html/beta/common/code/boost_archive.php
==============================================================================
--- website/public_html/beta/common/code/boost_archive.php (original)
+++ website/public_html/beta/common/code/boost_archive.php 2012-07-22 03:22:38 EDT (Sun, 22 Jul 2012)
@@ -135,18 +135,18 @@
// Choose filter to use
$info_map = array_merge($content_map, array(
- array('@.*@','@[.](txt|py|rst|jam|v2|bat|sh|xml|toyxml)$@i','text','text/plain'),
- array('@.*@','@[.](qbk|quickbook)$@i','qbk','text/plain'),
- array('@.*@','@[.](c|h|cpp|hpp)$@i','cpp','text/plain'),
- array('@.*@','@[.]png$@i','raw','image/png'),
- array('@.*@','@[.]gif$@i','raw','image/gif'),
- array('@.*@','@[.](jpg|jpeg|jpe)$@i','raw','image/jpeg'),
- array('@.*@','@[.]css$@i','raw','text/css'),
- array('@.*@','@[.]js$@i','raw','application/x-javascript'),
- array('@.*@','@[.]pdf$@i','raw','application/pdf'),
- array('@.*@','@[.](html|htm)$@i','raw','text/html'),
- array('@.*@','@(/|^)(Jamroot|Jamfile|ChangeLog|configure)$@i','text','text/plain'),
- array('@.*@','@[.]dtd$@i','raw','application/xml-dtd'),
+ array('@[.](txt|py|rst|jam|v2|bat|sh|xml|toyxml)$@i','text','text/plain'),
+ array('@[.](qbk|quickbook)$@i','qbk','text/plain'),
+ array('@[.](c|h|cpp|hpp)$@i','cpp','text/plain'),
+ array('@[.]png$@i','raw','image/png'),
+ array('@[.]gif$@i','raw','image/gif'),
+ array('@[.](jpg|jpeg|jpe)$@i','raw','image/jpeg'),
+ array('@[.]css$@i','raw','text/css'),
+ array('@[.]js$@i','raw','application/x-javascript'),
+ array('@[.]pdf$@i','raw','application/pdf'),
+ array('@[.](html|htm)$@i','raw','text/html'),
+ array('@(/|^)(Jamroot|Jamfile|ChangeLog|configure)$@i','text','text/plain'),
+ array('@[.]dtd$@i','raw','application/xml-dtd'),
));
$preprocess = null;
@@ -155,11 +155,11 @@
foreach ($info_map as $i)
{
- if (preg_match($i[1],$params['key']))
+ if (preg_match($i[0],$params['key']))
{
- $extractor = $i[2];
- $type = $i[3];
- $preprocess = isset($i[4]) ? $i[4] : NULL;
+ $extractor = $i[1];
+ $type = $i[2];
+ $preprocess = isset($i[3]) ? $i[3] : NULL;
break;
}
}
Modified: website/public_html/beta/development/testing_results.php
==============================================================================
--- website/public_html/beta/development/testing_results.php (original)
+++ website/public_html/beta/development/testing_results.php 2012-07-22 03:22:38 EDT (Sun, 22 Jul 2012)
@@ -3,7 +3,7 @@
display_from_archive(
array(
- //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+ //~ array(path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
),
array(
'pattern' => '/^[\/]([^\/]+)[\/](.*)$/',
Modified: website/public_html/beta/doc/display_build.php
==============================================================================
--- website/public_html/beta/doc/display_build.php (original)
+++ website/public_html/beta/doc/display_build.php 2012-07-22 03:22:38 EDT (Sun, 22 Jul 2012)
@@ -23,9 +23,9 @@
display_from_archive(
array(
- //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type[,preprocess hook]),
- array('@.*@','@^boost-build/index[.]html$@i','simple','text/html', 'add_boost_build_analytics'),
- array('@.*@','@[.](html|htm)$@i','boost_book_html','text/html')
+ //~ array(path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type[,preprocess hook]),
+ array('@^boost-build/index[.]html$@i','simple','text/html', 'add_boost_build_analytics'),
+ array('@[.](html|htm)$@i','boost_book_html','text/html')
),
array(
'archive_subdir' => false,
Modified: website/public_html/beta/doc/display_libs.php
==============================================================================
--- website/public_html/beta/doc/display_libs.php (original)
+++ website/public_html/beta/doc/display_libs.php 2012-07-22 03:22:38 EDT (Sun, 22 Jul 2012)
@@ -57,33 +57,33 @@
display_from_archive(
array(
//~ special cases that can't be processed at all (some redirects)
- array('@.*@','@^libs/gil/doc/.*(html|htm)$@i','raw','text/html'),
- array('@.*@','@^libs/preprocessor/doc/.*(html|htm)$@i','raw','text/html'),
- array('@.*@','@^libs/test/doc/components/test_tools/reference/.*(html|htm)$@i','raw','text/html'),
- array('@.*@','@^libs/test/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/spirit/.*(html|htm)$@i','simple','text/html', 'add_spirit_analytics'),
- array('@.*@','@^libs/fusion/.*(html|htm)$@i','basic','text/html', 'add_spirit_analytics'),
- array('@.*@','@^libs/wave/.*(html|htm)$@i','raw','text/html'),
- array('@.*@','@^libs/range/doc/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/gil/doc/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/preprocessor/doc/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/test/doc/components/test_tools/reference/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/test/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/spirit/.*(html|htm)$@i','simple','text/html', 'add_spirit_analytics'),
+ array('@^libs/fusion/.*(html|htm)$@i','basic','text/html', 'add_spirit_analytics'),
+ array('@^libs/wave/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/range/doc/.*(html|htm)$@i','raw','text/html'),
//~ special cases that can't be embeded in the standard frame
- array('@.*@','@^libs/locale/doc/.*(html|htm)$@i','raw','text/html'),
- array('@.*@','@^libs/iostreams/doc/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/serialization/doc/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/filesystem/(v\d/)?doc/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/system/doc/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/numeric/conversion/doc/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/optional/doc/.*(html|htm)$@i','simple','text/html'),
- array('@.*@','@^libs/polygon/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/locale/doc/.*(html|htm)$@i','raw','text/html'),
+ array('@^libs/iostreams/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/serialization/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/filesystem/(v\d/)?doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/system/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/numeric/conversion/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/optional/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@^libs/polygon/doc/.*(html|htm)$@i','simple','text/html'),
//~ default to processed output for libs and tools
- array('@.*@','@^libs/[^/]+/doc/html/.*(html|htm)$@i','basic','text/html'),
- array('@.*@','@^libs/[^/]+/doc/[^/]+/html/.*(html|htm)$@i','basic','text/html'),
- array('@.*@','@^libs/[^/]+/doc/[^/]+/doc/html/.*(html|htm)$@i','basic','text/html'),
- array('@.*@','@^libs.*(html|htm)$@i','basic','text/html'),
- array('@.*@','@^tools.*(html|htm)$@i','basic','text/html'),
- array('@.*@','@^doc/html/.*html$@i','boost_book_basic','text/html'),
- array('@.*@','@^more/.*html$@i','basic','text/html'),
+ array('@^libs/[^/]+/doc/html/.*(html|htm)$@i','basic','text/html'),
+ array('@^libs/[^/]+/doc/[^/]+/html/.*(html|htm)$@i','basic','text/html'),
+ array('@^libs/[^/]+/doc/[^/]+/doc/html/.*(html|htm)$@i','basic','text/html'),
+ array('@^libs.*(html|htm)$@i','basic','text/html'),
+ array('@^tools.*(html|htm)$@i','basic','text/html'),
+ array('@^doc/html/.*html$@i','boost_book_basic','text/html'),
+ array('@^more/.*html$@i','basic','text/html'),
//~ the headers are text files displayed in an embeded page
- array('@.*@','@^boost/.*$@i','cpp','text/plain')
+ array('@^boost/.*$@i','cpp','text/plain')
),
array(
'use_http_expire_date' => true,