Index: schema.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/schema.xml,v
retrieving revision 1.1.2.1.2.14
diff -u -p -r1.1.2.1.2.14 schema.xml
--- schema.xml	9 Dec 2008 01:01:29 -0000	1.1.2.1.2.14
+++ schema.xml	15 Dec 2008 18:13:38 -0000
@@ -1,36 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- $Id: schema.xml,v 1.1.2.1.2.14 2008/12/09 01:01:29 pwolanin Exp $ -->
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- This is the Solr schema file. This file should be named "schema.xml" and
- should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default)
- or located where the classloader for the Solr webapp can find it.
-
- This example schema is the recommended starting point for users.
- It should be kept correct and concise, usable out-of-the-box.
-
- For more information, on how to customize this file, please see
- http://wiki.apache.org/solr/SchemaXml
--->
 
-<schema name="example" version="1.1">
+<schema name="drupal" version="1.1">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        Applications should change this to reflect the nature of the search collection.
        version="1.1" is Solr's version number for the schema syntax and semantics.  It should
@@ -252,7 +223,7 @@
    <field name="site" type="string" indexed="true" stored="true"/>
    <field name="hash" type="string" indexed="true" stored="true"/>
    <field name="url" type="string" indexed="true" stored="true"/>
-   <field name="title" type="text" indexed="true" stored="true" termVectors="true"/>
+   <field name="title" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
    <field name="stitle" type="string" indexed="true" stored="true"/>
    <field name="body" type="text" indexed="true" stored="true" termVectors="true"/>
    <field name="type" type="string" indexed="true" stored="true"/>
@@ -265,19 +236,20 @@
    <field name="comment_count" type="integer" indexed="true" stored="true"/>
    <field name="tid"  type="integer" indexed="true" stored="true" multiValued="true"/>
    <field name="vid"  type="integer" indexed="true" stored="true" multiValued="true"/>
-   <field name="taxonomy_names" type="text" indexed="true" stored="true" termVectors="true"/>
+   <field name="taxonomy_names" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
    <field name="language" type="string" indexed="true" stored="true"/>
    <!-- The string version of the title is used for sorting -->
    <copyField source="title" dest="stitle"/>
-   <!-- A set of fields to contain text (like like tag contents or taxonomy
-        terms from a preferred vocabulary) which we can boost at query time -->
 
-   <field name="tags_h1" type="text" indexed="true" stored="false"/>
-   <field name="tags_h2_h3" type="text" indexed="true" stored="false"/>
-   <field name="tags_h4_h5_h6" type="text" indexed="true" stored="false"/>
-   <field name="tags_a" type="text" indexed="true" stored="false"/>
+   <!-- A set of fields to contain text extracted from tag contents which we
+        can boost at query time. -->
+   <field name="tags_h1" type="text" indexed="true" stored="false" omitNorms="true"/>
+   <field name="tags_h2_h3" type="text" indexed="true" stored="false" omitNorms="true"/>
+   <field name="tags_h4_h5_h6" type="text" indexed="true" stored="false" omitNorms="true"/>
+   <field name="tags_a" type="text" indexed="true" stored="false" omitNorms="true"/>
    <!-- Inline tags are typically u, b, i, em, strong -->
-   <field name="tags_inline" type="text" indexed="true" stored="false"/>
+   <field name="tags_inline" type="text" indexed="true" stored="false" omitNorms="true"/>
+
    <!-- Here, default is used to create a "timestamp" field indicating 
         when each document was indexed.-->
    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
Index: solrconfig.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Attic/solrconfig.xml,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 solrconfig.xml
--- solrconfig.xml	11 Dec 2008 19:53:32 -0000	1.1.2.7
+++ solrconfig.xml	15 Dec 2008 18:13:38 -0000
@@ -392,12 +392,12 @@
      <str name="echoParams">explicit</str>
      <float name="tie">0.01</float>
      <str name="qf">
-        body^1.0 title^13.0 name^5.0 taxonomy_names^2.0 tags_h1^21.0 tags_h2_h3^13.0 tags_h4_h5_h6^5.0 tags_inline^2.0
+        body^1.0 title^5.0 name^3.0 taxonomy_names^2.0 tags_h1^5.0 tags_h2_h3^3.0 tags_h4_h5_h6^2.0 tags_inline^1.0
      </str>
      <str name="pf">
-        body^2.0 title^8.0
+        body^2.0
      </str>
-     <int name="ps">100</int>
+     <int name="ps">15</int>
      <str name="mm">
         2&lt;-35%
      </str>
Index: apachesolr_search.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Attic/apachesolr_search.admin.inc,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 apachesolr_search.admin.inc
--- apachesolr_search.admin.inc	11 Dec 2008 21:23:18 -0000	1.1.2.4
+++ apachesolr_search.admin.inc	15 Dec 2008 18:13:38 -0000
@@ -34,14 +34,27 @@ function apachesolr_search_bias_form($fo
   $date_settings = variable_get('apacehsolr_search_date_boost', '4:3.0');
   $comment_settings = variable_get('apacehsolr_search_comment_boost', '4:3.0');
   
-  $options = array('0:0' => t('Omit'), '1:1.0' => t('Minimal'), '2:2.0' => t('Low'), '4:3.0' => t('Moderate'), '4:8.0' => t('High'), '10:13.0' => t('Higher'));
-    $form['biasing'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Result biasing'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
-      '#description' => t('Specify here biasing for different node properties when ordering the search results. Choose <em>Omit</em> to ignore this property.'),
-    );
+  $options = array(
+    '0:0' => t('Omit'),
+    '1:1.0' => '1',
+    '2:1.0' => '2',
+    '2:2.0' => '3',
+    '4:2.0' => '4',
+    '4:3.0' => '5',
+    '4:5.0' => '6',
+    '8:8.0' => '7',
+    '8:13.0' => '8',
+    '8:34.0' => '9',
+    '10:100.0' => '10'
+  );
+
+  $form['biasing'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Result biasing'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+    '#description' => t('Specify here biasing for different node properties when ordering the search results. Choose <em>Omit</em> to ignore this property.'),
+  );
   $form['biasing']['apacehsolr_search_date_boost'] = array(
     '#type' => 'select',
     '#options' => $options,
@@ -70,18 +83,18 @@ function apachesolr_search_settings_form
   $qf = variable_get('apachesolr_search_query_fields', array());
   $weights = array();
   $weights['0'] = t('Omit');
-  $weights += drupal_map_assoc(array('0.1', '0.2', '0.5', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0'));
+  $weights += drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0'));
   // Note - we have default values set in solrconfig.xml, which will operate when 
   // none are set.
   $defaults = array(
     'body' => '1.0',
-    'title' => '13.0',
-    'name' => '5.0',
+    'title' => '5.0',
+    'name' => '3.0',
     'taxonomy_names' => '2.0',
-    'tags_h1' => '21.0',
-    'tags_h2_h3' => '13.0',
-    'tags_h4_h5_h6' => '5.0',
-    'tags_inline' => '2.0',
+    'tags_h1' => '5.0',
+    'tags_h2_h3' => '3.0',
+    'tags_h4_h5_h6' => '2.0',
+    'tags_inline' => '1.0',
     'tags_a' => '0',
   );
   if (!$qf) {
@@ -97,22 +110,22 @@ function apachesolr_search_settings_form
       '#tree' => TRUE,
       '#description' => t('Specify here which fields are more important when searching. Give a field a bigger numeric value to make it more important.  If you omit a field, it will not be searched for keywords.'),
     );
-    // Make sure all the default fields are included, even if they have no indexed content.
-    foreach ($defaults as $field_name => $weight) {
+    foreach ($fields as $field_name => $field) {
       $form['apachesolr_search_query_fields'][$field_name] = array(
+        '#access' => $field->type == 'text',
         '#type' => 'select',
         '#options' => $weights,
         '#title' => t('Weight for %field_name', array('%field_name' => $field_name)),
-        '#default_value' => isset($qf[$field_name]) ? $qf[$field_name] : $defaults[$field_name],
+        '#default_value' => isset($qf[$field_name]) ? $qf[$field_name] : '0',
       );
     }
-    foreach ($fields as $field_name => $field) {
+    // Make sure all the default fields are included, even if they have no indexed content.
+    foreach ($defaults as $field_name => $weight) {
       $form['apachesolr_search_query_fields'][$field_name] = array(
-        '#access' => $field->type == 'text',
         '#type' => 'select',
         '#options' => $weights,
         '#title' => t('Weight for %field_name', array('%field_name' => $field_name)),
-        '#default_value' => isset($qf[$field_name]) ? $qf[$field_name] : '0',
+        '#default_value' => isset($qf[$field_name]) ? $qf[$field_name] : $defaults[$field_name],
       );
     }