# HG changeset patch # User ymh # Date 1313741825 -7200 # Node ID 0b2f3296578702fae89edd1a345b92c1a5bdda03 # Parent 6c67db5ebab78f07bf8277447c13ee47f87c01b6 small corrections diff -r 6c67db5ebab7 -r 0b2f32965787 src/ldt/ldt/indexation/__init__.py --- a/src/ldt/ldt/indexation/__init__.py Thu Aug 18 13:28:02 2011 +0200 +++ b/src/ldt/ldt/indexation/__init__.py Fri Aug 19 10:17:05 2011 +0200 @@ -10,9 +10,9 @@ ANALYZER.addAnalyzer("abstract", lucene.FrenchAnalyzer(lucene.Version.LUCENE_CURRENT)) ANALYZER.addAnalyzer("all", lucene.FrenchAnalyzer(lucene.Version.LUCENE_CURRENT)) -def get_writer(): +def get_writer(new=False): lucene.getVMEnv().attachCurrentThread() - return lucene.IndexWriter(STORE, ANALYZER, False, lucene.IndexWriter.MaxFieldLength.UNLIMITED) + return lucene.IndexWriter(STORE, ANALYZER, new, lucene.IndexWriter.MaxFieldLength.UNLIMITED) def get_searcher(): lucene.getVMEnv().attachCurrentThread() diff -r 6c67db5ebab7 -r 0b2f32965787 src/ldt/ldt/ldt_utils/admin.py --- a/src/ldt/ldt/ldt_utils/admin.py Thu Aug 18 13:28:02 2011 +0200 +++ b/src/ldt/ldt/ldt_utils/admin.py Fri Aug 19 10:17:05 2011 +0200 @@ -47,7 +47,7 @@ form = ReindexForm(request.POST) if form.is_valid(): # try: - writer = ldt.indexation.get_writer() + writer = ldt.indexation.get_writer(True) try: contentList = form.cleaned_data["contents"] indexer = ContentIndexer(contentList, writer) diff -r 6c67db5ebab7 -r 0b2f32965787 web/ldtplatform/config.py.tmpl --- a/web/ldtplatform/config.py.tmpl Thu Aug 18 13:28:02 2011 +0200 +++ b/web/ldtplatform/config.py.tmpl Fri Aug 19 10:17:05 2011 +0200 @@ -13,6 +13,7 @@ STREAM_SRC_PREFIX = "" BASE_STATIC_ROOT = os.path.abspath(BASE_DIR + "../static/").rstrip("/")+"/" +BASE_STATIC_URL = BASE_URL + 'static/' # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" @@ -32,6 +33,10 @@ # PATH where uploaded media are put. STREAM_PATH = CONTENT_ROOT +ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' +LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' + + DATABASES = { 'default': { diff -r 6c67db5ebab7 -r 0b2f32965787 web/ldtplatform/modwsgi.wsgi --- a/web/ldtplatform/modwsgi.wsgi Thu Aug 18 13:28:02 2011 +0200 +++ b/web/ldtplatform/modwsgi.wsgi Fri Aug 19 10:17:05 2011 +0200 @@ -25,6 +25,11 @@ import django.core.handlers.wsgi _application = django.core.handlers.wsgi.WSGIHandler() + + if environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]: + import pydevd #@UnresolvedImport + pydevd.settrace(suspend=False) + return _application(environ, start_response)