matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lazy loading of model to search

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-24 15:16:00 -04:00
parent 00427da11e
commit 5506c33ce5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayan/apps/dynamic_search/classes.py
View File

@@ -12,6 +12,7 @@ from django.utils.module_loading import import_string
from acls.models import AccessEntry from acls.models import AccessEntry
from permissions.models import Permission from permissions.models import Permission
from .models import RecentSearch
from .settings import setting_limit from .settings import setting_limit
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -32,8 +33,8 @@ class SearchModel(object):
self.app_label = app_label self.app_label = app_label
self.model_name = model_name self.model_name = model_name
self.search_fields = {} self.search_fields = {}
self.model = get_model(app_label, model_name) self.model = None # Lazy
self.label = label or self.model._meta.verbose_name self.label = label
self.serializer_string = serializer_string self.serializer_string = serializer_string
self.permission = permission self.permission = permission
self.__class__.registry[self.get_full_name()] = self self.__class__.registry[self.get_full_name()] = self
@@ -80,13 +81,16 @@ class SearchModel(object):
return [normspace(' ', (t[0] or t[1]).strip()) for t in findterms(query_string)] return [normspace(' ', (t[0] or t[1]).strip()) for t in findterms(query_string)]
def search(self, query_string, user, global_and_search=False): def search(self, query_string, user, global_and_search=False):
from .models import RecentSearch
elapsed_time = 0 elapsed_time = 0
start_time = datetime.datetime.now() start_time = datetime.datetime.now()
result_set = set() result_set = set()
search_dict = {} search_dict = {}
if not self.model:
self.model = get_model(self.app_label, self.model_name)
if not self.label:
self.label = self.model._meta.verbose_name
if 'q' in query_string: if 'q' in query_string:
# Simple search # Simple search
for search_field in self.get_all_search_fields(): for search_field in self.get_all_search_fields():