dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 20d563c)
--redirects option
authorTim Starling <tstarling@users.mediawiki.org>
Sat, 22 Oct 2005 09:03:03 +0000 (09:03 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Sat, 22 Oct 2005 09:03:03 +0000 (09:03 +0000)
maintenance/dumpHTML.inc patch | blob | history
maintenance/dumpHTML.php patch | blob | history

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index 6025802..8697f04 100644 (file)
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -183,6 +183,27 @@ class DumpHTML {
                print "\n";
        }
 
+       function doRedirects() {
+               global $wgLinkCache;
+               
+               print "Doing redirects...\n";
+               $fname = 'DumpHTML::doRedirects';
+               $this->setupGlobals();
+               $dbr =& wfGetDB( DB_SLAVE );
+
+               $res = $dbr->select( 'page', array( 'page_namespace', 'page_title' ), 
+                       array( 'page_is_redirect' => 1 ), $fname );
+               $num = $dbr->numRows( $res );
+               print "$num redirects to do...\n";
+               $i = 0;
+               while ( $row = $dbr->fetchObject( $res ) ) {
+                       $title = Title::makeTitle( $row->page_namespace, $row->page_title );
+                        if ( !(++$i % (REPORTING_INTERVAL*10) ) ) {
+                                print "Done $i of $num\n";
+                        }
+                       $this->doArticle( $title );
+               }
+       }
 
        /** Write an article specified by title */
        function doArticle( $title ) {
@@ -190,6 +211,7 @@ class DumpHTML {
                global $wgUploadDirectory;
                
                $text = $this->getArticleHTML( $title );
+
                if ( $text === false ) {
                        return;
                }
@@ -285,10 +307,6 @@ class DumpHTML {
        function getArticleHTML( &$title ) {
                global $wgOut, $wgTitle, $wgArticle, $wgUser, $wgUseCategoryMagic, $wgLinkCache;
                
-               $wgOut = new OutputPage;
-               $wgOut->setParserOptions( new ParserOptions );
-               $wgLinkCache = new LinkCache;
-               
                $wgTitle = $title;
                if ( is_null( $wgTitle ) ) {
                        return false;
@@ -307,10 +325,12 @@ class DumpHTML {
                        }
                        $rt = Title::newFromRedirect( $wgArticle->fetchContent() );
                        if ( $rt != NULL ) {
-                               $wgOut->addMeta( 'http:Refresh', '3;url=' . $rt->escapeLocalURL() );
-                               $wgOut->setPageTitle( $wgTitle->getPrefixedText() );
-                               $wgOut->addWikiText( wfMsg( 'redirectingto', $rt->getPrefixedText() ) );
+                               return $this->getRedirect( $rt );
                        } else {
+                               $wgOut = new OutputPage;
+                               $wgOut->setParserOptions( new ParserOptions );
+                               $wgLinkCache = new LinkCache;
+               
                                $wgArticle->view();
                        }
                }
@@ -324,6 +344,23 @@ class DumpHTML {
                return $text;
        }
 
+       function getRedirect( $rt ) {
+               $url = $rt->escapeLocalURL();
+               $text = $rt->getPrefixedText();
+               return <<<ENDTEXT
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta http-equiv="Refresh" content="0;url=$url" />
+</head>
+<body>
+  <p>Redirecting to <a href="$url">$text</a></p>
+</body>
+</html>
+ENDTEXT;
+       }
+
        /** Returns image paths used in an XHTML document */
        function findImages( $text ) {
                global $wgOutputEncoding, $wgDumpImages;
@@ -394,6 +431,7 @@ class DumpHTML {
                                $rel = substr( $image, $mathPathLength + 1 ); // +1 for slash
                                $source = "$wgMathDirectory/$rel";
                                $dest = "{$this->dest}/math/$rel";
+                               @mkdir( "{$this->dest}/math", 0755 );
                                if ( !file_exists( $dest ) ) {
                                        copy( $source, $dest );
                                }
diff --git a/maintenance/dumpHTML.php b/maintenance/dumpHTML.php
index 8f52f1c..f8d7b3b 100644 (file)
--- a/maintenance/dumpHTML.php
+++ b/maintenance/dumpHTML.php
@@ -14,6 +14,7 @@
  * -e <end>       end ID
  * --images       only do image description pages
  * --categories   only do category pages
+ * --redirects    only do redirects
  * --special      only do miscellaneous stuff
  * --force-copy   copy commons instead of symlink, needed for Wikimedia
  * --interlang    allow interlanguage links
@@ -73,6 +74,8 @@ if ( $options['special'] ) {
        $d->doImageDescriptions();
 } elseif ( $options['categories'] ) {
        $d->doCategories();
+} elseif ( $options['redirects'] ) {
+       $d->doRedirects();
 } else {
        print("Creating static HTML dump in directory $dest. \n".
                "Starting from page_id $start of $end.\n");
Wiklou, le Wiki du Wiklou