No point in fetching the result in Database::unlock() if we're not using it anyway.

[lhc/web/wiklou.git] / maintenance / generateSitemap.php

diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index 1649291..0405868 100644 (file)
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -2,16 +2,16 @@
 define( 'GS_MAIN', -2 );
 define( 'GS_TALK', -1 );
 /**
- * Creates a Google sitemap for the site
+ * Creates a sitemap for the site
  *
- * @addtogroup Maintenance
+ * @ingroup Maintenance
  *
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @copyright Copyright © 2005, Jens Frank <jeluf@gmx.de>
  * @copyright Copyright © 2005, Brion Vibber <brion@pobox.com>
  *
- * @link http://www.google.com/webmasters/sitemaps/docs/en/about.html
- * @link http://www.google.com/schemas/sitemap/0.84/sitemap.xsd
+ * @see http://www.sitemaps.org/
+ * @see http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
@@ -20,7 +20,7 @@ class GenerateSitemap {
        /**
         * The maximum amount of urls in a sitemap file
         *
-        * @link http://www.google.com/schemas/sitemap/0.84/sitemap.xsd
+        * @link http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd
         *
         * @var int
         */
@@ -29,7 +29,7 @@ class GenerateSitemap {
        /**
         * The maximum size of a sitemap file
         *
-        * @link http://www.google.com/webmasters/sitemaps/docs/en/protocol.html#faq_sitemap_size
+        * @link http://www.sitemaps.org/faq.php#faq_sitemap_size
         *
         * @var int
         */
@@ -143,13 +143,12 @@ class GenerateSitemap {
         * @param string $path The path to append to the domain name
         * @param bool $compress Whether to compress the sitemap files
         */
-       function GenerateSitemap( $fspath, $path, $compress ) {
+       function GenerateSitemap( $fspath, $compress ) {
                global $wgScriptPath;
 
                $this->url_limit = 50000;
                $this->size_limit = pow( 2, 20 ) * 10;
                $this->fspath = isset( $fspath ) ? $fspath : '';
-               $this->path = isset( $path ) ? $path : $wgScriptPath;
                $this->compress = $compress;
 
                $this->stderr = fopen( 'php://stderr', 'wt' );
@@ -165,6 +164,13 @@ class GenerateSitemap {
        function generateNamespaces() {
                $fname = 'GenerateSitemap::generateNamespaces';
 
+               // Only generate for specific namespaces if $wgSitemapNamespaces is an array.
+               global $wgSitemapNamespaces;
+               if( is_array( $wgSitemapNamespaces ) ) {
+                       $this->namespaces = $wgSitemapNamespaces;
+                       return;
+               }
+
                $res = $this->dbr->select( 'page',
                        array( 'page_namespace' ),
                        array(),
@@ -201,7 +207,7 @@ class GenerateSitemap {
         * @return string
         */
        function guessPriority( $namespace ) {
-               return Namespace::isMain( $namespace ) ? $this->priorities[GS_MAIN] : $this->priorities[GS_TALK];
+               return MWNamespace::isMain( $namespace ) ? $this->priorities[GS_MAIN] : $this->priorities[GS_TALK];
        }
 
        /**
@@ -346,7 +352,7 @@ class GenerateSitemap {
         * @returns string
         */
        function xmlSchema() {
-               return 'http://www.google.com/schemas/sitemap/0.84';
+               return 'http://www.sitemaps.org/schemas/sitemap/0.9';
        }
 
        /**
@@ -447,23 +453,29 @@ class GenerateSitemap {
 }
 
 if ( in_array( '--help', $argv ) ) {
-       echo
-               "Usage: php generateSitemap.php [host] [options]\n" .
-               "\thost = hostname\n" .
-               "\toptions:\n" .
-               "\t\t--help\tshow this message\n" .
-               "\t\t--fspath\tThe file system path to save to, e.g /tmp/sitemap/\n" .
-               "\t\t--path\tThe http path to use, e.g. /wiki\n" .
-               "\t\t--compress=[yes|no]\tcompress the sitemap files, default yes\n";
+       echo <<<EOT
+Usage: php generateSitemap.php [options]
+       --help                  show this message
+
+       --fspath=<path>         The file system path to save to, e.g /tmp/sitemap/
+
+       --server=<server>       The protocol and server name to use in URLs, e.g.
+               http://en.wikipedia.org. This is sometimes necessary because
+               server name detection may fail in command line scripts.
+
+       --compress=[yes|no]     compress the sitemap files, default yes
+
+EOT;
        die( -1 );
 }
 
-if ( isset( $argv[1] ) && strpos( $argv[1], '--' ) !== 0 )
-       $_SERVER['SERVER_NAME'] = $argv[1];
+$optionsWithArgs = array( 'fspath', 'server', 'compress' );
+require_once( dirname( __FILE__ ) . '/commandLine.inc' );
 
-$optionsWithArgs = array( 'fspath', 'path', 'compress' );
-require_once 'commandLine.inc';
+if ( isset( $options['server'] ) ) {
+       $wgServer = $options['server'];
+}
 
-$gs = new GenerateSitemap( @$options['fspath'], @$options['path'], @$options['compress'] !== 'no' );
+$gs = new GenerateSitemap( @$options['fspath'], @$options['compress'] !== 'no' );
 $gs->main();
-?>
+