Diffusion invenio-infoscience 47507588c976

Merge branch 'nkasioum/hosted-collections'
47507588c976
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 29 2010, 11:46.

Description

Merge branch 'nkasioum/hosted-collections'

nkasioum/hosted-collections: WebBasket: removed testing debug function WebSearch: fixed issues reported by kwalitee.py WebAlert: fixed issues reported by kwalitee.py WebBasket: fixed issues reported by kwalitee.py WebBasket: export as MARCXML WebSearch: hosted collections timeout fix WebAlert: warning when add_to_basket limit reached WebBasket: code cleanup, docstrings and fixes WebBasket: whitespace fixes WebAlert: add to basket fixes and improvements WebBasket: user interface and engine improvements WebSearch: CDS DEV as a testing hosted collection WebBasket: support for external sources WebAlert: first release of external records WebBasket: first release of external records WebSearch: first release of hosted collections

During merge, updated the following things:
- Added updates to bskEXTREC table.
- Uplugged hosted collections from the demo tree, not to confuse users.
- Fixed traceback in the list of public baskets in case of low number of records.
- Fixed regresion tests.
- Added /display_item URL for backward compatilibity.
- Renamed a few phrases.
- Added missing pictures to the Makefile target.
- Put dummy workaround in place for basket calls in publiline.

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 1 2010, 15:11

Parents

R3600:cf8bd35d163a: WebBasket: removed testing debug function
R3600:eb74c42c753a: WebStat: fix last-year time coordinates in graphs

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:47507588c976: Merge branch 'nkasioum/hosted-collections' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 1 2010, 15:11

Merged Changes

Commit	Author	Details	Committed
cf8bd35d163a	Nikolaos Kasioumis	WebBasket: removed testing debug function	Jan 27 2010
bb223ae43660	Nikolaos Kasioumis	WebSearch: fixed issues reported by kwalitee.py	Jan 25 2010
090414e535a5	Nikolaos Kasioumis	WebAlert: fixed issues reported by kwalitee.py	Jan 22 2010
6921eeb91edd	Nikolaos Kasioumis	WebBasket: fixed issues reported by kwalitee.py	Jan 22 2010
7401d019dd64	Nikolaos Kasioumis	WebBasket: export as MARCXML	Jan 22 2010
e7462d9cc96b	Nikolaos Kasioumis	WebSearch: hosted collections timeout fix	Jan 22 2010
f8adb44e9f59	Nikolaos Kasioumis	WebAlert: warning when add_to_basket limit reached	Jan 22 2010
541dfc19acfb	Nikolaos Kasioumis	WebBasket: code cleanup, docstrings and fixes	Jan 22 2010
565773a9948c	Nikolaos Kasioumis	WebBasket: whitespace fixes	Jan 22 2010
4fba9869ab3c	Nikolaos Kasioumis	WebAlert: add to basket fixes and improvements	Jan 22 2010
39b0468b8d79	Nikolaos Kasioumis	WebBasket: user interface and engine improvements	Jan 22 2010
cb43244456f8	Nikolaos Kasioumis	WebSearch: CDS DEV as a testing hosted collection	Jan 22 2010
7f437ad53735	Nikolaos Kasioumis	WebBasket: support for external sources	Jan 22 2010
a2a43e75f6a6	Nikolaos Kasioumis	WebAlert: first release of external records	Jan 22 2010
2b8748fbb0ed	Nikolaos Kasioumis	WebBasket: first release of external records	Jan 22 2010
2fa42f716fcc	Nikolaos Kasioumis	WebSearch: first release of hosted collections	Jan 22 2010

Changes (52)

				Path
	M			Makefile.am
	M			configure.ac
	M			modules/miscutil/demo/democfgdata.sql
	M			modules/miscutil/sql/tabcreate.sql
	M			modules/webalert/lib/alert_engine.py
	M			modules/webalert/lib/htmlparser.py
	M			modules/webalert/lib/webalert_templates.py
	M			modules/webalert/lib/webalert_webinterface.py
	M			modules/webbasket/lib/webbasket.py
	M			modules/webbasket/lib/webbasket_config.py
	M			modules/webbasket/lib/webbasket_dblayer.py
	M			modules/webbasket/lib/webbasket_regression_tests.py
	M			modules/webbasket/lib/webbasket_templates.py
	M			modules/webbasket/lib/webbasket_webinterface.py
	M			modules/websearch/doc/admin/websearch-admin-guide.webdoc
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_external_collections.py
	M			modules/websearch/lib/websearch_external_collections_config.py
	M			modules/websearch/lib/websearch_external_collections_getter.py
	M			modules/websearch/lib/websearch_external_collections_parser.py
	M			modules/websearch/lib/websearch_external_collections_searcher.py
	M			modules/websearch/lib/websearch_external_collections_utils.py
	M			modules/websearch/lib/websearch_templates.py
	M			modules/websearch/lib/websearch_webcoll.py
	M			modules/websearch/lib/websearchadminlib.py
	M			modules/websearch/web/admin/websearchadmin.py
	M			modules/webstyle/css/invenio.css
	M			modules/webstyle/img/Makefile.am
	A			modules/webstyle/img/wb-add-note.png
	A			modules/webstyle/img/wb-copy-item.png
	A			modules/webstyle/img/wb-create-basket.png
	A			modules/webstyle/img/wb-delete-basket.png
	A			modules/webstyle/img/wb-delete-item.png
	A			modules/webstyle/img/wb-edit-basket.png
	A			modules/webstyle/img/wb-edit-topic.png
	A			modules/webstyle/img/wb-external-item.png
	A			modules/webstyle/img/wb-go-back.png
	A			modules/webstyle/img/wb-move-item-down-disabled.png
	A			modules/webstyle/img/wb-move-item-down.png
	A			modules/webstyle/img/wb-move-item-up-disabled.png
	A			modules/webstyle/img/wb-move-item-up.png
	A			modules/webstyle/img/wb-next-item-disabled.png
	A			modules/webstyle/img/wb-next-item.png
	A			modules/webstyle/img/wb-notes.png
	A			modules/webstyle/img/wb-previous-item-disabled.png
	A			modules/webstyle/img/wb-previous-item.png
	A			modules/webstyle/img/wb-sort-asc.gif
	A			modules/webstyle/img/wb-sort-desc.gif
	A			modules/webstyle/img/wb-sort-none.gif
	A			modules/webstyle/img/wb-subscribe.png
	A			modules/webstyle/img/wb-unsubscribe.png
	M			modules/websubmit/web/publiline.py