Index: release/project-release-serve-history.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/release/project-release-serve-history.php,v retrieving revision 1.6 diff -u -p -u -r1.6 project-release-serve-history.php --- release/project-release-serve-history.php 7 Aug 2007 21:43:12 -0000 1.6 +++ release/project-release-serve-history.php 16 Aug 2007 19:45:10 -0000 @@ -98,16 +98,17 @@ if (isset($_GET['site_key'])) { if (db_table_exists('project_usage_raw')) { $site_key = $_GET['site_key']; $project_version = isset($_GET['version']) ? $_GET['version'] : ''; + $hostname = $_SERVER['REMOTE_ADDR']; // Compute a timestamp for the begining of the day. $time_parts = getdate(); $timestamp = mktime(0, 0, 0, $time_parts['mon'], $time_parts['mday'], $time_parts['year']); if (db_result(db_query("SELECT COUNT(*) FROM {project_usage_raw} WHERE project_uri = '%s' AND timestamp = %d AND site_key = '%s'", $project_name, $timestamp, $site_key))) { - db_query("UPDATE {project_usage_raw} SET api_version = '%s', project_version = '%s' WHERE project_uri = '%s' AND timestamp = %d AND site_key = '%s'", $api_version, $project_version, $project_name, $timestamp, $site_key); + db_query("UPDATE {project_usage_raw} SET api_version = '%s', project_version = '%s', hostname = '%s' WHERE project_uri = '%s' AND timestamp = %d AND site_key = '%s'", $api_version, $project_version, $hostname, $project_name, $timestamp, $site_key); } else { - db_query("INSERT INTO {project_usage_raw} (project_uri, timestamp, site_key, api_version, project_version) VALUES ('%s', %d, '%s', '%s', '%s')", $project_name, $timestamp, $site_key, $api_version, $project_version); + db_query("INSERT INTO {project_usage_raw} (project_uri, timestamp, site_key, api_version, project_version, hostname) VALUES ('%s', %d, '%s', '%s', '%s', '%s')", $project_name, $timestamp, $site_key, $api_version, $project_version, $hostname); } } } Index: usage/project_usage.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/usage/project_usage.install,v retrieving revision 1.1 diff -u -p -u -r1.1 project_usage.install --- usage/project_usage.install 7 Aug 2007 20:21:33 -0000 1.1 +++ usage/project_usage.install 16 Aug 2007 19:51:28 -0000 @@ -15,6 +15,7 @@ function project_usage_install() { pid int unsigned NOT NULL default '0', nid int unsigned NOT NULL default '0', tid int unsigned NOT NULL default '0', + hostname varchar(128) NOT NULL default '', PRIMARY KEY (timestamp, project_uri, site_key) ) /*!40100 DEFAULT CHARACTER SET utf8 */;"); db_query("CREATE TABLE IF NOT EXISTS {project_usage_day} ( @@ -23,6 +24,7 @@ function project_usage_install() { pid int unsigned NOT NULL default '0', nid int unsigned NOT NULL default '0', tid int unsigned NOT NULL default '0', + hostname varchar(128) NOT NULL default '', PRIMARY KEY (timestamp, site_key, pid) ) /*!40100 DEFAULT CHARACTER SET utf8 */;"); db_query("CREATE TABLE IF NOT EXISTS {project_usage_week_project} ( @@ -66,3 +68,18 @@ function project_usage_uninstall() { variable_del($variable); } } + +/** + * Add a hostname field to {project_usage_raw} and {project_usage_day}. + */ +function project_usage_update_5000() { + $ret = array(); + switch ($GLOBALS['db_type']) { + case 'mysql': + case 'mysqli': + $ret[] = update_sql("ALTER TABLE {project_usage_raw} ADD COLUMN hostname varchar(128) NOT NULL default '' AFTER tid"); + $ret[] = update_sql("ALTER TABLE {project_usage_day} ADD COLUMN hostname varchar(128) NOT NULL default '' AFTER tid"); + break; + } + return $ret; +} \ No newline at end of file Index: usage/project_usage.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/usage/project_usage.module,v retrieving revision 1.4 diff -u -p -u -r1.4 project_usage.module --- usage/project_usage.module 14 Aug 2007 00:51:53 -0000 1.4 +++ usage/project_usage.module 16 Aug 2007 19:52:06 -0000 @@ -148,7 +148,7 @@ function project_usage_process_daily() { // Move usage records with project node IDs into the daily table and remove // the rest. - db_query("INSERT INTO {project_usage_day} (timestamp, site_key, pid, nid, tid) SELECT timestamp, site_key, pid, nid, tid FROM {project_usage_raw} WHERE timestamp < %d AND pid <> 0", $timestamp); + db_query("INSERT INTO {project_usage_day} (timestamp, site_key, pid, nid, tid, hostname) SELECT timestamp, site_key, pid, nid, tid, hostname FROM {project_usage_raw} WHERE timestamp < %d AND pid <> 0", $timestamp); db_query("DELETE FROM {project_usage_raw} WHERE timestamp < %d", $timestamp); watchdog('project_usage', t('Moved usage from raw to daily.'));