? .cvsignore
? .gitignore
? 528086-protwords-53-D7.patch
? 983572-non-empty-filters-8-D6.patch
? Solr_Base_Query.php-6.x-2.x
? apachesolr-6.x-2.x-dev.tar.gz
Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.61
diff -u -p -r1.61 apachesolr.module
--- apachesolr.module	13 Jan 2011 05:21:37 -0000	1.61
+++ apachesolr.module	29 Jan 2011 02:36:52 -0000
@@ -1830,7 +1830,7 @@ function apachesolr_do_query($caller, Dr
   }
   // We must run htmlspecialchars() here since converted entities are in the index.
   // and thus bare entities &, > or < won't match.
-  $response = $query->search(htmlspecialchars($keys, ENT_NOQUOTES, 'UTF-8'));
+  $response = $query->search(htmlspecialchars($keys, ENT_QUOTES, 'UTF-8'));
   // The response is cached so that it is accessible to the blocks and anything
   // else that needs it beyond the initial search.
   apachesolr_static_response_cache($response, $caller);
@@ -2066,7 +2066,7 @@ function apachesolr_clean_text($text) {
   // Add spaces before stripping tags to avoid running words together.
   $text = filter_xss(str_replace(array('<', '>'), array(' <', '> '), $text), array());
   // Decode entities and then make safe any < or > characters.
-  return htmlspecialchars(html_entity_decode($text, ENT_NOQUOTES, 'UTF-8'), ENT_NOQUOTES, 'UTF-8');
+  return htmlspecialchars(html_entity_decode($text, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8');
 }
 
 /**
Index: protwords.txt
===================================================================
RCS file: protwords.txt
diff -N protwords.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ protwords.txt	29 Jan 2011 02:36:52 -0000
@@ -0,0 +1,8 @@
+#-----------------------------------------------------------------------
+# This file blocks words from being operated on by the stemmer and word delimiter.
+&amp;
+&lt;
+&gt;
+&#039;
+&quot;
+
Index: schema.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/schema.xml,v
retrieving revision 1.16
diff -u -p -r1.16 schema.xml
--- schema.xml	9 Dec 2010 04:39:00 -0000	1.16
+++ schema.xml	29 Jan 2011 02:36:52 -0000
@@ -11,7 +11,7 @@
  http://wiki.apache.org/solr/SchemaXml
 -->
 
-<schema name="drupal-7.1.0" version="1.2">
+<schema name="drupal-7.1.0-beta4" version="1.2">
     <!-- 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.2" is Solr's version number for the schema syntax and semantics.  It should
@@ -169,6 +169,7 @@
                 enablePositionIncrements="true"
                 />
         <filter class="solr.WordDelimiterFilterFactory"
+                protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
                 catenateWords="1"
@@ -190,6 +191,7 @@
                 enablePositionIncrements="true"
                 />
         <filter class="solr.WordDelimiterFilterFactory"
+                protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
                 catenateWords="0"