Index: geonames.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geonames/geonames.install,v
retrieving revision 1.1.2.2.2.2
diff -u -p -r1.1.2.2.2.2 geonames.install
--- geonames.install	16 Apr 2009 07:20:04 -0000	1.1.2.2.2.2
+++ geonames.install	4 May 2009 17:31:51 -0000
@@ -146,6 +146,8 @@ function geonames_schema() {
     'primary key' => array('class,code'),
   );
 
+  $schema['cache_geonames'] = drupal_get_schema_unprocessed('system', 'cache');
+
   return $schema;
 }
 
@@ -161,4 +163,14 @@ function geonames_install() {
   */
 function geonames_uninstall() {
   drupal_uninstall_schema('geonames');
-}
\ No newline at end of file
+}
+
+/**
+ * Implementation of hook_update_N()
+ */
+function geonames_update_6101(&$sandbox = NULL) {
+  $ret = array();
+  drupal_uninstall_schema('geonames');
+  drupal_install_schema('geonames');
+  return $ret;
+}
Index: geonames.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geonames/geonames.module,v
retrieving revision 1.1.4.1.2.3
diff -u -p -r1.1.4.1.2.3 geonames.module
--- geonames.module	16 Apr 2009 07:20:04 -0000	1.1.4.1.2.3
+++ geonames.module	4 May 2009 17:31:52 -0000
@@ -33,7 +33,7 @@
 DEFINE('GEONAMES_COMMERCIAL',      variable_get('geonames_commercial_active', FALSE));
 DEFINE('GEONAMES_FREE_SERVER_URL', 'http://ws.geonames.org');
 DEFINE('GEONAMES_CACHE',           variable_get('geonames_cache', TRUE));
-DEFINE('GEONAMES_CACHE_TABLE',     variable_get('geonames_cache_table', 'cache'));
+DEFINE('GEONAMES_CACHE_TABLE',     variable_get('geonames_cache_table', 'cache_geonames'));
 DEFINE('GEONAMES_CACHE_LIMIT',     86400 * variable_get('geonames_cache_limit', 90));
 
 require("geonames_config.inc");
@@ -132,7 +132,7 @@ function geonames_countries($param = NUL
     $parameter = $param[$type];
   }
 
-  if (($cache = cache_get('geonames_countries'. $type)) && !empty($cache->data) && !$reset) {
+  if (($cache = cache_get('geonames_countries'. $type, GEONAMES_CACHE_TABLE)) && !empty($cache->data) && !$reset) {
     $countries = $cache->data;
   }
   else {
@@ -1012,23 +1012,6 @@ function geonames_admin_settings() {
     '#default_value' => variable_get('geonames_reveal_cache', TRUE),
     '#options' => array(1 => 'Yes', 0 => 'No'),
   );
-  $form['cache']['advanced'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Database Configuration (Advanced)'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['cache']['advanced']['leadingtext'] = array(
-    '#prefix' => '<div>',
-    '#value'  => t("The GeoNames cache grows pretty rapidly, and a large cache table may slow down other cache requests. The overall performance of your site may be improved by setting up a separate table for caching of GeoNames requests. Create the table manually (structure equivalent to Drupal's cache table), prior to changing the table name here."),
-       '#suffix' => '</div>'
-  );
-  $form['cache']['advanced']['geonames_cache_table'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Database Cache Table'),
-    '#description' => t("Defaults to drupal's") ." <i>cache</i> ". t("table."),
-    '#default_value' => variable_get('geonames_cache_table', 'cache'),
-  );
 
   $commercial_collapsed = (variable_get('geonames_commercial_active', FALSE) == TRUE) ? FALSE : TRUE;