more module updates

sites/all/modules/contrib/fields/addressfield/views/addressfield.views.inc

@@ -6,8 +6,9 @@
 function addressfield_field_views_data($field) {
   $data = field_views_field_default_views_data($field);
 
-  // Add a handler for countries.
-  foreach ($field['storage']['details']['sql'] as $type => $tables) {
+  // Add a filter handler for countries.
+  $key = key($field['storage']['details']);
+  foreach ($field['storage']['details'][$key] as $type => $tables) {
     foreach ($tables as $table_name => $columns) {
       if (!isset($columns['country'])) {
         continue;
@@ -22,5 +23,73 @@ function addressfield_field_views_data($field) {
     }
   }
 
+  // Only expose these components as Views field handlers.
+  $implemented = array(
+    'country' => 'addressfield_views_handler_field_country',
+    'administrative_area' => 'views_handler_field',
+    'sub_administrative_area' => 'views_handler_field',
+    'dependent_locality' => 'views_handler_field',
+    'locality' => 'views_handler_field',
+    'postal_code' => 'views_handler_field',
+    'thoroughfare' => 'views_handler_field',
+    'premise' => 'views_handler_field',
+    'sub_premise' => 'views_handler_field',
+    'organisation_name' => 'views_handler_field',
+    'name_line' => 'views_handler_field',
+    'first_name' => 'views_handler_field',
+    'last_name' => 'views_handler_field',
+    'data' => 'views_handler_field_serialized',
+  );
+
+  // Get the translated field information.
+  $properties = addressfield_data_property_info();
+
+  // Iterate over addressfield defined tables.
+  foreach ($data as &$table) {
+    // Make sure the parent Views field (addressfield) is defined.
+    if (isset($table[$field['field_name']]['field'])) {
+      // Use the parent field definition as a template for component columns.
+      $field_def = $table[$field['field_name']]['field'];
+
+      // Remove 'additional fields' from the field definition. We don't
+      // necessarily want all our sibling columns.
+      unset($field_def['additional fields']);
+
+      // Define the valid columns.
+      $valid_columns = array();
+      foreach ($implemented as $implement => $handler) {
+        $column_name = $field['field_name'] . '_' . $implement;
+        $valid_columns[$column_name] = $handler;
+      }
+
+      // Iterate over the addressfield components.
+      foreach ($table as $column_name => &$column) {
+        if (empty($column['field']) && isset($valid_columns[$column_name])) {
+          // Assign the default component definition.
+          $column['field'] = $field_def;
+          $column['field']['real field'] = $column_name;
+          $column['field']['handler'] = $valid_columns[$column_name];
+
+          // Assign human-friendly field labels for addressfield components.
+          $field_labels = field_views_field_label($field['field_name']);
+          $field_label = array_shift($field_labels);
+          $property = str_replace($field_def['field_name'] . '_', '', $column_name);
+
+          if (!empty($properties[$property])) {
+            $property_label = $properties[$property]['label'];
+
+            $title = t('@field-label - @property-label', array(
+              '@field-label' => $field_label,
+              '@property-label' => $property_label,
+            ));
+
+            $column['title'] = $title;
+            $column['title short'] = $title;
+          }
+        }
+      }
+    }
+  }
+
   return $data;
 }

sites/all/modules/contrib/fields/addressfield/views/addressfield_views_handler_field_country.inc

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Defines a field handler that can display the country name instead of the two
+ * character country code for an address field country value.
+ */
+class addressfield_views_handler_field_country extends views_handler_field {
+
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['display_name'] = array('default' => TRUE);
+    return $options;
+  }
+
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+
+    $form['display_name'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Display the localized country name instead of the two character country code'),
+      '#default_value' => $this->options['display_name'],
+    );
+  }
+
+  function get_value($values, $field = NULL) {
+    $value = parent::get_value($values, $field);
+
+    // If we have a value for the field, look for the country name in the
+    // Address Field options list array if specified.
+    if (!empty($value) && !empty($this->options['display_name'])) {
+      $countries = _addressfield_country_options_list();
+
+      if (!empty($countries[$value])) {
+        $value = $countries[$value];
+      }
+    }
+
+    return $value;
+  }
+}