From: grafikrobot_at_[hidden]
Date: 2008-03-10 20:20:54
Author: grafik
Date: 2008-03-10 20:20:53 EDT (Mon, 10 Mar 2008)
New Revision: 43558
URL: http://svn.boost.org/trac/boost/changeset/43558
Log:
Add archive extraction matching based on version in addition to path. Add entries for all the redirect html files in release 1.34.1.
Text files modified:
website/public_html/beta/common/code/boost_archive.php | 37 +++++++-----
website/public_html/beta/development/testing_results.php | 5 +
website/public_html/beta/doc/display_build.php | 5 +
website/public_html/beta/doc/display_jam.php | 3
website/public_html/beta/doc/display_libs.php | 117 +++++++++++++++++++++++++++++++--------
5 files changed, 122 insertions(+), 45 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 2008-03-10 20:20:53 EDT (Mon, 10 Mar 2008)
@@ -8,6 +8,7 @@
class boost_archive
{
+ var $version_ = NULL;
var $key_ = NULL;
var $file_ = NULL;
var $archive_ = NULL;
@@ -29,39 +30,43 @@
preg_match($pattern, $vpath, $path_parts);
$info_map = array_merge($content_map, array(
- array('@[.](txt|py|rst|jam|v2|bat|sh)$@i','text','text/plain'),
- array('@[.](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('@.*@','@[.](txt|py|rst|jam|v2|bat|sh)$@i','text','text/plain'),
+ array('@.*@','@[.](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'),
));
+ $this->version_ = $path_parts[1];
$this->key_ = $path_parts[2];
if ($archive_subdir)
{
- $this->file_ = $archive_file_prefix . $path_parts[1] . '/' . $path_parts[2];
+ $this->file_ = $archive_file_prefix . $this->version_ . '/' . $this->key_;
}
else
{
- $this->file_ = $archive_file_prefix . $path_parts[2];
+ $this->file_ = $archive_file_prefix . $this->key_;
}
- $this->archive_ = str_replace('\\','/', $archive_dir . '/' . $path_parts[1] . '.zip');
+ $this->archive_ = str_replace('\\','/', $archive_dir . '/' . $this->version_ . '.zip');
foreach ($info_map as $i)
{
- if (preg_match($i[0],$this->key_))
+ if (preg_match($i[1],$this->key_))
{
- $this->extractor_ = $i[1];
- $this->type_ = $i[2];
+ $this->extractor_ = $i[2];
+ $this->type_ = $i[3];
break;
}
}
- $unzip = UNZIP . ' -p ' . escapeshellarg($this->archive_) . ' ' . escapeshellarg($this->file_);
+ $unzip =
+ UNZIP
+ .' -p '.escapeshellarg($this->archive_)
+ .' '.escapeshellarg($this->file_);
if (! $this->extractor_)
{
# File doesn't exist, or we don't know how to handle it.
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 2008-03-10 20:20:53 EDT (Mon, 10 Mar 2008)
@@ -2,7 +2,10 @@
require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
$_file = new boost_archive(
- '/^[\/]([^\/]+)[\/](.*)$/',$_SERVER["PATH_INFO"],array(),
+ '/^[\/]([^\/]+)[\/](.*)$/',$_SERVER["PATH_INFO"],
+ array(
+ //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+ ),
true, // we always want raw output
false, // the result zips don't have the tag subdir
RESULTS_DIR);
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 2008-03-10 20:20:53 EDT (Mon, 10 Mar 2008)
@@ -2,8 +2,9 @@
require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
$_file = new boost_archive('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
- array('@^boost-build/index[.]html$@i','simple','text/html'),
- array('@[.](html|htm)$@i','boost_book_html','text/html')
+ //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+ array('@.*@','@^boost-build/index[.]html$@i','simple','text/html'),
+ array('@.*@','@[.](html|htm)$@i','boost_book_html','text/html')
),false,false);
if (!$_file->is_raw()) {
Modified: website/public_html/beta/doc/display_jam.php
==============================================================================
--- website/public_html/beta/doc/display_jam.php (original)
+++ website/public_html/beta/doc/display_jam.php 2008-03-10 20:20:53 EDT (Mon, 10 Mar 2008)
@@ -2,7 +2,8 @@
require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
$_file = new boost_archive('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
- array('@[.](html|htm)$@i','boost_book_html','text/html'),
+ //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+ array('@.*@','@[.](html|htm)$@i','boost_book_html','text/html'),
));
if (!$_file->is_raw()) { #~ require_once(dirname(__FILE__) . '/../common/code/webnotes.php');
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 2008-03-10 20:20:53 EDT (Mon, 10 Mar 2008)
@@ -2,21 +2,97 @@
require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
$_file = new boost_archive('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
- array('@^libs/iostreams/doc/.*(html|htm)$@i','simple','text/html'),
- array('@^libs/preprocessor/doc/\.*(html|htm)$@i','simple','text/html'),
- array('@^libs/serialization/doc/.*(html|htm)$@i','simple','text/html'),
- //~ array('@^libs/serialization/doc/index.html$@i','boost_frame1_html','text/html'),
- //~ array('@^libs/preprocessor/doc/.*(html|htm)$@i','boost_frame1_html','text/html'),
- array('@^libs/filesystem/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.*(html|htm)$@i','boost_libs_html','text/html'),
- array('@^tools.*(html|htm)$@i','boost_libs_html','text/html'),
- array('@^doc/html/.*html$@i','boost_book_html','text/html'),
- array('@^boost/.*$@i','text','text/plain')
+ //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+ //~ special cases that can't be processed at all (mostly redirects)
+ array('@1_(34)_[0-9]@','@^libs/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/algorithm/string/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/any/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/array/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/assign/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/bind/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/bind/ref.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/concept_check/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/config/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/date_time/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/date_time/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/disjoint_sets/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/dynamic_bitset/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/filesystem/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/foreach/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/function/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/functional/hash/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/graph/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/io/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/iostreams/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/iterator/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/lambda/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/lambda/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/math/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/math/doc/common_factor.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/math/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/mem_fn/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/mpl/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/multi_array/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/multi_index/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/numeric/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/numeric/conversion/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/numeric/interval/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/numeric/ublas/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/optional/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/parameter/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/pool/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/preprocessor/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/program_options/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/program_options/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/property_map/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/ptr_container/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/python/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/python/doc/PyConDC_2003/bpl.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/python/doc/tutorial/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/python/doc/v2/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/regex/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/serialization/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/signals/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/signals/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/smart_ptr/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/statechart/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/static_assert/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/static_assert/static_assert.htm$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/test/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/thread/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/thread/doc/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/tr1/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/tuple/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/typeof/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/type_traits/cxx_type_traits.htm$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/type_traits/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/utility/iterator_adaptors.htm$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/variant/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^libs/xpressive/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^more/getting_started.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^more/lib_guide.htm$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^more/regression.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^status/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^tools/build/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^tools/jam/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^tools/quickbook/index.html$@i','raw','text/html'),
+ array('@1_(34)_[0-9]@','@^wiki/index.html$@i','raw','text/html'),
+ //~ special cases that can't be embeded in the standard frame
+ array('@.*@','@^libs/iostreams/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@.*@','@^libs/preprocessor/doc/\.*(html|htm)$@i','simple','text/html'),
+ array('@.*@','@^libs/serialization/doc/.*(html|htm)$@i','simple','text/html'),
+ array('@.*@','@^libs/filesystem/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'),
+ //~ default to processed output for libs and tools
+ array('@.*@','@^libs.*(html|htm)$@i','boost_libs_html','text/html'),
+ array('@.*@','@^tools.*(html|htm)$@i','boost_libs_html','text/html'),
+ array('@.*@','@^doc/html/.*html$@i','boost_book_html','text/html'),
+ //~ the headers are text files displayed in an embeded page
+ array('@.*@','@^boost/.*$@i','cpp','text/plain')
));
-if (!$_file->is_raw()) { #~ require_once(dirname(__FILE__) . '/../common/code/webnotes.php');
+if (!$_file->is_raw()) {
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -27,7 +103,6 @@
<link rel="icon" href="/favicon.ico" type="image/ico" />
<link rel="stylesheet" type="text/css" href="/style/section-doc.css" />
<!--[if IE]> <style type="text/css"> body { behavior: url(/style/csshover.htc); } </style> <![endif]-->
- <?php #~ pwn_head(); ?>
</head><!-- <?php print $_file->file_; ?> -->
@@ -46,14 +121,6 @@
</div>
</div>
</div>
-
- <div class="section" id="notes">
- <div class="section-0">
- <div class="section-body">
- <?php #~ pwn_body($_file->key_,$_SERVER['PHP_SELF']); ?>
- </div>
- </div>
- </div>
</div>
<div class="clear"></div>
@@ -69,7 +136,7 @@
<div id="copyright">
<p>Copyright Beman Dawes, David Abrahams, 1998-2005.</p>
- <p>Copyright Rene Rivera 2004-2007.</p>
+ <p>Copyright Rene Rivera 2004-2008.</p>
</div><?php virtual("/common/footer-license.html");?>
</div>
@@ -78,6 +145,6 @@
</div>
<div class="clear"></div>
- </div>
+ </div><?php } ?>
</body>
-</html><?php } ?>
\ No newline at end of file
+</html>