[Boost-commit] svn:boost r80718 - in website/public_html/beta: common/code doc

Subject: [Boost-commit] svn:boost r80718 - in website/public_html/beta: common/code doc
From: dnljms_at_[hidden]
Date: 2012-09-26 16:10:53

Author: danieljames
Date: 2012-09-26 16:10:53 EDT (Wed, 26 Sep 2012)
New Revision: 80718
URL: http://svn.boost.org/trac/boost/changeset/80718

Log:
Website: Update script to use fixes when available.
Text files modified: 
   website/public_html/beta/common/code/boost_archive.php |    32 +++++++++++++++++++++++++-------        
   website/public_html/beta/doc/display_libs.php          |     1 +                                       
   2 files changed, 26 insertions(+), 7 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-09-26 16:10:53 EDT (Wed, 26 Sep 2012)
@@ -13,6 +13,7 @@
     $vpath,
     $archive_subdir = true,
     $zipfile = true,
+    $fix_dir = false,
     $archive_dir = ARCHIVE_DIR,
     $archive_file_prefix = ARCHIVE_FILE_PREFIX)
 {
@@ -22,15 +23,30 @@
     $version = $path_parts[1];
     $key = $path_parts[2];
 
-    $file = ($zipfile ? '' : $archive_dir . '/');
+    $file = false;
 
-    if ($archive_subdir)
-    {
-        $file = $file . $archive_file_prefix . $version . '/' . $key;
+    if ($fix_dir) {
+        $fix_path = "{$fix_dir}{$vpath}";
+
+        if (is_file($fix_path) ||
+            (is_dir($fix_path) && is_file("{$fix_path}/index.html")))
+        {
+            $zipfile = false;
+            $file = "{$fix_dir}{$vpath}";
+        }
     }
-    else
-    {
-        $file = $file . $archive_file_prefix . $key;
+
+    if (!$file) {
+        $file = ($zipfile ? '' : $archive_dir . '/');
+
+        if ($archive_subdir)
+        {
+            $file = $file . $archive_file_prefix . $version . '/' . $key;
+        }
+        else
+        {
+            $file = $file . $archive_file_prefix . $key;
+        }
     }
 
     $archive = $zipfile ? str_replace('\\','/', $archive_dir . '/' . $version . '.zip') : Null;
@@ -56,6 +72,7 @@
             'vpath' => $_SERVER["PATH_INFO"],
             'archive_subdir' => true,
             'zipfile' => true,
+            'fix_dir' => false,
             'archive_dir' => ARCHIVE_DIR,
             'archive_file_prefix' => ARCHIVE_FILE_PREFIX,
             'use_http_expire_date' => false,
@@ -73,6 +90,7 @@
         $params['vpath'],
         $params['archive_subdir'],
         $params['zipfile'],
+        $params['fix_dir'],
         $params['archive_dir'],
         $params['archive_file_prefix']
     ));

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-09-26 16:10:53 EDT (Wed, 26 Sep 2012)
@@ -87,6 +87,7 @@
   array('@^boost/.*$@i','cpp','text/plain')
   ),
   array(
+    'fix_dir' => dirname(__FILE__).'/fixes',
     'use_http_expire_date' => true,
     'zipfile' => false,
   )