Homec4science
Diffusion invenio-infoscience 7df97140b8ee

Merge branch 'master' into next
7df97140b8ee
Actions

Authored by Esteban J. G. Gabancho <esteban.gabancho@gmail.com> on Jul 11 2014, 13:23.

Description

Merge branch 'master' into next

  • master: BibIndex: recjson fields in admin interface BibIndex: indexing non-MARC standards BibIndex: abstraction layer for terms retrieval BibIndex: WordTable API changes BibIndex: move helper functions to utils file
  • Merge note: creation of fixtures and movement of new files will be done in the next commits.

Conflicts:
invenio/legacy/bibindex/adminlib.py
invenio/legacy/bibindex/engine.py
invenio/legacy/bibindex/engine_utils.py
invenio/legacy/search_engine/__init__.py
invenio/modules/indexer/testsuite/test_indexer_engine.py
invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
invenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py
invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
invenio/modules/records/testsuite/fields/atlantis.cfg
invenio/modules/upgrader/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py
modules/bibindex/lib/Makefile.am
modules/bibindex/lib/bibindex_regression_tests.py
modules/bibupload/lib/bibupload_regression_tests.py
modules/websearch/lib/websearch_regression_tests.py

Signed-off-by: Esteban J. G. Gabancho <esteban.gabancho@gmail.com>

Details

Committed
Esteban J. G. Gabancho <esteban.gabancho@gmail.com>Jul 11 2014, 13:23
Parents
R3600:5a10abbcda68: BibIndex: recjson fields in admin interface
R3600:00c560f68a94: base: fix package name and source in bundles
Branches
Unknown
Tags
Unknown

Event Timeline

Esteban J. G. Gabancho <esteban.gabancho@gmail.com> committed R3600:7df97140b8ee: Merge branch 'master' into next (authored by Esteban J. G. Gabancho <esteban.gabancho@gmail.com>).Jul 11 2014, 13:23

Merged Changes

CommitAuthorDetailsCommitted
5a10abbcda68Grzegorz Szpura/Tibor Simko
BibIndex: recjson fields in admin interface 
Jul 10 2014
e0f2ea917543Grzegorz Szpura/Tibor Simko
BibIndex: indexing non-MARC standards 
Jul 10 2014
635d48d23869Grzegorz Szpura/Tibor Simko
BibIndex: abstraction layer for terms retrieval 
Jul 10 2014
fa1d43b0f2b0Grzegorz Szpura/Tibor Simko
BibIndex: WordTable API changes 
Jul 10 2014
5d07f7c8f4a2Grzegorz Szpura/Tibor Simko
BibIndex: move helper functions to utils file 
Jul 10 2014

Changes (27)

Path
Minvenio/legacy/bibindex/adminlib.py
Minvenio/legacy/bibindex/engine.py
Minvenio/legacy/bibindex/engine_utils.py
Minvenio/legacy/bibindex/web/admin/bibindexadmin.py
Minvenio/legacy/miscutil/sql/tabcreate.sql
Minvenio/legacy/miscutil/sql/tabfill.sql
Minvenio/legacy/search_engine/__init__.py
Minvenio/modules/indexer/testsuite/test_indexer_engine.py
Minvenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexFilteringTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
Minvenio/modules/indexer/tokenizers/BibIndexTokenizer.py
Minvenio/modules/records/testsuite/fields/atlantis.cfg
Minvenio/modules/upgrader/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py
A(dir)modules/bibfield/
A(dir)modules/bibfield/lib/
A(dir)modules/bibfield/lib/functions/
Pmodules/bibfield/lib/functions/get_pubinfo_standard_form.py
Copied from invenio/modules/formatter/testsuite/format_elements/bfe_test_6.py
A(dir)modules/bibindex/
A(dir)modules/bibindex/lib/
Amodules/bibindex/lib/bibindex_termcollectors.py

R3600:7df97140b8ee

View Options

invenio/legacy/bibindex/adminlib.py

Loading...
View Options

invenio/legacy/bibindex/engine.py

Loading...
View Options

invenio/legacy/bibindex/engine_utils.py

Loading...
View Options

invenio/legacy/bibindex/web/admin/bibindexadmin.py

Loading...
View Options

invenio/legacy/miscutil/sql/tabcreate.sql

Loading...
View Options

invenio/legacy/miscutil/sql/tabfill.sql

Loading...
View Options

invenio/legacy/search_engine/__init__.py

Loading...
View Options

invenio/modules/indexer/testsuite/test_indexer_engine.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexDOITokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexFilteringTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexFulltextTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py

Loading...
View Options

invenio/modules/indexer/tokenizers/BibIndexTokenizer.py

Loading...
View Options

invenio/modules/records/testsuite/fields/atlantis.cfg

Loading...
View Options

invenio/modules/upgrader/upgrades/invenio_2013_03_20_idxINDEX_synonym_kb.py

Loading...
View Options

modules/bibfield/lib/functions/get_pubinfo_standard_form.py

Loading...
View Options

modules/bibindex/lib/bibindex_termcollectors.py

Loading...
c4science · Help