Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/location/INSTALL.txt,v retrieving revision 1.3 diff -u -p -r1.3 INSTALL.txt --- INSTALL.txt 4 Aug 2005 00:54:47 -0000 1.3 +++ INSTALL.txt 13 Feb 2007 18:55:03 -0000 @@ -1,26 +1,17 @@ Step 1 ------ -To use this project, feed the location.mysql to your database. If your site -is using a prefix for database table names, make sure to adjust accordingly. - - mysql -u username -ppassword -h localhost database-name < modules/location/location.mysql - -where "username", "password" are the username/loging and "database-name" are -the parameters to login to your Drupal site's database. You can leave out -"-h localhost" if your MySQL server runs on the same site as your Apache. -However, replace 'localhost' in "-h localhost" if your MySQL server is on a -different machine. - -IMPORTANT: -To support proximity searches and most useful features, you will need a postal codes -database for each country for which you plan to use a file from the "supported/" -directory. The database structure can be loaded from the database/zipcodes.mysql -file, and the data can be loaded from database/zipcodes.CC.mysql (where CC is the -two-letter country code). - -As of this post, only U.S. and German postal codes are supported. A single zipcodes -table holds all the zipcodes. To create the zipcodes table using the database/zipcodes.mysql -file from within the location tarball: +To support proximity searches and most useful features, you will need a +postal codes database for each country for which you plan to use a file from +the "supported/" directory. The database structure can be loaded from the +database/zipcodes.mysql file, and the data can be loaded from +database/zipcodes.CC.mysql (where CC is the two-letter country code). + +As of this post, only U.S. and German postal codes are supported. A single +zipcodes table holds all the zipcodes. To create the zipcodes table using +the database/zipcodes.mysql file from within the location tarball, feed +these dumps to your database. If your site is using a prefix for database +table names, make sure to adjust accordingly. Careful, the postal code dump +for the US is a few MB. mysql -u username -ppassword -h localhost database-name < modules/location/database/zipcodes.mysql @@ -32,25 +23,36 @@ To make use of the German postal codes: mysql -u username -ppassword -h localhoost database-name < modules/location/database/zipcodes.de.mysql -Feed these dumps to your database as well, adjusting for prefixes. Careful, the -postal code dump for the US is a few MB. +where "username", "password" are the username/loging and "database-name" are +the parameters to login to your Drupal site's database. You can leave out +"-h localhost" if your MySQL server runs on the same site as your Apache. +However, replace 'localhost' in "-h localhost" if your MySQL server is on a +different machine. Step 2 ------ -In the "modules/" directory, create a subdirectory called "location/" which itself -contains a subdirectory called "supported/". +In the "modules/" directory, create a subdirectory called "location/" which +itself contains a subdirectory called "supported/". Download "location.inc" to "modules/location/" + Download "location.module" to "modules/location/" + Download "earth.inc" to "modules/location/" -Download "supported/location.us.inc" to "modules/location/supported/" (for support of US locations) + +Download "supported/location.us.inc" to "modules/location/supported/" (for +support of US locations) Step 3 ------ Enable the location module on your site. -Visit the settings page for location.module and enable features for U.S. (the only option as of now). -Finally, go to the default workflow settings for each node type and enable (or require location collection -on a field-by-field basis... it is encouraged that you enable postal codes and country fields for node types -for which you want to enable proximity searches. + +Visit the settings page for location.module and enable features for U.S. +(the only option as of now). + +Finally, go to the default workflow settings for each node type and enable +(or require) location collection on a field-by-field basis. It is encouraged +that you enable postal codes and country fields for node types for which you +want to enable proximity searches. Index: location.mysql =================================================================== RCS file: location.mysql diff -N location.mysql --- location.mysql 31 Mar 2006 22:49:00 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ --- $Id: location.mysql,v 1.7 2006/03/31 22:49:00 ankur Exp $ - -CREATE TABLE location ( - oid int(10) unsigned NOT NULL default '0', - type varchar(6) NOT NULL default '', - name varchar(255) default NULL, - street varchar(255) default NULL, - additional varchar(255) default NULL, - city varchar(255) default NULL, - province varchar(16) default NULL, - postal_code varchar(16) default NULL, - country char(2) default NULL, - latitude decimal(10,6) default NULL, - longitude decimal(10,6) default NULL, - source tinyint(4) default '0', - PRIMARY KEY (type,oid) -) TYPE=MyISAM /*!40100 DEFAULT CHARACTER SET utf8 */; - Index: location_upgrade.php =================================================================== RCS file: location_upgrade.php diff -N location_upgrade.php --- location_upgrade.php 8 Mar 2006 06:53:37 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,164 +0,0 @@ - '', - 1 => 'Mid 4.6 upgrade -- Merge location_user and location_node tables into location', - 2 => "Mid 4.6 upgrade II -- Rename column 'exact' to 'source'", - 3 => "Correction to zipcode data" - ); - -if (!ini_get("safe_mode")) { - set_time_limit(180); -} - -function location_upgrade_page_header($title) { - $output = "$title"; - $output .= << - -EOF; - $output .= ""; - $output .= "
\"Druplicon
"; - $output .= "

$title

"; - return $output; -} - -function location_upgrade_page_footer() { - return "
"; -} - -function location_upgrade_page() { - global $user, $sql_updates; - - if (isset($_POST['edit'])) { - $edit = $_POST['edit']; - } - if (isset($_POST['op'])) { - $op = $_POST['op']; - } - - switch ($op) { - case "Update": - $edit = $_POST['edit']; - - if (!isset($edit['location_update_version']) || $edit['location_update_version'] == 0) { - - //***************************** - $form = form_select('Select the update after your most recent update', 'location_update_version', '', $sql_updates, 'Please select what you think was the last update for this module. If you\'re not sure of what your last update was, it is better to select one that is older than what you think than to select one that is newer. Updates that are too old for you will fail while the newer ones will still execute.'); - $form .= form_submit('Update'); - $form = form($form); - print location_upgrade_page_header('location.module database update'); - print location_upgrade_info(); - print 'You need to select your last update first!'."
\n"; - print $form; - print location_upgrade_page_footer(); - break; - //***************************** - } - else { - // make sure we have updates to run. - print location_upgrade_page_header("location.module database update"); - $links[] = "main page"; - $links[] = "administration pages"; - print theme("item_list", $links); - - location_upgrade($edit['location_update_version']); - - print location_upgrade_page_footer(); - } - break; - default: - $form = form_select('Select the update after your most recent update.', 'location_update_version', '', array_merge(array('' => ''), $sql_updates), 'Please select what you think was the last update for this module. If you\'re not sure of what your last update was, it is better to select one that is older than what you think than to select one that is newer. Updates that are too old for you will fail while the newer ones will still execute.'); - $form .= form_submit('Update'); - $form = form($form); - print location_upgrade_page_header('location.module database update'); - print location_upgrade_info(); - print $form; - print location_upgrade_page_footer(); - break; - } -} - -function location_upgrade($update_n) { - global $base_url, $sql_updates; - - $update_keys = array_keys($sql_updates); - $number = $update_n; - while (in_array($number, $update_keys)) { - print "PERFORMING UPDATE:
\n"; - print '
  '. $sql_updates[$number] ."

\n
\n"; - $function = 'location_update_'. $number; - $function(); - $number++; - } -} - -function location_upgrade_info() { - $output = ""."\n"; - return $output; -} - -if (isset($_GET["op"])) { - // Access check: - if (($access_check == 0) || ($user->uid == 1)) { - location_upgrade_page(); - } - else { - print location_upgrade_page_header("Access denied"); - print "Access denied. You are not authorized to access to this page. Please log in as the user with user ID #1. If you cannot log-in, you will have to edit modules/location/location_upgrade.php to by-pass this access check; in that case, open modules/location/location_upgrade.php in a text editor and follow the instructions at the top."; - print location_upgrade_page_footer(); - } -} -else { - //location_upgrade_info(); - location_upgrade_page(); -} - -function location_update_1() { - db_query("ALTER TABLE {location_node} ADD type varchar(6) NOT NULL DEFAULT ''"); - db_query("UPDATE {location_node} SET type = 'node'"); - db_query("ALTER TABLE {location_node} DROP PRIMARY KEY"); - db_query("ALTER TABLE {location_node} CHANGE nid oid int(10) unsigned NOT NULL default '0'"); - db_query("ALTER TABLE {location_node} ADD PRIMARY KEY (type, oid)"); - - $result = db_query("SELECT * FROM {location_user}"); - while ($row = db_fetch_object($result)) { - db_query("INSERT INTO {location_node} (oid, name, street, additional, city, province, postal_code, country, latitude, longitude, exact, type) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%f', '%f', %d, 'user')", $row->uid, $row->name, $row->street, $row->additional, $row->city, $row->province, $row->postal_code, $row->country, $row->latitude, $row->longitude, $row->exact, $row->type); - } - db_query("RENAME TABLE {location_node} TO {location}"); -} - -function location_update_2() { - db_query("ALTER TABLE {location} CHANGE COLUMN exact source tinyint(4) default '0'"); -} - -function location_update_3() { - db_query("UPDATE {zipcodes} SET city = 'North Plainfield' WHERE country = 'us' AND zip = '07060'"); -} - -?>