Compare commits
No commits in common. "2093922208d06e90c4bd9af89b93834fd245d917" and "211bde468d48251360778fb90aac5068a110a982" have entirely different histories.
2093922208
...
211bde468d
5 changed files with 4 additions and 15 deletions
|
|
@ -96,7 +96,7 @@ def load_config(init=False):
|
||||||
for key in config['documentKeys']:
|
for key in config['documentKeys']:
|
||||||
if key['id'] in default_filters and not key.get('filter'):
|
if key['id'] in default_filters and not key.get('filter'):
|
||||||
key['filter'] = True
|
key['filter'] = True
|
||||||
sys.stderr.write('enabled filter for document key "%s" since its used as default filter.\n' % (key['id']))
|
sys.stderr.write('enabled filter for documeny key "%s" since its used as default filter.\n' % (key['id']))
|
||||||
|
|
||||||
config['keys'] = {}
|
config['keys'] = {}
|
||||||
for key in config['itemKeys']:
|
for key in config['itemKeys']:
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@ from user.models import Group
|
||||||
|
|
||||||
from . import managers
|
from . import managers
|
||||||
from . import utils
|
from . import utils
|
||||||
from . import tasks
|
|
||||||
from .fulltext import FulltextMixin
|
from .fulltext import FulltextMixin
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
@ -508,7 +507,7 @@ class Document(models.Model, FulltextMixin):
|
||||||
self.oshash = ox.oshash(self.file.path)
|
self.oshash = ox.oshash(self.file.path)
|
||||||
self.save()
|
self.save()
|
||||||
self.delete_cache()
|
self.delete_cache()
|
||||||
tasks.extract_fulltext.delay(self.id)
|
self.update_fulltext()
|
||||||
return True, self.file.size
|
return True, self.file.size
|
||||||
|
|
||||||
return save_chunk(self, self.file, chunk, offset, name, done_cb)
|
return save_chunk(self, self.file, chunk, offset, name, done_cb)
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from celery.task import task
|
|
||||||
|
|
||||||
@task(queue="encoding")
|
|
||||||
def extract_fulltext(id):
|
|
||||||
from . import models
|
|
||||||
d = models.Document.objects.get(id=id)
|
|
||||||
d.update_fulltext()
|
|
||||||
|
|
@ -439,7 +439,7 @@ def upload(request):
|
||||||
|
|
||||||
def autocompleteDocuments(request, data):
|
def autocompleteDocuments(request, data):
|
||||||
'''
|
'''
|
||||||
Returns autocomplete strings for a given document key and search string
|
Returns autocomplete strings for a given documeny key and search string
|
||||||
takes {
|
takes {
|
||||||
key: string, // document key
|
key: string, // document key
|
||||||
value: string, // search string
|
value: string, // search string
|
||||||
|
|
|
||||||
|
|
@ -1049,9 +1049,7 @@ class Item(models.Model):
|
||||||
value = len(value)
|
value = len(value)
|
||||||
set_value(s, name, value)
|
set_value(s, name, value)
|
||||||
elif sort_type == 'year':
|
elif sort_type == 'year':
|
||||||
value = self.get(source)
|
value = self.get(source)[:4]
|
||||||
if isinstance(value, str):
|
|
||||||
value = value[:4]
|
|
||||||
set_value(s, name, value)
|
set_value(s, name, value)
|
||||||
elif sort_type == 'date':
|
elif sort_type == 'date':
|
||||||
value = value_ = self.get(source)
|
value = value_ = self.get(source)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue