Diffusion invenio-infoscience 294041eb6ceb

Merge branch 'master' into next
294041eb6ceb
Actions

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

Description

Merge branch 'master' into next

master: BibIndex: rework of error handling DocExtract: refextract unit tests file name fix DocExtract: preparing for merging into master DocExtract: multiple fixes DocExtract: new docextract and refextract modules

Conflicts:
modules/docextract/lib/refextract.py
modules/miscutil/lib/inveniocfg.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 27 2012, 16:10

Parents

R3600:1ba4f5272463: BibIndex: rework of error handling
R3600:74f78a27952e: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:294041eb6ceb: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 27 2012, 16:10

Merged Changes

Commit	Author	Details	Committed
1ba4f5272463	Alessio Deiana/Tibor Simko	BibIndex: rework of error handling	Nov 27 2012
d74ab71cc61b	Tibor Simko	DocExtract: refextract unit tests file name fix	Nov 27 2012
1371682bd112	Samuele Kaplun/Tibor Simko	DocExtract: preparing for merging into master	Nov 27 2012
c7b40434a6d9	Alessio Deiana/Tibor Simko	DocExtract: multiple fixes	Nov 27 2012
9c44fffa48ab	Alessio Deiana/Tibor Simko	DocExtract: new docextract and refextract modules	Nov 27 2012

Changes (93)

		Path
M		.gitignore
M		config/invenio.conf
M		configure.ac
M		modules/Makefile.am
M		modules/bibclassify/lib/bibclassify_text_normalizer.py
M		modules/bibindex/lib/bibindex_engine.py
A	(dir)	modules/docextract/
V		modules/{docextract ← refextract}/Makefile.am
A	(dir)	modules/docextract/bin/
P		modules/docextract/bin/Makefile.am Copied from modules/refextract/bin/Makefile.am
P		modules/docextract/bin/docextract.in Copied from modules/refextract/bin/refextract.in
V		modules/{docextract ← refextract}/bin/refextract.in
A	(dir)	modules/docextract/doc/
V		modules/{docextract ← refextract}/doc/Makefile.am
A	(dir)	modules/docextract/doc/admin/
V		modules/{docextract/doc/admin ← refextract/bin}/Makefile.am
A		modules/docextract/doc/admin/docextract-admin-guide.webdoc
A	(dir)	modules/docextract/doc/hacking/
V		modules/{docextract/doc/hacking ← refextract/doc/admin}/Makefile.am
A		modules/docextract/doc/hacking/docextract-internals.webdoc
A	(dir)	modules/docextract/etc/
V		modules/{docextract ← refextract}/etc/Makefile.am
A		modules/docextract/etc/authors.kb
A		modules/docextract/etc/books.kb
V		modules/{docextract/etc/collaborations.kb ← refextract/etc/refextract-authors.kb}
A		modules/docextract/etc/conferences.kb
A		modules/docextract/etc/example.pdf
A		modules/docextract/etc/example.txt
V		modules/{docextract/etc/job-preprints.cfg ← refextract/etc/refextract-job-preprints.cfg}
A		modules/docextract/etc/journal-titles-re.kb
V		modules/{docextract/etc/journal-titles.kb ← refextract/etc/refextract-journal-titles.kb}
A		modules/docextract/etc/publishers.kb
A		modules/docextract/etc/report-numbers.kb
A		modules/docextract/etc/special-journals.kb
A		modules/docextract/etc/test1.txt
A		modules/docextract/etc/test2.txt
A	(dir)	modules/docextract/lib/
P		modules/docextract/lib/Makefile.am Copied from modules/refextract/lib/Makefile.am
A		modules/docextract/lib/authorextract_re.py
A		modules/docextract/lib/docextract_pdf.py
A		modules/docextract/lib/docextract_task.py
A		modules/docextract/lib/docextract_text.py
A		modules/docextract/lib/docextract_utils.py
A		modules/docextract/lib/docextract_webinterface.py
A		modules/docextract/lib/docextract_webinterface_unit_tests.py
P		modules/docextract/lib/refextract.py Copied from modules/refextract/lib/Makefile.am
A		modules/docextract/lib/refextract_api.py
A		modules/docextract/lib/refextract_api_unit_tests.py
A		modules/docextract/lib/refextract_cli.py
A		modules/docextract/lib/refextract_config.py
A		modules/docextract/lib/refextract_engine.py
A		modules/docextract/lib/refextract_find.py
A		modules/docextract/lib/refextract_kbs.py
A		modules/docextract/lib/refextract_linker.py
A		modules/docextract/lib/refextract_re.py
A		modules/docextract/lib/refextract_regression_tests.py
A		modules/docextract/lib/refextract_tag.py
A		modules/docextract/lib/refextract_task.py
A		modules/docextract/lib/refextract_text.py
A		modules/docextract/lib/refextract_unit_tests.py
A		modules/docextract/lib/refextract_xml.py
M		modules/miscutil/lib/inveniocfg.py
V		modules/{miscutil/lib/upgrades/invenio_2012_11_07_xtrjob_last_recid.py ← refextract/lib/Makefile.am}
M		modules/miscutil/sql/tabcreate.sql
M		modules/miscutil/sql/tabfill.sql
M		modules/oaiharvest/lib/oai_harvest_daemon.py
V		modules/{refextract → docextract}/Makefile.am
D		modules/refextract/bin
P		modules/refextract/bin/Makefile.am Deleted after being copied to multiple locations: modules/docextract/bin/Makefile.am modules/docextract/doc/admin/Makefile.am
P		modules/refextract/bin/refextract.in Deleted after being copied to multiple locations: modules/docextract/bin/docextract.in modules/docextract/bin/refextract.in
D		modules/refextract/doc
V		modules/{refextract → docextract}/doc/Makefile.am
D		modules/refextract/doc/admin
V		modules/{refextract/doc/admin → docextract/doc/hacking}/Makefile.am
D		modules/refextract/doc/hacking
D		modules/refextract/doc/hacking/Makefile.am
D		modules/refextract/etc
V		modules/{refextract → docextract}/etc/Makefile.am
V		modules/{refextract/etc/refextract-authors.kb → docextract/etc/collaborations.kb}
V		modules/{refextract/etc/refextract-job-preprints.cfg → docextract/etc/job-preprints.cfg}
V		modules/{refextract/etc/refextract-journal-titles.kb → docextract/etc/journal-titles.kb}
D		modules/refextract/etc/refextract-report-numbers.kb
P		modules/refextract/lib/Makefile.am Deleted after being copied to multiple locations: modules/docextract/lib/Makefile.am modules/docextract/lib/refextract.py modules/miscutil/lib/upgrades/invenio_2012_11_07_xtrjob_last_recid.py
D		modules/refextract/lib/refextract.py
D		modules/refextract/lib/refextract_authextract_unit_tests.py
D		modules/refextract/lib/refextract_cli.py
D		modules/refextract/lib/refextract_config.py
D		modules/refextract/lib/refextract_daemon.py
D		modules/refextract/lib/refextract_unit_tests.py
M		modules/websearch/lib/search_engine.py
M		modules/websearch/lib/search_engine_query_parser.py
M		modules/websession/lib/inveniogc.py
M		modules/webstyle/lib/webinterface_layout.py