Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.12.2.112
diff -u -p -r1.1.2.12.2.112 apachesolr.module
--- apachesolr.module	20 Feb 2009 19:31:16 -0000	1.1.2.12.2.112
+++ apachesolr.module	21 Feb 2009 21:28:07 -0000
@@ -344,11 +344,23 @@ function apachesolr_node_to_document($ni
     $node->title = apachesolr_clean_text($node->title);
 
     $text = $node->body;
-
+    $extra = array();
     // Fetch extra data normally not visible, including comments.
-    $extra = node_invoke_nodeapi($node, 'update index');
-    $text .= "\n\n" . implode(' ', $extra);
+    foreach (module_implements('nodeapi') as $name) {
+      $function = $name .'_nodeapi';
+      $extra[$name] = $function($node, 'update index', NULL, NULL);
+    }
+    // Add comments to the body so they can appear in result snippets.
+    if (isset($extra['comment'])) {
+      $text .= "\n\n" . $extra['comment'];
+      unset($extra['comment']);
+    }
     $text = apachesolr_strip_ctl_chars($text);
+    $extra_text = '';
+    foreach ($extra as $item) {
+      $extra_text .= is_array($item) ? implode(' ', $item) : $item;
+    }
+    $extra_text = 
 
     $document = new Apache_Solr_Document();
     $document->id = apachesolr_document_id($node->nid);
@@ -365,6 +377,7 @@ function apachesolr_node_to_document($ni
     $document->translate = $node->translate;
     $document->language = $node->language;
     $document->body = strip_tags($text);
+    $document->extra_text = apachesolr_clean_text($extra_text);
     $document->type  = $node->type;
     $document->type_name = apachesolr_strip_ctl_chars(node_get_types('name', $node));
     $document->created = apachesolr_date_iso($node->created);
Index: schema.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/schema.xml,v
retrieving revision 1.1.2.1.2.28
diff -u -p -r1.1.2.1.2.28 schema.xml
--- schema.xml	20 Feb 2009 02:19:49 -0000	1.1.2.1.2.28
+++ schema.xml	21 Feb 2009 21:28:07 -0000
@@ -263,6 +263,7 @@
    <field name="title" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
    <field name="sort_title" type="sortString" indexed="true" stored="false"/>
    <field name="body" type="text" indexed="true" stored="true" termVectors="true"/>
+   <field name="extra_text" type="text" indexed="true" stored="false" termVectors="true"/>
    <field name="type" type="string" indexed="true" stored="true"/>
    <field name="type_name" type="string" indexed="true" stored="true"/>
    <field name="path" type="string" indexed="true" stored="true"/>