Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.12.2.87
diff -u -p -r1.1.2.12.2.87 apachesolr.module
--- apachesolr.module	16 Jan 2009 18:42:02 -0000	1.1.2.12.2.87
+++ apachesolr.module	16 Jan 2009 20:01:42 -0000
@@ -50,23 +50,30 @@ function apachesolr_settings() {
     '#title' => t('Solr host name'),
     '#default_value' => variable_get('apachesolr_host', 'localhost'),
     '#description' => t('Host name of your Solr server, e.g. <code>localhost</code> or <code>example.com</code>.'),
-    );
+  );
   $form['apachesolr_port'] = array(
     '#type' => 'textfield',
     '#title' => t('Solr port'),
     '#default_value' => variable_get('apachesolr_port', '8983'),
     '#description' => t('Port on which the Solr server listens. Tomcat is 8080 by default.'),
-    );
+  );
   $form['apachesolr_path'] = array(
     '#type' => 'textfield',
     '#title' => t('Solr path'),
     '#default_value' => variable_get('apachesolr_path', '/solr'),
     '#description' => t('Path that identifies the Solr request handler to be used. Leave this as /solr for now.'),
-    );
-  $options = array();
-  foreach (array(5, 10, 15, 20, 25, 30, 40, 50, 60, 70, 80, 90, 100) as $option) {
-    $options[$option] = $option;
-  }
+  );
+
+  $numbers = drupal_map_assoc(array(10, 20, 50, 100));
+  $form['apachesolr_cron_limit'] = array(
+    '#type' => 'select',
+    '#title' => t('Number of items to index per cron run'),
+    '#default_value' => variable_get('apachesolr_cron_limit', 50),
+    '#options' => $numbers,
+    '#description' => t('The maximum number of items indexed in each pass of a <a href="@cron">cron maintenance task</a>. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing.', array('@cron' => url('admin/reports/status')))
+  );
+
+  $options = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 40, 50, 60, 70, 80, 90, 100));
   $form['apachesolr_rows'] = array(
     '#type' => 'select',
     '#title' => t('Results per page'),
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.6.2.58
diff -u -p -r1.1.2.6.2.58 apachesolr_search.module
--- apachesolr_search.module	14 Jan 2009 15:22:28 -0000	1.1.2.6.2.58
+++ apachesolr_search.module	16 Jan 2009 20:01:43 -0000
@@ -48,8 +48,7 @@ function apachesolr_search_menu() {
  * Implementation of hook_update_index().
  */
 function apachesolr_search_update_index() {
-  // TODO - should probably have a separate variable.
-  $cron_limit = variable_get('search_cron_limit', 100);
+  $cron_limit = variable_get('apachesolr_cron_limit', 50);
   $result = apachesolr_get_nodes_to_index('apachesolr_search', $cron_limit);
   apachesolr_index_nodes($result, 'apachesolr_search');
 }