set limit for search heap,

disable PDF and MOBI by default

diff --git a/apps/search/index.py b/apps/search/index.py
index b689c76..f608a5b 100644 (file)
--- a/apps/search/index.py
+++ b/apps/search/index.py
@@ -18,7 +18,7 @@ from lucene import SimpleFSDirectory, NIOFSDirectory, IndexWriter, IndexReader,
     # KeywordAnalyzer
 
 # Initialize jvm
     # KeywordAnalyzer
 
 # Initialize jvm

-JVM = initVM(CLASSPATH)
+JVM = initVM(CLASSPATH, maxheap=settings.JVM_MAXHEAP)

 
 import sys
 import os
 
 import sys
 import os

diff --git a/doc/installation.rst b/doc/installation.rst
index da0a9a8..78ca3cc 100644 (file)
--- a/doc/installation.rst
+++ b/doc/installation.rst
@@ -8,9 +8,10 @@ Requirements
 * `Python 2.6+ <http://python.org>`_
 * Everyting from the ``requirements.txt`` file
 * a library for your database of choice
 * `Python 2.6+ <http://python.org>`_
 * Everyting from the ``requirements.txt`` file
 * a library for your database of choice

- (see `DBs supported by Django <http://docs.djangoproject.com/en/dev/topics/install/#get-your-database-running>`_)
-* `puLucene <https://github.com/fnp/pylucene/>`_ for search
-* Librarian dependencies, see lib/librarian/README.md
+  (see `DBs supported by Django <http://docs.djangoproject.com/en/dev/topics/install/#get-your-database-running>`_)
+* `pyLucene <https://github.com/fnp/pylucene/>`_ for search
+* Librarian dependencies for generating PDF and MOBI files, 
+  see lib/librarian/README.md

 
 
 Installation
 
 
 Installation

diff --git a/wolnelektury/settings/contrib.py b/wolnelektury/settings/contrib.py
index ba6603b..654066a 100644 (file)
--- a/wolnelektury/settings/contrib.py
+++ b/wolnelektury/settings/contrib.py
@@ -1 +1,4 @@
 HONEYPOT_FIELD_NAME = 'miut'
 HONEYPOT_FIELD_NAME = 'miut'

+PAGINATION_INVALID_PAGE_RAISES_404 = True
+THUMBNAIL_QUALITY = 95
+TRANSLATION_REGISTRY = "wolnelektury.translation"

diff --git a/wolnelektury/settings/custom.py b/wolnelektury/settings/custom.py
index 9abb5ed..552188a 100644 (file)
--- a/wolnelektury/settings/custom.py
+++ b/wolnelektury/settings/custom.py
@@ -1,19 +1,16 @@
-PAGINATION_INVALID_PAGE_RAISES_404 = True
-THUMBNAIL_QUALITY = 95
-TRANSLATION_REGISTRY = "wolnelektury.translation"
-
-

 # seconds until a changes appears in the changes api
 API_WAIT = 10
 
 # limit number of filtering tags
 MAX_TAG_LIST = 6
 
 # seconds until a changes appears in the changes api
 API_WAIT = 10
 
 # limit number of filtering tags
 MAX_TAG_LIST = 6
 

+NO_SEARCH_INDEX = False

 NO_BUILD_EPUB = False
 NO_BUILD_TXT = False
 NO_BUILD_EPUB = False
 NO_BUILD_TXT = False

-NO_BUILD_PDF = False
-NO_BUILD_MOBI = False
-NO_SEARCH_INDEX = False
+# You'll need XeLaTeX to generate PDF files.
+NO_BUILD_PDF = True
+# You'll need Calibre installed to generate MOBI files.
+NO_BUILD_MOBI = True

 
 ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
 ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
 
 ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
 ALL_PDF_ZIP = 'wolnelektury_pl_pdf'


@@ -31,3 +28,6 @@ CATALOGUE_CUSTOMPDF_RATE_LIMIT = '1/m'
 # set to 'new' or 'old' to skip time-consuming test
 # for TeX morefloats library version
 LIBRARIAN_PDF_MOREFLOATS = None
 # set to 'new' or 'old' to skip time-consuming test
 # for TeX morefloats library version
 LIBRARIAN_PDF_MOREFLOATS = None

+
+# Max memory used by search
+JVM_MAXHEAP = '256m'