? .DS_Store
? location_cck_347030.patch
? contrib/.DS_Store
? contrib/location_cck/.DS_Store
Index: contrib/location_cck/location_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/contrib/location_cck/location_cck.module,v
retrieving revision 1.5.2.5
diff -u -p -r1.5.2.5 location_cck.module
--- contrib/location_cck/location_cck.module	8 Jan 2009 21:17:42 -0000	1.5.2.5
+++ contrib/location_cck/location_cck.module	16 Jan 2009 20:39:22 -0000
@@ -63,9 +63,9 @@ function location_cck_field_settings($op
           'not null' => FALSE,
         ),
       );
-
+/*
     case 'arguments':
-/*      $arguments = content_views_field_arguments($field);
+      $arguments = content_views_field_arguments($field);
       $alias = "content: $field[field_name]";
       $argument = array(
         'handler' => 'text_views_argument_handler',
@@ -73,10 +73,9 @@ function location_cck_field_settings($op
         'help' => t('Set the option to the number of initial characters to filter by. Leave empty for full term; use 1 for an A/B/C style glossary.'),
       );
       $arguments[$alias] = array_merge($arguments[$alias], $argument);
-      return $arguments;*/return;
+      return $arguments;
 
     case 'filters':
-      /*
       $allowed_values = text_allowed_values($field);
        if (count($allowed_values)) {
          return array(
@@ -95,22 +94,19 @@ function location_cck_field_settings($op
             'handler' => 'views_handler_filter_like',
           ),
         );
-      }*/
       break;
-
+*/
     case 'views data':
-      // We want to for the most part use the CCK stuff, but we also want to
-      // patch in a relationship so location's views support can target
-      // cck fields directly.
-      $table = content_views_tablename($field);
-      $db_info = content_database_info($field);
-      $field_alias = $db_info['columns']['lid']['column'];
       $data = content_views_field_views_data($field);
-      $data[$table][$field_alias]['relationship'] = array(
+      $table_alias = content_views_tablename($field);
+
+      // Add a relation to the taxonomy term table.
+      $data[$table_alias][$field['field_name'] .'_lid']['relationship'] = array(
         'base' => 'location',
+        'handler' => 'content_handler_relationship',
         'field' => 'lid',
-        'handler' => 'views_handler_relationship',
-        'label' => t('Location'), // @@@ Some sort of better name?
+        'label' => t('@field-title location', array('@field-title' => t($field['widget']['label']))),
+        'content_field_name' => $field['field_name'],
       );
       return $data;
   }