Merge branch 'jerome/bibsword-element'
86d567714440
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 20 2010, 17:25.

Description

Merge branch 'jerome/bibsword-element'

jerome/bibsword-element: BibSword: temporarily disabled CLI BibSword: code cleaning and small improvements

Conflicts:
modules/bibformat/etc/format_templates/Default_HTML_actions.bft

Committed

Tibor Simko <tibor.simko@cern.ch>

Dec 20 2010, 17:34

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:86d567714440: Merge branch 'jerome/bibsword-element' (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 20 2010, 17:34

	Commit			Author	Details	Committed
	49a555ab455c			Jerome Caffaro	BibSword: temporarily disabled CLI	Dec 17 2010
	90d1a42c49d8			Jerome Caffaro	BibSword: code cleaning and small improvements	Dec 17 2010

				Path
	M			modules/bibformat/etc/format_templates/Default_HTML_actions.bft
	M			modules/bibformat/lib/elements/Makefile.am
	P			modules/bibformat/lib/elements/bfe_sword_push.py Copied from modules/bibformat/lib/elements/bfe_edit_files.py
	M			modules/bibsword/bin/bibsword.in
	M			modules/bibsword/etc/Test_marcxml_file_1.xml
	M			modules/bibsword/etc/Test_marcxml_file_2.xml
	M			modules/bibsword/etc/Test_marcxml_file_3.xml
	M			modules/bibsword/lib/bibsword_client.py
	M			modules/bibsword/lib/bibsword_client_dblayer.py
	M			modules/bibsword/lib/bibsword_client_formatter.py
	M			modules/bibsword/lib/bibsword_client_http.py
	M			modules/bibsword/lib/bibsword_client_templates.py
	M			modules/bibsword/lib/bibsword_client_tester.py
	M			modules/bibsword/lib/bibsword_webinterface.py
	M			modules/websession/lib/inveniogc.py