From: daniel_james_at_[hidden]
Date: 2008-04-11 13:33:18
Author: danieljames
Date: 2008-04-11 13:33:17 EDT (Fri, 11 Apr 2008)
New Revision: 44185
URL: http://svn.boost.org/trac/boost/changeset/44185
Log:
Merge yesterday's changes from the beta site.
Fixes: #1743, #1783, #1779, #1806, #1815
------------------------------------------------------------------------
r44154 | danieljames | 2008-04-10 20:28:38 +0100 (Thu, 10 Apr 2008) | 3 lines
404 if there is an error extracting a file from the zip. Not always correct but
probably better than returing a blank page. A little hacky.
------------------------------------------------------------------------
r44155 | danieljames | 2008-04-10 21:26:52 +0100 (Thu, 10 Apr 2008) | 2 lines
Allow the redirect link for the config library to work.
------------------------------------------------------------------------
r44156 | danieljames | 2008-04-10 21:27:36 +0100 (Thu, 10 Apr 2008) | 2 lines
Fix some links to the libraries. Refs #1806
------------------------------------------------------------------------
r44157 | danieljames | 2008-04-10 21:33:03 +0100 (Thu, 10 Apr 2008) | 2 lines
Fix the "who's using boost' link. Refs #1779.
------------------------------------------------------------------------
r44158 | danieljames | 2008-04-10 21:50:50 +0100 (Thu, 10 Apr 2008) | 2 lines
Link to the wiki. Refs #1783.
------------------------------------------------------------------------
r44159 | danieljames | 2008-04-10 22:03:14 +0100 (Thu, 10 Apr 2008) | 1 line
Fix some errors in the library list. Refs #1742.
------------------------------------------------------------------------
r44162 | danieljames | 2008-04-10 22:20:34 +0100 (Thu, 10 Apr 2008) | 1 line
Fix a couple of libraries that are incorrectly listed as header only. Refs #1743.
------------------------------------------------------------------------
Text files modified:
website/public_html/live/common/code/boost_archive.php | 33 ++++++++++++++++++++++++++++-----
website/public_html/live/doc/display_libs.php | 3 ++-
website/public_html/live/doc/index.html | 5 +++++
website/public_html/live/doc/libraries.xml | 22 +++++++++++-----------
website/public_html/live/users/index.html | 10 ++++------
5 files changed, 50 insertions(+), 23 deletions(-)
Modified: website/public_html/live/common/code/boost_archive.php
==============================================================================
--- website/public_html/live/common/code/boost_archive.php (original)
+++ website/public_html/live/common/code/boost_archive.php 2008-04-11 13:33:17 EDT (Fri, 11 Apr 2008)
@@ -70,8 +70,8 @@
if (! $this->extractor_)
{
# File doesn't exist, or we don't know how to handle it.
- header("HTTP/1.0 404 Not Found");
- $this->extractor_ = 'raw';
+ $this->extractor_ = '404';
+ $this->_init_404();
}
else if ($get_as_raw || $this->extractor_ == 'raw')
{
@@ -121,8 +121,13 @@
while ($file_handle && !feof($file_handle)) {
$text .= fread($file_handle,8*1024);
}
- pclose($file_handle);
- return $text;
+ if(pclose($file_handle) == 0) {
+ return $text;
+ }
+ else {
+ $this->extractor_ = '404';
+ return '';
+ }
}
function _extract_raw($unzip)
@@ -131,7 +136,11 @@
## header('Content-Disposition: attachment; filename="downloaded.pdf"');
$file_handle = popen($unzip,'rb');
fpassthru($file_handle);
- pclose($file_handle);
+ if(pclose($file_handle) != 0) {
+ // TODO: Maybe I should buffer the file so that I can return a
+ // proper 404 error.
+ echo "File not found.";
+ }
}
function content()
@@ -482,5 +491,19 @@
{
print $this->_content_html_pre();
}
+
+ function _init_404()
+ {
+ header("HTTP/1.0 404 Not Found");
+ }
+
+ function _content_404()
+ {
+ # This might also be an error extracting the file, or because we don't
+ # know how to deal with the file. It would be good to give a better
+ # error in those cases.
+
+ print '<h1>404 Not Found</h1><p>File not found.</p>';
+ }
}
?>
Modified: website/public_html/live/doc/display_libs.php
==============================================================================
--- website/public_html/live/doc/display_libs.php (original)
+++ website/public_html/live/doc/display_libs.php 2008-04-11 13:33:17 EDT (Fri, 11 Apr 2008)
@@ -28,6 +28,7 @@
//~ special cases that can't be processed at all (some redirects)
array('@.*@','@^libs/index.html$@i','raw','text/html'),
array('@.*@','@^libs/bind/ref.html$@i','raw','text/html'),
+ array('@.*@','@^libs/config/config.htm$@i','raw','text/html'),
array('@.*@','@^libs/gil/doc/.*(html|htm)$@i','raw','text/html'),
array('@.*@','@^libs/math/doc/common_factor.html$@i','raw','text/html'),
array('@.*@','@^libs/preprocessor/doc/.*(html|htm)$@i','raw','text/html'),
@@ -117,4 +118,4 @@
</div>
</body>
</html>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
Modified: website/public_html/live/doc/index.html
==============================================================================
--- website/public_html/live/doc/index.html (original)
+++ website/public_html/live/doc/index.html 2008-04-11 13:33:17 EDT (Fri, 11 Apr 2008)
@@ -43,6 +43,11 @@
<div id="doc-index">
<!--#include virtual="/common/menu-doc.html" -->
</div>
+
+ <p>Further documentation is also available from the <a href=
+ "http://www.crystalclearsoftware.com/cgi-bin/boost_wiki/wiki.pl">
+ Boost user Wiki</a>. But note that this isn't officially
+ maintained by Boost developers.</p>
</div>
</div>
</div>
Modified: website/public_html/live/doc/libraries.xml
==============================================================================
--- website/public_html/live/doc/libraries.xml (original)
+++ website/public_html/live/doc/libraries.xml 2008-04-11 13:33:17 EDT (Fri, 11 Apr 2008)
@@ -178,7 +178,7 @@
<boost-version>1.9.0</boost-version>
<name>Config</name>
<authors></authors>
- <description>Helps boost library developers adapt to compiler
+ <description>Helps Boost library developers adapt to compiler
idiosyncrasies; not intended for library users.</description>
<documentation>libs/config/config.htm</documentation>
<std-proposal>false</std-proposal>
@@ -230,7 +230,7 @@
<key>disjoint_sets</key>
<boost-version>1.9.0</boost-version>
<name>Disjoint Sets</name>
- <authors></authors>
+ <authors>Jeremy Siek, Lie-Quan Lee, Andrew Lumsdaine</authors>
<description>Boost.DisjointSets provides disjoint sets
operations with union by rank and path
compression.</description>
@@ -264,7 +264,7 @@
<boost-version>1.30.0</boost-version>
<name>Filesystem</name>
<authors>Beman Dawes</authors>
- <description>The Boost Filesystem Librar provides portable
+ <description>The Boost Filesystem Library provides portable
facilities to query and manipulate paths, files, and
directories.</description>
<documentation>libs/filesystem/doc/index.htm</documentation>
@@ -552,7 +552,7 @@
<authors>Daryle Walker</authors>
<description>Greatest common divisor and least common
multiple.</description>
- <documentation>doc/html/boost_math/gcd_lcm.html</documentation>
+ <documentation>libs/math/doc/common_factor.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
<header-only>true</header-only>
@@ -564,7 +564,7 @@
<name>Math Octonion</name>
<authors>Hubert Holin</authors>
<description>Octonions.</description>
- <documentation>doc/html/boost_math/octonions.html</documentation>
+ <documentation>libs/math/doc/octonion/html/index.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
<header-only>true</header-only>
@@ -576,7 +576,7 @@
<name>Math Quaternion</name>
<authors>Hubert Holin</authors>
<description>Quaternions.</description>
- <documentation>doc/html/boost_math/quaternions.html</documentation>
+ <documentation>libs/math/doc/quaternion/html/index.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
<header-only>true</header-only>
@@ -675,7 +675,7 @@
<description>Optimized Policy-based Numeric
Conversions.</description>
<documentation>
- libs/numeric/conversion/doc/index.html</documentation>
+ libs/numeric/conversion/index.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
<header-only>true</header-only>
@@ -685,7 +685,7 @@
<key>numeric/interval</key>
<boost-version>1.30.0</boost-version>
<name>Interval</name>
- <authors>Guillaume Melquiond, Herv´ Brönnimann and
+ <authors>Guillaume Melquiond, Hervé Brönnimann and
Sylvain Pion</authors>
<description>Extends the usual arithmetic functions to
mathematical intervals.</description>
@@ -717,7 +717,7 @@
<authors>Fernando Cacciola</authors>
<description>Discriminated-union wrapper for optional
values.</description>
- <documentation>libs/optional/doc/optional.html</documentation>
+ <documentation>libs/optional/index.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
<header-only>true</header-only>
@@ -868,7 +868,7 @@
<documentation>libs/regex/index.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
- <header-only>true</header-only>
+ <header-only>false</header-only>
<autolink>false</autolink>
</library>
<library>
@@ -895,7 +895,7 @@
<documentation>doc/html/signals.html</documentation>
<std-proposal>false</std-proposal>
<std-tr1>false</std-tr1>
- <header-only>true</header-only>
+ <header-only>false</header-only>
<autolink>false</autolink>
</library>
<library>
Modified: website/public_html/live/users/index.html
==============================================================================
--- website/public_html/live/users/index.html (original)
+++ website/public_html/live/users/index.html 2008-04-11 13:33:17 EDT (Fri, 11 Apr 2008)
@@ -50,12 +50,10 @@
<h2>Who else is using Boost?</h2>
- <p>See the <a href=
- "/doc/libs/release/doc/html/who_s_using_boost_.html">Who's
- Using Boost page</a> for a sampling. We don't know the exact
- numbers, but a release gets around 100,000 downloads from
- SourceForge, and that is only one of several distribution
- routes.</p>
+ <p>See the <a href="/users/uses.html">Who's Using Boost
+ page</a> for a sampling. We don't know the exact numbers, but a
+ release gets around 100,000 downloads from SourceForge, and
+ that is only one of several distribution routes.</p>
<h2>What do others say about Boost?</h2>