by Dave Reid: Split generation functions into xmlsitemap.generate.inc.

xmlsitemap.admin.inc

@@ -270,7 +270,7 @@ function xmlsitemap_rebuild_form_submit($form, &$form_state) {
   // Set the rebuild flag incase something fails during the rebuild.
   variable_set('xmlsitemap_rebuild_needed', TRUE);
 
-  module_load_include('inc', 'xmlsitemap');
+  module_load_include('inc', 'xmlsitemap', 'xmlsitemap.generate');
   $batch = xmlsitemap_rebuild_batch($form_state['values']['entities'], $form_state['values']['callbacks'], $form_state['values']['save_custom']);
   batch_set($batch);
   $form_state['redirect'] = 'admin/config/search/xmlsitemap';

xmlsitemap.drush.inc

@@ -34,7 +34,7 @@ function xmlsitemap_drush_command() {
  * Regenerate the sitemap files from existing data.
  */
 function drush_xmlsitemap_regenerate() {
-  module_load_include('inc', 'xmlsitemap');
+  module_load_include('inc', 'xmlsitemap', 'xmlsitemap.generate');
   xmlsitemap_regenerate();
 
   $vars = array(
@@ -48,7 +48,7 @@ function drush_xmlsitemap_regenerate() {
  * Dump and rebuild all the sitemap data, then regenerate the files.
  */
 function drush_xmlsitemap_rebuild() {
-  module_load_include('inc', 'xmlsitemap');
+  module_load_include('inc', 'xmlsitemap', 'xmlsitemap.generate');
   timer_start('xmlsitemap_rebuild');
 
   // Set the rebuild flag incase something fails during the rebuild.

xmlsitemap.info

@@ -7,6 +7,7 @@ files[] = xmlsitemap.module
 files[] = xmlsitemap.inc
 files[] = xmlsitemap.admin.inc
 files[] = xmlsitemap.drush.inc
+files[] = xmlsitemap.generate.inc
 files[] = xmlsitemap.pages.inc
 files[] = xmlsitemap.install
 files[] = xmlsitemap.test

xmlsitemap.module

@@ -145,7 +145,7 @@ function xmlsitemap_cron() {
   }
 
   // Regenerate the sitemap XML files.
-  module_load_include('inc', 'xmlsitemap');
+  module_load_include('inc', 'xmlsitemap', 'xmlsitemap.generate');
   xmlsitemap_regenerate();
 }
 
@@ -177,7 +177,6 @@ function xmlsitemap_xmlsitemap_link_alter(&$link) {
  * Implements hook_robotstxt().
  */
 function xmlsitemap_robotstxt() {
-  module_load_include('inc', 'xmlsitemap');
   $sitemaps = xmlsitemap_get_sitemaps();
   foreach ($sitemaps as $index => $sitemap) {
     $sitemaps[$index] = 'Sitemap: ' . $sitemap;
@@ -564,22 +563,6 @@ function xmlsitemap_link_delete_multiple(array $conditions) {
   return $query->execute();
 }
 
-/**
- * Get the filename of a specific sitemap page chunk.
- *
- * @param $chunk
- *   An integer representing the integer of the sitemap page chunk.
- * @param $language
- *   A string with a language code.
- * @return
- *   A file path to the expected chunk file.
- *
- * @todo Move to xmlsitemap.inc
- */
-function xmlsitemap_get_chunk_file($chunk = 0, $language = LANGUAGE_NONE, $extension = 'xml') {
-  return xmlsitemap_get_directory() . "/xmlsitemap-{$language}-{$chunk}.{$extension}";
-}
-
 /**
  * Implements hook_form_alter().
  *

xmlsitemap.pages.inc

@@ -14,15 +14,11 @@
  * @see xmlsitemap_file_transfer()
  */
 function xmlsitemap_output_chunk() {
-  global $language;
-
-  $context = array();
-  if (module_exists('xmlsitemap_i18n')) {
-    $context['language'] = $language->language;
-  }
+  $context = module_invoke_all('xmlsitemap_context');
+  drupal_alter('xmlsitemap_context', $context);
 
   // Check if we should be displaing the index.
-  if (!isset($_GET['page'])) {
+  if (!isset($_GET['page']) || !is_numeric($_GET['page'])) {
     $index_file = xmlsitemap_get_file_from_context($context, 'index');
     if (file_exists($index_file)) {
       $chunk = 'index';
@@ -35,8 +31,10 @@ function xmlsitemap_output_chunk() {
     $chunk = (int) $_GET['page'];
   }
 
+  // Fallback to non-context sitemap?
+
   $file = xmlsitemap_get_file_from_context($context, $chunk);
-  xmlsitemap_output_file($file);
+  return xmlsitemap_output_file($file);
 }
 
 /**

xmlsitemap.test

@@ -62,7 +62,7 @@ class XMLSitemapTestHelper extends DrupalWebTestCase {
   protected function regenerateSitemap() {
     variable_set('xmlsitemap_regenerate_needed', TRUE);
     variable_set('xmlsitemap_generated_last', 0);
-    module_load_include('inc', 'xmlsitemap');
+    module_load_include('inc', 'xmlsitemap', 'xmlsitemap.generate');
     xmlsitemap_regenerate();
     $this->assertTrue(variable_get('xmlsitemap_generated_last', 0) && !variable_get('xmlsitemap_regenerate_needed', FALSE), t('XML sitemaps regenerated and flag cleared.'));
   }