Index: sites/all/modules/location_facets/location_facets.inc =================================================================== --- sites/all/modules/location_facets/location_facets.inc (revision 32) +++ sites/all/modules/location_facets/location_facets.inc (working copy) @@ -38,11 +38,16 @@ function get_text() { if ($category = $this->get_active_category()) { $location = $category->country; - if (isset($category->city)) { - $location .= ', ' . $category->city; + if ((strstr(arg(2),',')) && isset($category->city)) { + $location .= ', ' . $category->province . ', ' . $category->city; + return '"' . faceted_search_quoted_query_escape($location) . '"'; } - - return '"' . faceted_search_quoted_query_escape($location) . '"'; + else { + if (isset($category->province)) { + $location .= ', ' . $category->province; + } + return '"' . faceted_search_quoted_query_escape($location) . '"'; + } } return ''; } @@ -81,6 +86,9 @@ if ($query->has_field('location_city')) { $query->add_orderby('location_city', 'ASC'); } + if ($query->has_field('location_province')) { + $query->add_orderby('location_province', 'ASC'); + } } /** @@ -115,7 +123,8 @@ //var_dump($result); $country = $result->location_country; $city = isset($result->location_city) ? $result->location_city: NULL; - $categories[] = new location_facet_category($country, $city, $result->count); + $province = isset($result->location_province) ? $result->location_province: NULL; + $categories[] = new location_facet_category($country, $province, $city, $result->count); } return $categories; @@ -125,12 +134,14 @@ class location_facet_category extends faceted_search_category { public $country; + public $province; public $city; - function __construct($country, $city = NULL, $count = NULL) { + function __construct($country, $province = NULL, $city = NULL, $count = NULL) { parent::faceted_search_category($count); $this->country = $country; $this->city = $city; + $this->province = $province; } /** @@ -146,6 +157,9 @@ if (isset($this->city)) { return check_plain($this->city); } + if (isset($this->province)) { + return check_plain($this->province); + } else { return check_plain(location_country_name($this->country)); } @@ -161,24 +175,48 @@ $query->add_table('location_instance', 'vid', 'n', 'vid'); $query->add_table('location', 'lid', 'location_instance', 'lid'); $query->add_where("location.country = '%s'", $this->country); if (isset($this->city)) { $query->add_where("location.city = '%s'", $this->city); } + if (isset($this->province)) { + $query->add_where("location.province = '%s'", $this->province); + $query->add_where("location.city != ''"); + } } function build_subcategories_query(&$query) { - if (isset($this->city)) { + if (strstr(arg(2),',')) { + if (isset($this->city)) { return FALSE; - } + } + $query->add_table('location_instance', 'vid', 'n', 'vid'); + $query->add_table('location', 'lid', 'location_instance', 'lid'); + $query->add_where("location.country='%s'", $this->country); + $query->add_where("location.province='%s'", $this->province); + $query->add_field('location', 'country'); + $query->add_field('location', 'province'); - $query->add_table('location_instance', 'vid', 'n', 'vid'); - $query->add_table('location', 'lid', 'location_instance', 'lid'); - $query->add_where("location.country='%s'", $this->country); - $query->add_field('location', 'country'); + // $alias = $query->add_field('location', 'city'); + $alias = $query->add_field('location', 'city'); + $query->add_groupby($alias); + return TRUE; + } + else { + if (isset($this->province)) { + return FALSE; + } + $query->add_table('location_instance', 'vid', 'n', 'vid'); + $query->add_table('location', 'lid', 'location_instance', 'lid'); + $query->add_where("location.country='%s'", $this->country); + $query->add_field('location', 'country'); - $alias = $query->add_field('location', 'city'); - $query->add_groupby($alias); - return TRUE; + // $alias = $query->add_field('location', 'city'); + $alias = $query->add_field('location', 'province'); + $query->add_groupby($alias); + return TRUE; + } } } \ No newline at end of file