Merge branch 'master' into next
d6bbc443fc95
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 4 2013, 17:27.

Description

Merge branch 'master' into next

master: SolrUtils: better exception handling in indexers SolrUtils: faster snippet factility BibFormat: fix for snippet generation BibRank: better Solr regression tests BibRank: faster Solr indexer BibRank: new multi-tag Solr indexer BibRank: index latest records first in Solr SolrUtils: support entire full-text indexing SolrUtils: cleaner schema.xml SolrUtils: support high count of logical clauses WebSearch: fix missing cc info in req object WebJournal: new image template OAIRepository: optional support for --notimechange BibDocFile: RHEL6 magic bindings support

Conflicts:
modules/websearch/lib/search_engine.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 4 2013, 17:27

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:d6bbc443fc95: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 4 2013, 17:27

Commit	Author	Details	Committed
9875339947ab	Patrick Glauner/Tibor Simko	SolrUtils: better exception handling in indexers	Sep 4 2013
1145447536cb	Patrick Glauner/Tibor Simko	SolrUtils: faster snippet factility	Sep 4 2013
1e19e1aa76cc	Patrick Glauner/Tibor Simko	BibFormat: fix for snippet generation	Sep 4 2013
4ece53febb1f	Patrick Glauner/Tibor Simko	BibRank: better Solr regression tests	Sep 4 2013
ab6e8e807d9b	Patrick Glauner/Tibor Simko	BibRank: faster Solr indexer	Sep 4 2013
22f107aa5433	Patrick Glauner/Tibor Simko	BibRank: new multi-tag Solr indexer	Sep 4 2013
10c8e412c379	Patrick Glauner/Tibor Simko	BibRank: index latest records first in Solr	Sep 4 2013
d7ed203d7a99	Patrick Glauner/Tibor Simko	SolrUtils: support entire full-text indexing	Sep 4 2013
7333ca1776ef	Patrick Glauner/Tibor Simko	SolrUtils: cleaner schema.xml	Sep 4 2013
a982774436fe	Patrick Glauner/Tibor Simko	SolrUtils: support high count of logical clauses	Sep 4 2013
59a0f59a62ce	Ludmila Marian/Tibor Simko	WebSearch: fix missing cc info in req object	Sep 2 2013
7669d09f00d6	Jerome Caffaro/Tibor Simko	WebJournal: new image template	Sep 2 2013
e1bdf6e106ed	Tibor Simko	Merge branch 'maint-1.1'	Aug 23 2013
98c333b244d5	Samuele Kaplun/Tibor Simko	OAIRepository: optional support for --notimechange	Aug 23 2013
dcf25dac969c	Samuele Kaplun/Tibor Simko	BibDocFile: RHEL6 magic bindings support	Aug 21 2013

				Path
	M			modules/bibdocfile/lib/bibdocfile.py
	M			modules/bibformat/lib/bibformat_utils.py
	M			modules/bibindex/lib/bibindexadminlib.py
	M			modules/bibrank/etc/template_word_similarity_solr.cfg
	M			modules/bibrank/lib/bibrank_bridge_config.py
	M			modules/bibrank/lib/bibrank_bridge_utils.py
	M			modules/miscutil/lib/solrutils/schema.xml
	M			modules/miscutil/lib/solrutils/solrconfig.xml
	M			modules/miscutil/lib/solrutils_bibindex_indexer.py
	M			modules/miscutil/lib/solrutils_bibindex_searcher.py
	M			modules/miscutil/lib/solrutils_bibrank_indexer.py
	M			modules/miscutil/lib/solrutils_regression_tests.py
	M			modules/oairepository/lib/oai_repository_updater.py
	M			modules/webjournal/etc/AtlantisTimes.css
	M			modules/webstyle/etc/journal-editor-templates.js
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/journal-template5.gif
	M			modules/websubmit/lib/websubmit_webinterface.py