Merge branch 'master' into next
0e53dfd40f7f
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 27 2012, 17:36.

Description

Merge branch 'master' into next

Conflicts:
modules/bibrank/lib/Makefile.am

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 27 2012, 17:36

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:0e53dfd40f7f: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 27 2012, 17:36

	Commit			Author	Details	Committed
	1fcbed0ec34a			Alessio Deiana/Tibor Simko	BibRank: two algorithms for self-citations	Nov 27 2012

				Path
	M			config/invenio.conf
	M			modules/bibrank/etc/Makefile.am
	P			modules/bibrank/etc/selfcites.cfg Copied from modules/bibrank/etc/template_combine_method.cfg
	M			modules/bibrank/lib/Makefile.am
	M			modules/bibrank/lib/bibrank.py
	M			modules/bibrank/lib/bibrank_citation_searcher.py
	A			modules/bibrank/lib/bibrank_selfcites_indexer.py
	A			modules/bibrank/lib/bibrank_selfcites_regression_tests.py
	A			modules/bibrank/lib/bibrank_selfcites_task.py
	A			modules/bibrank/lib/bibrank_selfcites_unit_tests.py
	M			modules/bibsched/lib/bibtask_config.py
	M			modules/miscutil/demo/democfgdata.sql
	P			modules/miscutil/lib/upgrades/invenio_2012_11_27_new_selfcite_tables.py Copied from modules/miscutil/lib/upgrades/invenio_2012_11_07_xtrjob_last_recid.py
	M			modules/miscutil/sql/tabbibclean.sql
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/miscutil/sql/tabdrop.sql
	M			modules/websearch/lib/search_engine_summarizer.py