Index: gsitemap.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/gsitemap/Attic/gsitemap.module,v retrieving revision 1.56.2.1 diff -u -p -r1.56.2.1 gsitemap.module --- gsitemap.module 11 Jan 2007 07:04:16 -0000 1.56.2.1 +++ gsitemap.module 14 Mar 2007 18:52:08 -0000 @@ -95,7 +95,7 @@ function gsitemap_nodeapi(&$node, $op, $ } db_query("INSERT INTO {gsitemap} (nid, last_changed, priority_override) VALUES(%d, %d, %s)", $node->nid, $node->changed, $node->priority_override); if (variable_get('gsitemap_submit', 0) && $node->status) { - _gsitemap_submit(); + _gsitemap_submit_on_exit(); } break; case 'load': @@ -126,13 +126,13 @@ function gsitemap_nodeapi(&$node, $op, $ } } if (variable_get('gsitemap_submit', 0) && ($node->status || $oldnode->status)) { - _gsitemap_submit(); + _gsitemap_submit_on_exit(); } break; case 'delete': db_query("DELETE FROM {gsitemap} WHERE nid=%d", $node->nid); if (variable_get('gsitemap_submit', 0) && $node->status) { - _gsitemap_submit(); + _gsitemap_submit_on_exit(); } break; case 'validate': @@ -163,7 +163,7 @@ function gsitemap_comment($op, $comment) db_query("UPDATE {gsitemap} SET last_comment=%d, previous_comment=%d WHERE nid=%d", $comment[timestamp], $node->last_comment, $node->nid); } if (variable_get('gsitemap_submit', 0)) { - _gsitemap_submit(); + _gsitemap_submit_on_exit(); } } } @@ -181,7 +181,7 @@ function gsitemap_comment($op, $comment) db_query("UPDATE {gsitemap} SET last_comment=%d, previous_comment=%d WHERE nid=%d", $comment->timestamp, $node->last_comment, $node->nid); } if (variable_get('gsitemap_submit', 0)) { - _gsitemap_submit(); + _gsitemap_submit_on_exit(); } } } @@ -196,6 +196,14 @@ function gsitemap_admin_settings() { '#title' => t('Priority Settings'), '#collapsible' => TRUE, ); + $form['priority_settings']['gsitemap_chunk_size'] = array( + '#type' => 'textfield', + '#title' => t('Chunk size'), + '#default_value' => variable_get('gsitemap_chunk_size', '10000'), + '#size' => 10, + '#maxlength' => 5, + '#description' => t('This is the number of links to send at one time. Values can range between 1 and 50,000.'), + ); $form['priority_settings']['gsitemap_frontpage'] = array( '#type' => 'textfield', '#title' => t('Front page priority'), @@ -265,6 +273,13 @@ function gsitemap_admin_settings() { '#default_value' => variable_get('gsitemap_showterms', 0), '#description' => t('If enabled, links to taxonomy term pages will be included in the sitemap.'), ); + $form['other_settings']['gsitemap_showusers'] = array( + '#type' => 'checkbox', + '#title' => t('Include links to user profile pages'), + '#return_value' => 1, + '#default_value' => variable_get('gsitemap_showusers', 0), + '#description' => t('If enabled, links to user profile pages will be included in the sitemap (requires requestor to have "access user profiles" permission).'), + ); $form['other_settings']['gsitemap_submit'] = array( '#type' => 'checkbox', '#title' => t('Submit sitemap to Google when updated'), @@ -292,16 +307,86 @@ function gsitemap_admin_settings() { return system_settings_form($form); } +function gsitemap_admin_settings_validate($form_id, $form_values) { + if ($form_values['gsitemap_chunk_size'] > 50000) { + form_set_error('priority_settings][gsitemap_chunk_size', t('Cannot send more than 50,000 links at one time.')); + } +} + function gsitemap_cron() { if (variable_get('gsitemap_cron_submit', 0)) { _gsitemap_submit(); } } -function gsitemap_output() { +function gsitemap_output($chunk=NULL) { + if (!isset($chunk)) { + gsitemap_output_index(); + $type = "Sitemap index"; + } else { + gsitemap_output_chunk($chunk); + $type = "Sitemap chunk $chunk"; + } + + if(variable_get('gsitemap_logacc',0)) { + if(strpos(getenv('HTTP_USER_AGENT'),'Googlebot')) { + watchdog('gsitemap',$type . ' downloaded by Google.'); + } + else { + watchdog('gsitemap',$type . ' downloaded by ' . getenv('HTTP_USER_AGENT') . ' at ' . getenv('REMOTE_ADDR') . '.'); + } + } +} + +function gsitemap_get_chunk_range($chunk) { + $range->low = $chunk * variable_get('gsitemap_chunk_size', '10000'); + $range->high = ($chunk + 1) * variable_get('gsitemap_chunk_size', '10000'); + return $range; +} + +function gsitemap_output_index() { + global $base_url; + $countcom = variable_get('gsitemap_countcom',1); + + header("Content-type: text/xml"); + print ''; + print ''; + + $result = db_fetch_object(db_query("SELECT MAX(nid) as max FROM {node}")); + $max_nid = $result->max; + + print ''; + for ($i = 0; $i < $max_nid / variable_get('gsitemap_chunk_size', '10000'); $i++) { + print ''; + print '' . url("gsitemap/" . $i, NULL, NULL, TRUE) . ''; + + $range = gsitemap_get_chunk_range($i); + $result = db_fetch_object( + db_query(sprintf("SELECT MAX(changed) as changed from {node} WHERE nid >= %d AND nid < %d", + $range->low, $range->high))); + $last_changed_node = $result->changed; + + if ($countcom) { + $result = db_fetch_object( + db_query(sprintf("SELECT MAX(timestamp) as timestamp from {comments} WHERE nid >= %d AND nid < %d", + $range->low, $range->high))); + $last_changed_comment = $result->timestamp; + } else { + $last_changed_comment = 0; + } + + print '' . gmdate("Y-m-d\TH:i:s+00:00", max($last_changed_node, $last_changed_comment)) . ''; + print ''; + } + print ''; +} + +function gsitemap_output_chunk($chunk) { + global $base_url; if (!ini_get('safe_mode')) { set_time_limit(240); } + $range = gsitemap_get_chunk_range($chunk); $countcom = variable_get('gsitemap_countcom', 1); $excluded_types = array("''"); foreach (node_get_types() as $type => $name) { @@ -312,16 +397,19 @@ function gsitemap_output() { $excludes = implode(',', $excluded_types); drupal_set_header("Content-type: text/xml; charset=utf-8"); print ''; - print ''; + print ''; + print ''; print '' . url('', NULL, NULL, TRUE) . 'always' . variable_get('gsitemap_frontpage', '1.0') . ''; $count = array(); - $result = db_query("SELECT COUNT(*) AS count FROM {node}"); + $result = db_query(sprintf("SELECT COUNT(*) AS count FROM {node} WHERE nid >= %d AND nid < %d", + $range->low, $range->high)); $count[0] = db_fetch_object($result); - $result = db_query("SELECT COUNT(*) AS count FROM {gsitemap}"); + $result = db_query(sprintf("SELECT COUNT(*) AS count FROM {gsitemap} WHERE nid >= %d AND nid < %d", + $range->low, $range->high)); $count[1] = db_fetch_object($result); if (module_exists('comment')) { if ($count[0]->count != $count[1]->count) { - $result = db_query("SELECT {node}.nid, changed FROM {node} LEFT JOIN {gsitemap} USING(nid) WHERE {gsitemap}.nid IS NULL"); + $result = db_query(sprintf("SELECT {node}.nid, changed FROM {node} LEFT JOIN {gsitemap} USING(nid) WHERE {gsitemap}.nid IS NULL AND {node}.nid >= %d AND {node}.nid < %d", $range->low, $range->high)); while($node = db_fetch_object($result)) { db_query("INSERT INTO {gsitemap} (nid, last_changed) VALUES(%d, %d)", $node->nid, $node->changed); } @@ -331,7 +419,7 @@ function gsitemap_output() { } } $maxcomments = db_fetch_object(db_query("SELECT MAX(comment_count) AS max_comments FROM {node_comment_statistics}")); - $result = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.type, n.status, n.promote, s.comment_count, n.changed, g.previously_changed, s.last_comment_timestamp, g.previous_comment, g.priority_override FROM {node} n LEFT JOIN {node_comment_statistics} s ON n.nid=s.nid LEFT JOIN {gsitemap} g ON n.nid=g.nid LEFT JOIN {url_alias} u ON src=CONCAT('node/', n.nid) WHERE n.status > 0 AND (g.priority_override >= 0 OR g.priority_override IS NULL) AND n.type NOT IN (" . $excludes . ")", 'n')); + $result = db_query(db_rewrite_sql(sprintf("SELECT DISTINCT(n.nid), n.type, n.status, n.promote, s.comment_count, n.changed, g.previously_changed, s.last_comment_timestamp, g.previous_comment, g.priority_override FROM {node} n LEFT JOIN {node_comment_statistics} s ON n.nid=s.nid LEFT JOIN {gsitemap} g ON n.nid=g.nid LEFT JOIN {url_alias} u ON src=CONCAT('node/', n.nid) WHERE n.status > 0 AND (g.priority_override >= 0 OR g.priority_override IS NULL) AND n.type NOT IN (" . $excludes . ") AND n.nid >= %d AND n.nid < %d", $range->low, $range->high), 'n')); } else { if ($count[0]->count != $count[1]->count) { @@ -340,7 +428,7 @@ function gsitemap_output() { db_query("INSERT INTO {gsitemap} (nid, last_changed) VALUES(%d, %d)", $node->nid, $node->changed); } } - $result = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.type, n.status, n.promote, n.changed, g.previously_changed, g.priority_override FROM {node} n LEFT JOIN {gsitemap} g ON n.nid=g.nid LEFT JOIN {url_alias} u ON src=CONCAT('node/', n.nid) WHERE n.status > 0 AND (g.priority_override >=0 OR g.priority_override IS NULL) AND n.type NOT IN (" . $excludes . ")", 'n')); + $result = db_query(db_rewrite_sql(sprintf("SELECT DISTINCT(n.nid), n.type, n.status, n.promote, n.changed, g.previously_changed, g.priority_override FROM {node} n LEFT JOIN {gsitemap} g ON n.nid=g.nid LEFT JOIN {url_alias} u ON src=CONCAT('node/',n.nid) WHERE n.status > 0 AND (g.priority_override >=0 OR g.priority_override IS NULL) AND n.type NOT IN (" . $excludes . ") AND n.nid >= %d AND n.nid < %d", $range->low, $range->high), 'n')); } while($node = db_fetch_object($result)) { $pri = _gsitemap_calc_priority($node, $maxcomments->max_comments); @@ -411,6 +499,15 @@ function gsitemap_output() { } } } + if(variable_get('gsitemap_showusers', 0)) { + foreach(user_search() as $user) { + /* The user module passes the link through url(), which returns a URL + * relative to the server. We need an absolute URL, so we employ this + * wonderful hack to get it. + */ + print '' . url(strstr($user[link], 'user/'), NULL, NULL, TRUE) . 'always'; + } + } $additional = module_invoke_all('gsitemap'); foreach ($additional as $entry) { print ''; @@ -471,6 +568,32 @@ function _gsitemap_calc_priority($node, return $pri; } +/** + * Schedule a call to _gsitemap_submit() to be run on exit. Use this function + * instead of _gsitemap_submit() to avoid a delay for outputting the page to + * the user. + * + * @return If the function has not been called previously, FALSE. Otherwise, + * TRUE. + */ +function _gsitemap_submit_on_exit() { + static $called = FALSE; + + $return = $called; + $called = TRUE; + return $return; +} + +/** + * Implementation of hook_exit() which is used to call _gsitemap_submit() if + * _gsitemap_submit_on_exit() was called. + */ +function gsitemap_exit() { + if (_gsitemap_submit_on_exit()) { + _gsitemap_submit(); + } +} + function _gsitemap_submit() { $result = drupal_http_request('http://www.google.com/webmasters/tools/ping?sitemap='. url('gsitemap', NULL, NULL, TRUE)); if ($result->code == 200) { @@ -480,3 +603,4 @@ function _gsitemap_submit() { watchdog('gsitemap', t('Error occurred submitting sitemap to Google: @code', array('@code' => $result->code)), WATCHDOG_ERROR); } } + Index: gss.xsl =================================================================== RCS file: gss.xsl diff -N gss.xsl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gss.xsl 14 Mar 2007 18:52:08 -0000 @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + Google Sitemap File + + + + + + + + + + sitemap + siteindex + + + + + + + +

Google Sitemap

+ + + + + + +
+ + + + + + + + + + + +

Number of sitemaps in this Google sitemap index:

+

Click on the table headers to change sorting.

+ + + + + + + + +
Sitemap URLLast modification date
+ + + + +

Number of URLs in this Google Sitemap:

+

Click on the table headers to change sorting.

+ + + + + + + + + + +
Sitemap URLLast modification dateChange freq.Priority
+ + + + + + + + + + + + + + + + + + + + + + + + + + +