Merge branch 'master' into next
a5c0d1b17d92
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 11 2013, 16:46.

Description

Merge branch 'master' into next

master: dataciteutils: refactor DataCite API wrapper BibFormat: add DataCite XSL stylesheet dataciteutils: DataCite DOI support and test cases textutils: add ALA-LC transliteration WebSearch: fix Python 2.4 syntax error

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 11 2013, 16:46

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:a5c0d1b17d92: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 11 2013, 16:46

Commit	Author	Details	Committed
ca7ca1cff797	Lars Holm Nielsen/Tibor Simko	dataciteutils: refactor DataCite API wrapper	Apr 11 2013
ca99d4539e4b	Lars Holm Nielsen/Tibor Simko	BibFormat: add DataCite XSL stylesheet	Apr 11 2013
ccb7cebb6ecd	Laura Rueda/Tibor Simko	dataciteutils: DataCite DOI support and test cases	Apr 11 2013
4157412e9efe	Laura Rueda/Tibor Simko	textutils: add ALA-LC transliteration	Apr 11 2013
09a1cd8d4275	Lars Holm Nielsen/Tibor Simko	WebSearch: fix Python 2.4 syntax error	Apr 11 2013

				Path
	A			modules/bibformat/etc/format_templates/DataCite.xsl
	M			modules/bibformat/etc/format_templates/Makefile.am
	A			modules/bibformat/etc/output_formats/DCITE.bfo
	M			modules/bibformat/etc/output_formats/Makefile.am
	M			modules/miscutil/lib/Makefile.am
	A			modules/miscutil/lib/dataciteutils.py
	A			modules/miscutil/lib/dataciteutils_tester.py
	M			modules/miscutil/lib/textutils.py
	M			modules/miscutil/lib/textutils_unit_tests.py
	M			modules/miscutil/sql/tabfill.sql
	M			modules/websearch/lib/search_engine.py