ultrasphinx 1.9 → 1.11

data/test/config/ultrasphinx/test.base

@@ -34,7 +34,7 @@ searchd
 {  
   # What interface the search daemon should listen on and where to store its logs
   address = 0.0.0.0
-  port = 3312
+  port = 3313
   seamless_rotate = 1
   log = <%= path %>log/searchd.log
   query_log = <%= path %>log/query.log
@@ -52,7 +52,7 @@ client
   
   # How your application connects to the search daemon (not necessarily the same as above)
   server_host = localhost
-  server_port = 3312
+  server_port = 3313
 }
 
 # Individual SQL source options
@@ -79,6 +79,11 @@ index
   # Enable these if you need wildcard searching. They will slow down indexing significantly.
   #   min_infix_len = 1    
   #   enable_star = 1 
+
+  # # URL search options
+  # # add " @, /, :," before " a-z," in the charset_table and uncomment prefix_fields
+  # to seach URL and email addresses
+  # prefix_fields = url, domain
     
   charset_type = utf-8 # or sbcs (Single Byte Character Set)
   charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,

data/test/integration/app/app/controllers/addresses_controller.rb

@@ -2,7 +2,7 @@ class AddressesController < ApplicationController
   # GET /addresses
   # GET /addresses.xml
   def index
-    @addresses = Address.find(:all)
+    @addresses = Geo::Address.find(:all)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -13,7 +13,7 @@ class AddressesController < ApplicationController
   # GET /addresses/1
   # GET /addresses/1.xml
   def show
-    @address = Address.find(params[:id])
+    @address = Geo::Address.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -24,7 +24,7 @@ class AddressesController < ApplicationController
   # GET /addresses/new
   # GET /addresses/new.xml
   def new
-    @address = Address.new
+    @address = Geo::Address.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -34,18 +34,18 @@ class AddressesController < ApplicationController
 
   # GET /addresses/1/edit
   def edit
-    @address = Address.find(params[:id])
+    @address = Geo::Address.find(params[:id])
   end
 
   # POST /addresses
   # POST /addresses.xml
   def create
-    @address = Address.new(params[:address])
+    @address = Geo::Address.new(params[:address])
 
     respond_to do |format|
       if @address.save
         flash[:notice] = 'Address was successfully created.'
-        format.html { redirect_to(@address) }
+        format.html { redirect_to(address_path(@address)) }
         format.xml  { render :xml => @address, :status => :created, :location => @address }
       else
         format.html { render :action => "new" }
@@ -57,12 +57,12 @@ class AddressesController < ApplicationController
   # PUT /addresses/1
   # PUT /addresses/1.xml
   def update
-    @address = Address.find(params[:id])
+    @address = Geo::Address.find(params[:id])
 
     respond_to do |format|
       if @address.update_attributes(params[:address])
         flash[:notice] = 'Address was successfully updated.'
-        format.html { redirect_to(@address) }
+        format.html { redirect_to(address_path(@address)) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
@@ -74,7 +74,7 @@ class AddressesController < ApplicationController
   # DELETE /addresses/1
   # DELETE /addresses/1.xml
   def destroy
-    @address = Address.find(params[:id])
+    @address = Geo::Address.find(params[:id])
     @address.destroy
 
     respond_to do |format|

data/test/integration/app/app/controllers/states_controller.rb

@@ -2,7 +2,7 @@ class StatesController < ApplicationController
   # GET /states
   # GET /states.xml
   def index
-    @states = State.find(:all)
+    @states = Geo::State.find(:all)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -13,7 +13,7 @@ class StatesController < ApplicationController
   # GET /states/1
   # GET /states/1.xml
   def show
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -24,7 +24,7 @@ class StatesController < ApplicationController
   # GET /states/new
   # GET /states/new.xml
   def new
-    @state = State.new
+    @state = Geo::State.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -34,18 +34,18 @@ class StatesController < ApplicationController
 
   # GET /states/1/edit
   def edit
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
   end
 
   # POST /states
   # POST /states.xml
   def create
-    @state = State.new(params[:state])
+    @state = Geo::State.new(params[:state])
 
     respond_to do |format|
       if @state.save
         flash[:notice] = 'State was successfully created.'
-        format.html { redirect_to(@state) }
+        format.html { redirect_to(state_path(@state)) }
         format.xml  { render :xml => @state, :status => :created, :location => @state }
       else
         format.html { render :action => "new" }
@@ -57,12 +57,12 @@ class StatesController < ApplicationController
   # PUT /states/1
   # PUT /states/1.xml
   def update
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
 
     respond_to do |format|
       if @state.update_attributes(params[:state])
         flash[:notice] = 'State was successfully updated.'
-        format.html { redirect_to(@state) }
+        format.html { redirect_to(state_path(@state)) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
@@ -74,7 +74,7 @@ class StatesController < ApplicationController
   # DELETE /states/1
   # DELETE /states/1.xml
   def destroy
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
     @state.destroy
 
     respond_to do |format|

data/test/integration/app/app/models/category.rb

@@ -0,0 +1,5 @@
+class Category < ActiveRecord::Base
+
+    has_and_belongs_to_many :sellers
+    
+end

data/test/integration/app/app/models/geo/address.rb

@@ -2,7 +2,7 @@ class Geo::Address < ActiveRecord::Base
   belongs_to :user
   belongs_to :state, :class_name => 'Geo::State'
   
-  is_indexed 'fields' => ['name'],
+  is_indexed 'fields' => ['name', {:field => 'lat', :function_sql => "RADIANS(?)"}, {:field => 'lng', :function_sql => "RADIANS(?)"}],
     'concatenate' => [{'fields' => ['line_1', 'line_2', 'city', 'province_region', 'zip_postal_code'], 'as' => 'content'}],
     'include' => [{'association_name' => 'state', 'field' => 'name', 'as' => 'state'}],
     'delta' => true

data/test/integration/app/app/models/seller.rb

@@ -3,11 +3,11 @@ class Seller < ActiveRecord::Base
   delegate :address, :to => :user
   
   is_indexed :fields => [
-    {:field => 'company_name', :facet => true},
+    {:field => :company_name, :facet => true, :sortable => true},
     {:field => 'mission_statement', :sortable => true},
     'created_at', 
-    'capitalization', 
-    'user_id'
+    :capitalization, 
+    :user_id
   ],
     :delta => true
   

data/test/integration/app/app/views/addresses/edit.html.erb

@@ -2,11 +2,11 @@
 
 <%= error_messages_for :address %>
 
-<% form_for(@address) do |f| %>
+<% form_for @address, :url => address_path(@address) do |f| %>
   <p>
     <%= f.submit "Update" %>
   </p>
 <% end %>
 
-<%= link_to 'Show', @address %> |
+<%= link_to 'Show', address_path(@address) %> |
 <%= link_to 'Back', addresses_path %>

data/test/integration/app/app/views/addresses/index.html.erb

@@ -6,9 +6,9 @@
 
 <% for address in @addresses %>
   <tr>
-    <td><%= link_to 'Show', address %></td>
+    <td><%= link_to 'Show', address_path(address) %></td>
     <td><%= link_to 'Edit', edit_address_path(address) %></td>
-    <td><%= link_to 'Destroy', address, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', address_path(address), :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/test/integration/app/app/views/addresses/new.html.erb

@@ -2,7 +2,7 @@
 
 <%= error_messages_for :address %>
 
-<% form_for(@address) do |f| %>
+<% form_for @address, :url => address_path(@address) do |f| %>
   <p>
     <%= f.submit "Create" %>
   </p>

data/test/integration/app/app/views/states/edit.html.erb

@@ -2,11 +2,11 @@
 
 <%= error_messages_for :state %>
 
-<% form_for(@state) do |f| %>
+<% form_for @state, :url => state_path(@state) do |f| %>
   <p>
     <%= f.submit "Update" %>
   </p>
 <% end %>
 
-<%= link_to 'Show', @state %> |
+<%= link_to 'Show', state_path(@state) %> |
 <%= link_to 'Back', states_path %>

data/test/integration/app/app/views/states/index.html.erb

@@ -7,9 +7,9 @@
 <% for state in @states %>
   <tr>
     <td><%= state.name %></td>
-    <td><%= link_to 'Show', state %></td>
+    <td><%= link_to 'Show', state_path(state) %></td>
     <td><%= link_to 'Edit', edit_state_path(state) %></td>
-    <td><%= link_to 'Destroy', state, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', state_path(state), :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/test/integration/app/app/views/states/new.html.erb

@@ -2,7 +2,7 @@
 
 <%= error_messages_for :state %>
 
-<% form_for(@state) do |f| %>
+<% form_for @state, :url => state_path(@state) do |f| %>
   <p>
     <%= f.submit "Create" %>
   </p>

data/test/integration/app/app/views/users/index.html.erb

@@ -7,9 +7,9 @@
 <% for user in @users %>
   <tr>
 	<td><%= h(user.login) %></td>
-	<td><%= h(user.address.line_1) %></td>
-	<td><%= h(user.address.city) %></td>
-	<td><%= h(user.address.state.name) %></td>
+	<td><%= h(user.address.line_1) if user.address %></td>
+	<td><%= h(user.address.city) if user.address %></td>
+	<td><%= h(user.address.state.name) if user.address %></td>
     <td><%= link_to 'Show', user %></td>
     <td><%= link_to 'Edit', edit_user_path(user) %></td>
     <td><%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>

data/test/integration/app/config/environment.rb

@@ -11,5 +11,6 @@ Rails::Initializer.run do |config|
 end
 
 Ultrasphinx::Search.client_options["finder_methods"].unshift("custom_find")
+Ultrasphinx::Search.query_defaults["location"]["units"] = "degrees"
 
 # Dependencies.log_activity = true

data/test/integration/app/config/ultrasphinx/default.base

@@ -36,7 +36,7 @@ searchd
   
   # What interface the search daemon should listen on 
   address = 0.0.0.0
-  port = 3312
+  port = 3313
   seamless_rotate = 1
   
   # Where to to store the logs
@@ -55,7 +55,7 @@ client
   dictionary_name = <%= dictionary = 'ap' %>
   # How your application connects to the search daemon (not necessarily the same as above)
   server_host = localhost
-  server_port = 3312
+  server_port = 3313
 }
 
 source

data/test/integration/app/config/ultrasphinx/development.conf.canonical

@@ -1,5 +1,5 @@
 
-# Auto-generated at Sat Mar 08 03:07:27 -0500 2008.
+# Auto-generated at Mon Mar 31 02:37:26 -0400 2008.
 # Hand modifications will be overwritten.
 # /Users/eweaver/Desktop/projects/ub/vendor/plugins/ultrasphinx/test/integration/app/config/ultrasphinx/default.base
 indexer {
@@ -10,7 +10,7 @@ searchd {
   read_timeout = 5
   max_children = 300
   log = /tmp/sphinx/searchd.log
-  port = 3312
+  port = 3313
   max_matches = 100000
   query_log = /tmp/sphinx/query.log
   seamless_rotate = 1
@@ -26,25 +26,28 @@ source geo__states_main
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM states 
-sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id
+sql_query = SELECT (states.id * 5 + 0) AS id, CAST(GROUP_CONCAT(DISTINCT addresses.name  SEPARATOR ' ') AS CHAR) AS address_name, 0 AS capitalization, 'Geo::State' AS class, 0 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, '' AS name, '' AS state, 0 AS user_id FROM states LEFT OUTER JOIN addresses AS addresses ON states.id = addresses.state_id WHERE states.id >= $start AND states.id <= $end GROUP BY states.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM states WHERE states.id = (($id - 0) / 5)
 }
@@ -58,25 +61,28 @@ source sellers_main
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers 
-sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, sellers.company_name AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, sellers.mission_statement AS mission_statement, sellers.mission_statement AS mission_statement_sortable, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end GROUP BY sellers.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
 }
@@ -90,25 +96,28 @@ source geo__addresses_main
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses 
-sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, RADIANS(addresses.lat) AS lat, RADIANS(addresses.lng) AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
 }
@@ -122,25 +131,28 @@ source users_main
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM users 
-sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, 0 AS lat, 0 AS lng, users.login AS login, '' AS mission_statement, '' AS mission_statement_sortable, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') GROUP BY users.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
 }
@@ -154,25 +166,28 @@ source geo__countries_main
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM countries 
-sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id
+sql_query = SELECT (countries.id * 5 + 4) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Country' AS class, 4 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, 18000 AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, countries.name AS name, '' AS state, 0 AS user_id FROM countries WHERE countries.id >= $start AND countries.id <= $end GROUP BY countries.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM countries WHERE countries.id = (($id - 4) / 5)
 }
@@ -209,25 +224,28 @@ source sellers_delta
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM sellers WHERE sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND)
-sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, '' AS login, sellers.mission_statement AS mission_statement, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end AND sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY sellers.id
+sql_query = SELECT (sellers.id * 5 + 1) AS id, '' AS address_name, sellers.capitalization AS capitalization, 'Seller' AS class, 1 AS class_id, '' AS company, 0 AS company_facet, sellers.company_name AS company_name, CAST(CRC32(sellers.company_name) AS unsigned) AS company_name_facet, sellers.company_name AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, '' AS content, UNIX_TIMESTAMP(sellers.created_at) AS created_at, 0 AS deleted, '' AS email, 0 AS lat, 0 AS lng, '' AS login, sellers.mission_statement AS mission_statement, sellers.mission_statement AS mission_statement_sortable, '' AS name, '' AS state, sellers.user_id AS user_id FROM sellers WHERE sellers.id >= $start AND sellers.id <= $end AND sellers.updated_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY sellers.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM sellers WHERE sellers.id = (($id - 1) / 5)
 }
@@ -241,25 +259,28 @@ source geo__addresses_delta
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM addresses 
-sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, '' AS login, '' AS mission_statement, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
+sql_query = SELECT (addresses.id * 5 + 2) AS id, '' AS address_name, 0 AS capitalization, 'Geo::Address' AS class, 2 AS class_id, '' AS company, 0 AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, '' AS company_two, 0 AS company_two_facet, CONCAT_WS(' ', addresses.line_1, addresses.line_2, addresses.city, addresses.province_region, addresses.zip_postal_code) AS content, 18000 AS created_at, 0 AS deleted, '' AS email, RADIANS(addresses.lat) AS lat, RADIANS(addresses.lng) AS lng, '' AS login, '' AS mission_statement, '' AS mission_statement_sortable, addresses.name AS name, state.name AS state, 0 AS user_id FROM addresses LEFT OUTER JOIN states AS state ON state.id = addresses.state_id WHERE addresses.id >= $start AND addresses.id <= $end GROUP BY addresses.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM addresses WHERE addresses.id = (($id - 2) / 5)
 }
@@ -273,25 +294,28 @@ source users_delta
   sql_query_post = 
   sql_ranged_throttle = 0
 
-type = mysql
-sql_query_pre = SET SESSION group_concat_max_len = 65535
-sql_query_pre = SET NAMES utf8
-  
+      type = mysql
+      sql_query_pre = SET SESSION group_concat_max_len = 65535
+      sql_query_pre = SET NAMES utf8
+    
 sql_db = ultrasphinx_development
 sql_host = localhost
 sql_pass = 
 sql_user = root
 sql_query_range = SELECT MIN(id) , MAX(id) FROM users WHERE users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND)
-sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, users.login AS login, '' AS mission_statement, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') AND users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY users.id
+sql_query = SELECT (users.id * 5 + 3) AS id, '' AS address_name, 0 AS capitalization, 'User' AS class, 3 AS class_id, specific_seller.company_name AS company, CAST(CRC32(specific_seller.company_name) AS unsigned) AS company_facet, '' AS company_name, 0 AS company_name_facet, '' AS company_name_sortable, REPLACE(sellers_two.company_name, '6', ' replacement ') AS company_two, CAST(CRC32(REPLACE(sellers_two.company_name, '6', ' replacement ')) AS unsigned) AS company_two_facet, '' AS content, 18000 AS created_at, users.deleted AS deleted, users.email AS email, 0 AS lat, 0 AS lng, users.login AS login, '' AS mission_statement, '' AS mission_statement_sortable, '' AS name, '' AS state, 0 AS user_id FROM users LEFT OUTER JOIN sellers AS specific_seller ON users.id = specific_seller.user_id LEFT OUTER JOIN sellers AS sellers_two ON users.id = sellers_two.user_id WHERE users.id >= $start AND users.id <= $end AND (deleted = '0') AND users.created_at > DATE_SUB(NOW(), INTERVAL 88200 SECOND) GROUP BY users.id
 
 sql_attr_float = capitalization
 sql_attr_uint = class_id
 sql_attr_uint = company_facet
 sql_attr_uint = company_name_facet
+sql_attr_str2ordinal = company_name_sortable
 sql_attr_uint = company_two_facet
 sql_attr_timestamp = created_at
 sql_attr_bool = deleted
-sql_attr_str2ordinal = mission_statement
+sql_attr_float = lat
+sql_attr_float = lng
+sql_attr_str2ordinal = mission_statement_sortable
 sql_attr_uint = user_id
 sql_query_info = SELECT * FROM users WHERE users.id = (($id - 3) / 5)
 }