search fixes

diff --git a/doc/solr-conf/schema.xml b/doc/solr-conf/schema.xml
index f4d511d..538b9f9 100644 (file)
--- a/doc/solr-conf/schema.xml
+++ b/doc/solr-conf/schema.xml
@@ -160,7 +160,7 @@
     <dynamicField name="*_pl" type="text_pl" indexed="true" stored="false" />
     <dynamicField name="*_en" type="text_en" indexed="true" stored="false" />
 
     <dynamicField name="*_pl" type="text_pl" indexed="true" stored="false" />
     <dynamicField name="*_en" type="text_en" indexed="true" stored="false" />
 

-    <field name="author" type="text_ws" indexed="true" stored="true" multiValued="false" />
+    <field name="author" type="text_general" indexed="true" stored="true" multiValued="false" />

     <field name="date" type="date" indexed="true" stored="true" multiValued="false" />
     <field name="body_pl" type="text_pl" indexed="true" stored="true" multiValued="false" />
     <field name="title_pl" type="text_pl" indexed="true" stored="true" multiValued="false" />
     <field name="date" type="date" indexed="true" stored="true" multiValued="false" />
     <field name="body_pl" type="text_pl" indexed="true" stored="true" multiValued="false" />
     <field name="title_pl" type="text_pl" indexed="true" stored="true" multiValued="false" />


@@ -170,9 +170,9 @@
     <field name="body_en" type="text_en" indexed="true" stored="true" multiValued="false" />
 
     <field name="organizer_en" type="text_en" indexed="true" stored="true" multiValued="false" />
     <field name="body_en" type="text_en" indexed="true" stored="true" multiValued="false" />
 
     <field name="organizer_en" type="text_en" indexed="true" stored="true" multiValued="false" />

-    <field name="place_en" type="text_ws" indexed="true" stored="true" multiValued="false" />
+    <field name="place_en" type="text_general" indexed="true" stored="true" multiValued="false" />

     <field name="organizer_pl" type="text_pl" indexed="true" stored="true" multiValued="false" />
     <field name="organizer_pl" type="text_pl" indexed="true" stored="true" multiValued="false" />

-    <field name="place_pl" type="text_ws" indexed="true" stored="true" multiValued="false" />
+    <field name="place_pl" type="text_general" indexed="true" stored="true" multiValued="false" />

 
   </fields>
 
 
   </fields>
 

diff --git a/migdal/search_indexes.py b/migdal/search_indexes.py
index 63acc1c..2001dab 100644 (file)
--- a/migdal/search_indexes.py
+++ b/migdal/search_indexes.py
@@ -14,7 +14,7 @@ class EntryIndex(indexes.RealTimeSearchIndex, indexes.Indexable):
 
     def index_queryset(self):
         """Used when the entire index for model is updated."""
 
     def index_queryset(self):
         """Used when the entire index for model is updated."""

-        return self.get_model().objects.filter(date__lte=datetime.datetime.now())
+        return self.get_model().objects.all() # from example: filter(date__lte=datetime.datetime.now())

 
 
 add_translatable_index(EntryIndex, {
 
 
 add_translatable_index(EntryIndex, {