[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GMG-Devel] [PATCH 15/83] Add index identifier to SearchIndex.
From: |
Alon Levy |
Subject: |
[GMG-Devel] [PATCH 15/83] Add index identifier to SearchIndex. |
Date: |
Tue, 25 Feb 2014 21:57:58 +0200 |
From: Praveen Kumar <address@hidden>
---
mediagoblin/plugins/search/base.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/mediagoblin/plugins/search/base.py
b/mediagoblin/plugins/search/base.py
index 648cebf..b5f4fa2 100644
--- a/mediagoblin/plugins/search/base.py
+++ b/mediagoblin/plugins/search/base.py
@@ -2,7 +2,6 @@ import logging
import os
from mediagoblin.tools import pluginapi
-from mediagoblin.plugins.search.base import IndexRegistry
from mediagoblin.plugins.search.exceptions import IndexDoesNotExistsError
from mediagoblin.plugins.search.schemas import MediaEntryIndexSchema
@@ -24,16 +23,21 @@ class SearchIndex(object):
"""
def __init__(self, model, schema, search_index_dir=None,
use_multiprocessing=None):
- self.schema = schema
- self.field_names = self.schema.field_names
+ self.schema = schema()
+ self.field_names = self.schema.names()
+
+ self.model = model
+ self.identifier = self.model.__tablename__
self.search_index = None
- self.search_index_name = self.__class__.__name__.lower()
-
+ self.search_index_name = ''.join([
+ model.__name__,
+ self.__class__.__name__.lower()])
+
self.search_index_dir = search_index_dir
if not self.search_index_dir:
self.search_index_dir = config['search_index_dir']
-
+ self.search_index_dir += self.identifier
self.use_multiprocessing = use_multiprocessing
if not self.use_multiprocessing:
self.use_multiprocessing = config['use_multiprocessing']
@@ -78,7 +82,7 @@ class SearchIndex(object):
`schema` should be an object of whoosh.fields.Schema.
"""
- if not schema:
+ if not self.schema:
return
if not os.path.exists(self.search_index_dir):
--
1.8.5.3
- [GMG-Devel] [PATCH 05/83] Rename models.py to indices.py as these will not be stored in db., (continued)
- [GMG-Devel] [PATCH 05/83] Rename models.py to indices.py as these will not be stored in db., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 06/83] Remove global constants from the top of indices.py, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 07/83] Fix imports and other bugs in indices.py, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 08/83] Add schemas.py which will store all index schemas., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 09/83] Store also the field names in the SearchIndex object which is also necessary while searching., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 10/83] Correct the class index schema class., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 11/83] Add indexer for MediaEntry objects., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 12/83] Add IndexRegistry class to maintain the search indices., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 13/83] Clean up plugins.search.indices, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 14/83] Rename base.py to registry.py and indices.py to base.py., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 15/83] Add index identifier to SearchIndex.,
Alon Levy <=
- [GMG-Devel] [PATCH 16/83] Correct the index identifier., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 17/83] Collect all indices in indices.py, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 18/83] Add method to create a document from a model instance, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 19/83] Add event listeners for tracking ORM events for indices., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 20/83] Register indices and orm events for search., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 21/83] Fix bugs and add search method in SearchIndex, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 23/83] Add ORMEventsListener class to implement the ORM Events, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 22/83] Add ListenerRegistry class to collect all the listeners., Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 24/83] Correct indentations in search.__init__, Alon Levy, 2014/02/25
- [GMG-Devel] [PATCH 25/83] Add search forms., Alon Levy, 2014/02/25