Index: schema.xml
===================================================================
--- schema.xml	(revision 149)
+++ schema.xml	(working copy)
@@ -315,7 +315,13 @@
         or to add multiple fields to the same field for easier/faster searching.  -->
    <copyField source="title" dest="spell"/>
    <copyField source="body" dest="spell"/>
-
+    
+    <!-- local lucene field types -->
+    <field name="lat" type="sdouble" indexed="true" stored="true"/><!-- must match the latField in solrconfig.xml -->
+    <field name="lng" type="sdouble" indexed="true" stored="true"/><!-- must match the lngField in solrconfig.xml -->
+    <field name="geo_distance" type="sdouble"/> <!-- Optional but used for distributed searching -->
+    <dynamicField name="_local*" type="sdouble" indexed="true" stored="true"/><!-- used internally by localsolr -->
+    
    <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
         will be used if the name matches any of the patterns.
         RESTRICTION: the glob-like pattern in the name attribute must have
Index: contrib/apachesolr_local/apachesolr_local.module
===================================================================
--- contrib/apachesolr_local/apachesolr_local.module	(revision 0)
+++ contrib/apachesolr_local/apachesolr_local.module	(revision 150)
@@ -0,0 +1,223 @@
+<?php
+
+function apachesolr_local_menu() {
+  $items = array();
+  
+  return $items;
+}
+/**
+ * Implementation of hook_search
+ */
+function apachesolr_local_search($op = 'search', $keys = null) {
+  switch ($op) {
+    case 'name':
+      return t('Local Search');
+    break;
+    case 'reset':
+      apachesolr_clear_last_index('apachesolr_search');
+    break;
+    case 'search':
+      if ($near = search_query_extract($keys, 'near')){
+        $search_keys = str_replace('near:'.$near, '', $keys);
+        $near = str_replace('::', ' ', $near);
+        $gps = apachesolr_local_gps_lookup($near);
+      }
+      return apachesolr_local_do_search($search_keys, $gps);
+    break;
+    case 'status':
+      return apachesolr_index_status('apachesolr_search');
+    break;
+  }
+}
+
+/**
+ * function apachesolr_local_gps_lookup() performs the geoencoding lookup based
+ * on the google maps api.
+ * TODO: Add setings for user key, make this extendable to other geoencoding services
+ */
+function apachesolr_local_gps_lookup($location) {
+  $url = 'http://maps.google.com/maps/geo?output=xml&oe=utf8&sensor=false&key=**insert your api key**&q=';
+  $location = urlencode($location);
+  $string = file_get_contents($url . $location);
+  $results = simplexml_load_string($string);
+  if ((string)$results->Response->Status->code == '200') {
+    list($lng, $lat) = explode(',', (string) $results->Response->Placemark->Point->coordinates);
+  }
+  return array('lat' => $lat, 'lng' => $lng, 'data' => $results->Response);
+}
+
+/**
+ * Implementation of hook_form_alter()
+ */
+function apachesolr_local_form_alter(&$form, $form_state, $form_id) {
+  if ($form_id == 'search_form' && $form['module']['#value'] == 'apachesolr_local') {
+    // Remove the ugly near: from the search box
+    $keys = $form['basic']['inline']['keys']['#default_value'];
+    $near = search_query_extract($keys, 'near');
+    $keys = str_replace('near:'.$near, '', $keys);
+    $keys = $form['basic']['inline']['keys']['#default_value'] = $keys;
+    //Perform some basic styling
+    $form['basic']['#title'] = '';
+    $form['basic']['inline']['keys']['#title'] = t("Keywords");
+    $form['basic']['inline']['keys']['#weight'] = -5;
+    $form['basic']['inline']['processed_keys']['#weight'] = -4;
+    $form['basic']['inline']['submit']['#weight'] = -2;
+    //Add a "near" search field
+    $form['basic']['inline']['near'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Near'),
+      '#weight' => -3,
+      '#size' => 20,
+      '#default_value' => str_replace('::', ' ', $near),
+    );
+    $form['#validate'][] = 'apachesolr_local_search_validate';
+  }
+}
+
+function apachesolr_local_search_validate($form, &$form_state) {
+// Initialise using any existing basic search keywords.
+  $keys = $form_state['values']['processed_keys'];
+
+  // Insert the near query into the key, replacing spaces with a :: delimiter
+  // because locations almost always have spaces.  TODO: find a better way to do this
+  if (isset($form_state['values']['near'])) {
+    $keys = search_query_insert($keys, 'near', str_replace(' ', '::', $form_state['values']['near']));
+  }
+  if (!empty($keys)) {
+    form_set_value($form['basic']['inline']['processed_keys'], trim($keys), $form_state);
+  }
+}
+
+
+
+function apachesolr_local_do_search($keys = '', $gps = NULL) {
+    // This is the object that knows about the query coming from the user.
+  $query = apachesolr_current_query($keys);
+  if (is_null($query)) {
+    throw new Exception(t('Could not construct a Solr query in function apachesolr_search_search()'));
+  }
+
+  $results = array();
+
+  $params = array(
+    'fl' => 'id,nid,title,comment_count,type,created,changed,score,url,uid,name,lat,lng,geo_distance,body',
+    'rows' => variable_get('apachesolr_rows', 10),
+    'facet' => 'true',
+    'facet.mincount' => 1,
+    'facet.sort' => 'true'
+  );
+  if ($gps) {
+    $params['qt'] = 'geo';
+    $params['lat'] = $gps['lat'];
+    $params['long'] = $gps['lng'];
+    $params['radius'] = 40;
+    $params['sort'] = 'geo_distance asc';
+  }
+
+  $facet_query_limits = variable_get('apachesolr_facet_query_limits', array());
+  // Request all enabled facets.
+  foreach (apachesolr_get_enabled_facets() as $module => $module_facets) {
+    foreach($module_facets as $delta => $facet_field) {
+      $params['facet.field'][] = $facet_field;
+      // Facet limits
+      if (isset($facet_query_limits[$module][$delta])) {
+        $params['f.' . $facet_field . '.facet.limit'] = $facet_query_limits[$module][$delta];
+      }
+    }
+  }
+  if (!empty($params['facet.field'])) {
+    // Add a default limit for fields where no limit was set.
+    $params['facet.limit'] = variable_get('apachesolr_facet_query_limit_default', 20);
+  }
+
+  $page = isset($_GET['page']) ? $_GET['page'] : 0;
+  $params['start'] = $page * $params['rows'];
+  // This is the object that does the communication with the solr server.
+  $solr = apachesolr_get_solr();
+
+  // Note - we have query fields set in solrconfig.xml, which will operate when
+  // none are set.
+  $qf = variable_get('apachesolr_search_query_fields', array());
+  $fields = $solr->getFields();
+  if ($qf && $fields) {
+    foreach ($fields as $field_name => $field) {
+      if (!empty($qf[$field_name])) {
+        if ($field_name == 'body') {
+          // Body is the only normed field.
+          $qf[$field_name] *= 40.0;
+        }
+        $params['qf'][] = $field_name . '^'. $qf[$field_name];
+      }
+    }
+  }
+
+  $data = $solr->getLuke();
+  if (isset($data->index->numDocs)) {
+    $total = $data->index->numDocs;
+  }
+  else {
+    $total = db_result(db_query("SELECT COUNT(nid) FROM {node}"));
+  }
+  // This hook allows modules to modify the query and params objects.
+  apachesolr_modify_query($query, $params, 'apachesolr_search');
+  if (!$query) {
+    return array();
+  }
+
+  $response = $solr->search($query->get_query_basic(), $params['start'], $params['rows'], $params);
+  // The response is cached so that it is accessible to the blocks and anything
+  // else that needs it beyond the initial search.
+  $total = $response->response->numFound;
+  apachesolr_static_response_cache($response);
+  apachesolr_has_searched(TRUE);
+  pager_query("SELECT %d", $params['rows'], 0, NULL, $total);
+  if ($total > 0) {
+    foreach ($response->response->docs as $doc) {
+      $extra = array();
+      $doc->created = strtotime($doc->created);
+      $doc->changed = strtotime($doc->changed);
+      $extra += node_invoke_nodeapi($doc, 'search result');
+      $extra['score'] = $doc->score;
+      $results[] = array(
+        'link' => url('node/' . $doc->nid),
+        'type' => apachesolr_search_get_type($doc->type),
+        'title' => $doc->title,
+        'user' => theme('username', $doc),
+        'date' => $doc->created,
+        'node' => $doc,
+        'extra' => $extra,
+        'score' => $doc->score,
+        'snippet' => $doc->body,
+      );
+    }
+
+    // Hook to allow modifications of the retrieved results
+    foreach (module_implements('apachesolr_process_results') as $module) {
+      $function = $module .'_apachesolr_process_results';
+      call_user_func_array($function, array(&$results));
+    }
+  }
+  // Add search terms and filters onto the breadcrumb.
+  drupal_set_breadcrumb(array_merge(menu_get_active_breadcrumb(), $query->get_breadcrumb($_GET['q'])));
+  return $results;
+}
+
+/**
+ * Impelementation of hook_apachesolr_update_index()
+ * adds the location fields to the solr index.
+ */
+function apachesolr_local_apachesolr_update_index(&$doc, $node) {
+  if (!empty($node->location['lid'])) {
+    $doc->sm_name = $node->location['name'];
+    $doc->sm_street = $node->location['street'];
+    $doc->sm_city = $node->location['city'];
+    $doc->sm_province = $node->location['province'];
+    $doc->sm_postal = $node->location['postal'];
+    $doc->sm_country = $node->location['country'];
+    $doc->lat = $node->location['latitude'];
+    $doc->lng = $node->location['longitude'];
+    $doc->province_name = $node->location['province_name'];
+    $doc->country_name = $node->location['country_name'];
+  }
+}
+
Index: contrib/apachesolr_local/apachesolr_local.install
===================================================================
--- contrib/apachesolr_local/apachesolr_local.install	(revision 0)
+++ contrib/apachesolr_local/apachesolr_local.install	(revision 150)
@@ -0,0 +1,16 @@
+<?php
+//$Id$
+
+/**
+ * Implementation of hook_install()
+ */
+function apachesolr_local_install() {
+  
+}
+
+/**
+ * Implementation of hook_uninstall()
+ */
+function apachesolr_local_uninstall() {
+  
+}
\ No newline at end of file
Index: contrib/apachesolr_local/apachesolr_local.info
===================================================================
--- contrib/apachesolr_local/apachesolr_local.info	(revision 0)
+++ contrib/apachesolr_local/apachesolr_local.info	(revision 150)
@@ -0,0 +1,9 @@
+;$Id$
+
+name = Apachesolr local search
+description = Provides local lucene based geospacial search
+package = Apache Solr
+dependencies[] = apachesolr
+dependencies[] = location
+core = 6.x
+php = 5.2
Index: solrconfig.xml
===================================================================
--- solrconfig.xml	(revision 149)
+++ solrconfig.xml	(working copy)
@@ -30,9 +30,8 @@
   <!-- Used to specify an alternate directory to hold all index data
        other than the default ./data under the Solr home.
        If replication is in use, this should match the replication configuration. -->
-<!--
+
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
--->
 
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default unless overridden. -->
@@ -647,6 +646,37 @@
     </lst>
   </requestHandler>
 
+<!-- begin Localsolr configuration -->
+  <updateRequestProcessorChain>
+     <processor class="com.pjaol.search.solr.update.LocalUpdateProcessorFactory">
+        <str name="latField">lat</str> <!-- The field used to store your latitude -->
+        <str name="lngField">lng</str> <!-- The field used to store your longitude -->
+        <int name="startTier">9</int> <!-- The lowest level to store data at, level 9 covers about 100 miles,                                             level 5 about 1000 -->
+        <int name="endTier">20</int> <!-- The highest granular level you want to search at, 15 is about 1 mile -->
+       </processor>
+       <processor class="solr.RunUpdateProcessorFactory" />    
+       <processor class="solr.LogUpdateProcessorFactory" /> 
+   </updateRequestProcessorChain>
+  <searchComponent name="localsolr" class="com.pjaol.search.solr.component.LocalSolrQueryComponent" >
+    <str name="latField">lat</str><!-- The field used to store your latitude -->
+    <str name="lngField">lng</str><!-- The field used to store your longitude -->
+  </searchComponent>
+
+  <!-- local lucene request handler -->
+  <requestHandler name="geo" class="solr.StandardRequestHandler">
+    <lst name="defaults">
+      <str name="q">*:*</str>
+    </lst>
+    <arr name="components">
+      <str>localsolr</str>
+      <str>facet</str> 
+      <str>mlt</str>
+      <str>highlight</str>
+      <str>debug</str>
+    </arr>
+  </requestHandler>
+<!-- end Localsolr configuration -->
+
   <highlighting>
    <!-- Configure the standard fragmenter -->
    <!-- This could most likely be commented out in the "default" case -->