Diffusion invenio-infoscience 4edba6238d95

Merge branch 'master' into next
4edba6238d95
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 17 2012, 17:16.

Description

Merge branch 'master' into next

master: WebStyle: fix CFG_INSPIRE_SITE symbol name BibEdit: configurable affiliation autocomplete BibEdit: configurable KB names BibEdit: allow adding subfields 'inline' BibEdit: minor cosmetic refactor BibEdit: JS code refactoring WebStyle: no "Similar records" link for INSPIRE WebSearch: add more SPIRES->Invenio codes InvenioConnector: improve search parameters InvenioConnector: make emulator modules optional BibCatalog: fix abstract class instantiation BibMatch: match validation bibrecord: improve handling of record parser textutils: add transformation of XML entities textutils: add transliteration to ASCII dbquery: switch off GC during SQL execution dbquery: fix regression test depending on year WebAlert: new alert description database field demo site: more references

Conflicts:
modules/bibedit/lib/bibedit_engine.js

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 17 2012, 17:16

Parents

R3600:a1f6e1731fd1: WebStyle: fix CFG_INSPIRE_SITE symbol name
R3600:6c026ff640af: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:4edba6238d95: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 17 2012, 17:16

Merged Changes

Commit	Author	Details	Committed
a1f6e1731fd1	Tibor Simko	WebStyle: fix CFG_INSPIRE_SITE symbol name	Jan 17 2012
2fe5795c96cd	Javier Martin/Tibor Simko	BibEdit: configurable affiliation autocomplete	Jan 17 2012
c0904eadf08f	Javier Martin/Tibor Simko	BibEdit: configurable KB names	Jan 17 2012
b4baee7eb1b2	Javier Martin/Tibor Simko	BibEdit: allow adding subfields 'inline'	Jan 17 2012
9f5b595868bb	Javier Martin/Tibor Simko	BibEdit: minor cosmetic refactor	Jan 17 2012
2bb62d0ed6bb	Javier Martin/Tibor Simko	BibEdit: JS code refactoring	Jan 17 2012
602fda4e15d5	Lewis Barnes/Tibor Simko	WebStyle: no "Similar records" link for INSPIRE	Jan 17 2012
ba3b48e39bde	Jan Aage Lavik/Tibor Simko	WebSearch: add more SPIRES->Invenio codes	Jan 17 2012
f7b5d3451f88	Jan Aage Lavik/Tibor Simko	InvenioConnector: improve search parameters	Jan 17 2012
8192e51b007e	Jan Aage Lavik/Tibor Simko	InvenioConnector: make emulator modules optional	Jan 17 2012
188c1ab470f9	Jan Aage Lavik/Tibor Simko	BibCatalog: fix abstract class instantiation	Jan 17 2012
d39a330c306e	Jan Aage Lavik/Tibor Simko	BibMatch: match validation	Jan 17 2012
91da4331062f	Jan Aage Lavik/Tibor Simko	bibrecord: improve handling of record parser	Jan 17 2012
8137c20ff9bd	Jan Aage Lavik/Tibor Simko	textutils: add transformation of XML entities	Jan 17 2012
87578e17ed33	Jan Aage Lavik/Tibor Simko	textutils: add transliteration to ASCII	Jan 17 2012
7a2b03d232a0	Benoit Thiell/Tibor Simko	dbquery: switch off GC during SQL execution	Jan 17 2012
77fae8bd074e	Tibor Simko	dbquery: fix regression test depending on year	Jan 16 2012
49c3462420e3	Nikolaos Kasioumis/Tibor Simko	WebAlert: new alert description database field	Jan 15 2012
1110bafff338	Marko Niinimaki/Tibor Simko	demo site: more references	Jan 13 2012

Changes (34)

		Path
M		Makefile.am
M		config/invenio.conf
M		configure.ac
M		modules/bibcatalog/doc/hacking/bibcatalog-api.webdoc
M		modules/bibcatalog/lib/bibcatalog.py
M		modules/bibcatalog/lib/bibcatalog_system.py
M		modules/bibcatalog/lib/bibcatalog_templates.py
M		modules/bibedit/lib/bibedit_engine.js
M		modules/bibedit/lib/bibedit_engine.py
M		modules/bibedit/lib/bibrecord.py
M		modules/bibedit/lib/bibrecord_tests.py
M		modules/bibharvest/lib/oai_harvest_daemon.py
M		modules/bibmatch/doc/Makefile.am
M		modules/bibmatch/doc/admin/bibmatch-admin-guide.webdoc
A	(dir)	modules/bibmatch/doc/hacking/
P		modules/bibmatch/doc/hacking/Makefile.am Copied from modules/bibknowledge/doc/hacking/Makefile.am
A		modules/bibmatch/doc/hacking/bibmatch-hacking-guide.webdoc
M		modules/bibmatch/lib/Makefile.am
A		modules/bibmatch/lib/bibmatch_config.py
M		modules/bibmatch/lib/bibmatch_engine.py
M		modules/bibmatch/lib/bibmatch_regression_tests.py
A		modules/bibmatch/lib/bibmatch_tests.py
A		modules/bibmatch/lib/bibmatch_validator.py
M		modules/miscutil/demo/demobibdata.xml
M		modules/miscutil/lib/dbquery.py
M		modules/miscutil/lib/dbquery_regression_tests.py
M		modules/miscutil/lib/invenio_connector.py
M		modules/miscutil/lib/inveniocfg.py
M		modules/miscutil/lib/textutils.py
M		modules/miscutil/lib/textutils_tests.py
M		modules/miscutil/sql/tabcreate.sql
M		modules/websearch/lib/search_engine_query_parser.py
M		modules/websearch/lib/search_engine_query_parser_tests.py
M		modules/webstyle/lib/webstyle_templates.py