Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull request to synch with geonetwork/core-geonetwork repository #4

Merged
merged 21 commits into from
Dec 17, 2012
Merged

Pull request to synch with geonetwork/core-geonetwork repository #4

merged 21 commits into from
Dec 17, 2012

Conversation

josegar74
Copy link
Owner

No description provided.

François Prunayre and others added 21 commits December 5, 2012 12:00
Add faceted search (http://trac.osgeo.org/geonetwork/wiki/NarrowYourS…
f34170a 
…earchWidget)

Squashed commit of the following:

commit 4c657cc
Merge: a7076d5 cb91c41
Author: François Prunayre <[email protected]>
Date:   Wed Dec 5 09:54:14 2012 +0100

    Merge remote-tracking branch 'upstream/master' into feature/lucene-facet

    Conflicts:
    	pom.xml
    	web-client/src/main/resources/apps/search/js/App.js
    	web/src/main/java/org/fao/geonet/kernel/search/LuceneConfig.java
    	web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/index-fields.xsl

commit a7076d5
Author: François Prunayre <[email protected]>
Date:   Thu Nov 15 19:18:13 2012 +0100

    Avoid NPE on taxonomy writer.

commit c97a9ed
Author: François Prunayre <[email protected]>
Date:   Wed Oct 31 13:41:32 2012 +0100

    Fix geometry indexing.

commit 7422980
Author: François Prunayre <[email protected]>
Date:   Wed Oct 10 17:03:50 2012 +0200

    IE fix for FacetPanel.

commit 1859483
Author: François Prunayre <[email protected]>
Date:   Tue Oct 9 13:56:31 2012 +0200

    Add more/less option if too many values available and clean CSS for facet widget.

commit d0ff79a
Author: François Prunayre <[email protected]>
Date:   Fri Oct 5 17:52:23 2012 +0200

    Fix call getFieldInfos() on each sub reader exception on GetDomain operation.

commit 730d3e6
Merge: 1f4591c 815eeae
Author: François Prunayre <[email protected]>
Date:   Fri Oct 5 14:55:53 2012 +0200

    Merge remote-tracking branch 'upstream/master' into feature/lucene-facet

    Conflicts:
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/widgets/SearchFormPanel.js
    	web-client/src/main/resources/apps/search/js/App.js

commit 1f4591c
Merge: 0e7f846 18b27ac
Author: François Prunayre <[email protected]>
Date:   Fri Oct 5 14:53:28 2012 +0200

    Merge remote-tracking branch 'upstream/master' into feature/lucene-facet

    Conflicts:
    	pom.xml
    	web/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java

commit 0e7f846
Author: François Prunayre <[email protected]>
Date:   Mon Sep 24 14:51:59 2012 +0200

    Add permalink capability for facetted search

    Remove duplicate labels.
    Add facet styling CSS class.
    Add the capability to populate search form based on URL parameters (eg. add non existing search criteria to the search form as text input - this could be facet filter).

commit 0eeb64f
Author: François Prunayre <[email protected]>
Date:   Mon Sep 17 12:52:52 2012 +0200

    Add FacetPanels documentation

commit 7fb7a96
Author: François Prunayre <[email protected]>
Date:   Thu Sep 13 10:47:42 2012 +0200

    Add FacetConfig instead of HashMap. Add sort by and sort order option for text and numeric field.

commit 96b2e0e
Author: François Prunayre <[email protected]>
Date:   Wed Sep 12 17:45:23 2012 +0200

    Add facet configuration in settings for the JS apps.

commit a4a6b7b
Author: François Prunayre <[email protected]>
Date:   Tue Sep 11 14:00:10 2012 +0200

    Use a simple store for current active filters.

commit 988f98a
Merge: 76e88f8 7838788
Author: François Prunayre <[email protected]>
Date:   Tue Sep 11 13:59:26 2012 +0200

    Merge remote-tracking branch 'upstream/master' into feature/lucene-facet

    Conflicts:
    	pom.xml
    	web-client/src/main/resources/apps/css/gndefault.css
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/en.js
    	web-client/src/main/resources/apps/search/js/App.js
    	web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java

commit 76e88f8
Author: François Prunayre <[email protected]>
Date:   Tue Sep 11 10:50:51 2012 +0200

    Add facet switcher.

commit bf0218c
Author: François Prunayre <[email protected]>
Date:   Mon Sep 10 10:40:47 2012 +0200

    Use Lucene terminology in configuration for facet sort options. Improve good defaults for easier configuration.

commit a4520b4
Author: François Prunayre <[email protected]>
Date:   Mon Sep 10 10:37:12 2012 +0200

    Index need to be fully rebuilt for taxonomy to be refreshed.

commit 1e0101b
Author: François Prunayre <[email protected]>
Date:   Mon Sep 10 10:36:30 2012 +0200

    Add creation and revision date year and month index fields.

commit 5016a03
Author: François Prunayre <[email protected]>
Date:   Thu Sep 6 18:16:29 2012 +0200

    Add a specific logger for facet.

commit 0910e66
Author: François Prunayre <[email protected]>
Date:   Thu Sep 6 18:15:51 2012 +0200

    Fix CSW paging when summary is computed.

commit 49320f7
Author: François Prunayre <[email protected]>
Date:   Wed Sep 5 08:30:31 2012 +0200

    Add support for more than one facet on a field.

    Do not display a facet if part of current filters.
    Add client side configuration for facet to be displayed.

commit a83d334
Author: François Prunayre <[email protected]>
Date:   Tue Sep 4 18:40:45 2012 +0200

    Update to Lucene 3.6.1 API.

commit b087dd3
Author: François Prunayre <[email protected]>
Date:   Wed Aug 1 08:13:14 2012 +0200

    Add new examples.

commit 14d424d
Author: François Prunayre <[email protected]>
Date:   Wed Aug 1 08:08:48 2012 +0200

    Move summary config to LuceneConfig.
    Properly close/commit taxonomyReader/Writer with Reader/Writer.

commit 9ed0505
Author: François Prunayre <[email protected]>
Date:   Wed Aug 1 08:07:40 2012 +0200

    Move summary config to LuceneConfig.
    Properly close/commit taxonomyReader/Writer with Reader/Writer.

commit 2b4549e
Author: François Prunayre <[email protected]>
Date:   Wed Aug 1 08:03:52 2012 +0200

    Add a chart example.

commit 8dac9df
Author: François Prunayre <[email protected]>
Date:   Tue Jul 31 08:47:09 2012 +0200

    Indexing errors / flag common types of errors.
    Add support for numeric value boosting.

commit 5bb5a7f
Merge: 7c29331 fc2536f
Author: François Prunayre <[email protected]>
Date:   Wed Jul 4 07:36:50 2012 +0200

    Merge branch 'master' into feature/lucene-facet

    Conflicts:
    	web/src/main/java/org/fao/geonet/kernel/search/LuceneIndexReaderFactory.java
    	web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java

commit 7c29331
Merge: 7b0e4b0 50714ab
Author: François Prunayre <[email protected]>
Date:   Tue Jul 3 20:03:51 2012 +0200

    Lucene faceted search.

commit 50714ab
Author: François Prunayre <[email protected]>
Date:   Fri Jun 22 21:09:29 2012 +0200

    Add draft implementation of faceted search widgets.

commit 34b7d76
Author: François Prunayre <[email protected]>
Date:   Fri Jun 22 18:56:52 2012 +0200

    Fix exception.

commit 9d6b9a0
Author: François Prunayre <[email protected]>
Date:   Fri Jun 15 18:53:34 2012 +0200

    Add a default taxonomy configuration.

commit 584b21a
Author: François Prunayre <[email protected]>
Date:   Fri Jun 15 18:47:34 2012 +0200

    Add Lucene taxonomy support. Upgrade default Lucene version to 34.

commit 52a3c16
Author: François Prunayre <[email protected]>
Date:   Fri Jun 15 17:41:41 2012 +0200

    Add lucene-facet dependency
Restore GeoServer submodule.
8160aa0
WFS Data downloader and WMS layer improvements.
595f23a 
* See http://trac.osgeo.org/geonetwork/wiki/proposals/WFSDataDownloader
* Map / WMS info panel / Add link to metadata (#1108)
* Only activate layer metadata info action when layer is WMS (#1074)
* Map / WMS info panel / Add metadata URL when available (#1076)

Squashed commit of the following:

commit 9c18667
Merge: 6d2224f 8160aa0
Author: François Prunayre <[email protected]>
Date:   Wed Dec 5 13:19:37 2012 +0100

    Merge remote-tracking branch 'upstream/master' into feature/download-wfs

commit 6d2224f
Merge: b9094bf f34170a
Author: François Prunayre <[email protected]>
Date:   Wed Dec 5 13:12:30 2012 +0100

    Merge remote-tracking branch 'upstream/master' into feature/download-wfs

    Conflicts:
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/en.js

commit b9094bf
Author: François Prunayre <[email protected]>
Date:   Wed Oct 10 17:29:08 2012 +0200

    Fix wrong merge.

commit 97ce4dd
Author: François Prunayre <[email protected]>
Date:   Wed Oct 10 15:49:09 2012 +0200

    Map / WMS info panel / Add link to metadata (#1108).

commit daf4be1
Author: François Prunayre <[email protected]>
Date:   Wed Oct 10 13:06:31 2012 +0200

    Improve label for link website.

commit a0320a2
Merge: 5af14ff 74d1128
Author: François Prunayre <[email protected]>
Date:   Wed Oct 10 12:26:48 2012 +0200

    Merge remote-tracking branch 'upstream/master' into feature/download-wfs

    Conflicts:
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork.js
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/de.js
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/en.js
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/fr.js
    	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/nl.js
    	web-client/src/main/resources/apps/js/OpenLayers/lib/OpenLayers.js
    	web-client/src/main/resources/apps/search/js/map/MapApp.js

commit 5af14ff
Author: François Prunayre <[email protected]>
Date:   Wed Sep 26 09:32:50 2012 +0200

    Map / WMS info panel / Add metadata URL when available (#1076).

commit 28668ec
Author: François Prunayre <[email protected]>
Date:   Tue Sep 25 17:13:54 2012 +0200

    Widgets / Map / Missing choose style and time option for a WMS (#1048).
    Only activate layer metadata info action when layer is WMS (#1074).

commit 8352674
Author: François Prunayre <[email protected]>
Date:   Tue Sep 25 15:44:08 2012 +0200

    Improve feature type store. Update map feature when updating coordinates. Improve GetFeature URL.

commit 108f129
Merge: 495e78b 059502e
Author: François Prunayre <[email protected]>
Date:   Tue Sep 25 10:58:53 2012 +0200

    Merge remote-tracking branch 'upstream/master' into feature/download-wfs

commit 495e78b
Author: François Prunayre <[email protected]>
Date:   Tue Sep 25 10:58:32 2012 +0200

    Add dutch translation.

commit 786de55
Author: François Prunayre <[email protected]>
Date:   Tue Sep 25 09:49:12 2012 +0200

    Add translation for WFS extrator widget.

commit 8b2a7f5
Author: François Prunayre <[email protected]>
Date:   Tue Sep 25 09:30:19 2012 +0200

    Improve error handling. Load only once the GetCapabilities. Add simple utility to display message.

commit 621afcc
Merge: 49f2367 c876e99
Author: François Prunayre <[email protected]>
Date:   Mon Sep 24 18:00:31 2012 +0200

    Merge remote-tracking branch 'upstream/master' into feature/dowload-wfs

commit 49f2367
Author: François Prunayre <[email protected]>
Date:   Mon Sep 17 19:11:29 2012 +0200

    Add control to draw extraction area on the map.

commit 4cbed73
Author: François Prunayre <[email protected]>
Date:   Mon Sep 17 19:07:14 2012 +0200

    Add WFS data downloader to JS build

commit de3b5eb
Author: François Prunayre <[email protected]>
Date:   Mon Sep 17 16:00:35 2012 +0200

    More error checks. Add version selection combo. Create button instead of simple link.

commit 02c89ba
Author: François Prunayre <[email protected]>
Date:   Wed Sep 12 13:38:44 2012 +0200

    Improve labels. Add map panel to define AOI.

commit 08c1752
Author: François Prunayre <[email protected]>
Date:   Wed Sep 12 11:22:30 2012 +0200

    Add WFS extractor draft implementation
@josegar74
Fix variable name in INSPIRE schematron rule
df498aa
PDF output / search results / avoid page break in a result item (#1176).
a1b5d1a
less verbose isAccessible implementation and slightly more performant
bd9f926
@josegar74
#1137 Hovering over "+" symbol in editor displays "Add add"
fe702a5
make default lang first and therefore the default visible in editor
e65bba7
minified files are not output in war if there has not been a previous…
4335d73 
… build.
@josegar74
Comment invalid comparison operators according to INSPIRE
6096c19
@josegar74
Merge remote branch 'origin/master'
43bcd1f
check file timestamp to see if favicon and dummy image need to be loaded
2a9b92a 
The favicon was cached which broke the logo management functionality.  Now the files like favicon and dummy image are checked to see if a newer version is on disk.
If the timestamp on the file indicates that it is newer than the version in the cache then file is loaded again.
fixed commented xml code in ita
a3df44d 
fixed xml within a comment block so if block is uncommented it works
italian codelist label one line
56da096 
If a codelist is put in javascript line breaks are very problematic.  This change allows the codelists to be in the javascript, perhaps for refine search UI
@josegar74
#1178 New UI - Display default pointer in search results, except for …
55d9e31 
…links/actions (display hand pointer)
@josegar74
INSPIRE test suite (http://testsuite.gdi-de.org/gdi/) seem not agnost…
e88f443 
…ic about namespace prefix for http://inspire.ec.europa.eu/schemas/common/1.0 and requires inspire_com prefix
@mcpgovernance
Fix for ticket #1088 - thanks to bjohare
d7784e1
fixed job scheduling
e80172e
improve getting help. first try with context and then parent as conte…
0275c4f 
…xt then fall back to name alone
@mcpgovernance
Add sample config file for jetty to access JNDIPool
a6e0c7b
@mcpgovernance
Include changes to jetty cherry-picked from 2.8.x
81687f8
josegar74 added a commit that referenced this pull request Dec 17, 2012
@josegar74
Merge pull request #4 from geonetwork/master
86702de 
Pull request to synch with geonetwork/core-geonetwork repository
@josegar74 josegar74 merged commit 86702de into josegar74:master Dec 17, 2012
josegar74 pushed a commit that referenced this pull request Apr 14, 2014
Merge pull request #4 from fxprunayre/feature/multinodes-mode
285b537 
Align to develop. Fix login/logout in widget apps
josegar74 pushed a commit that referenced this pull request Jan 26, 2015
@fgravin
Merge pull request #4 from pgiraud/context_save_map_not_init
28689cb 
Don't save a map if map is not already rendered
josegar74 pushed a commit that referenced this pull request Jul 12, 2017
Merge pull request #4 from josegar74/2.10.x_zaanstad
db8fc98 
Update of gmd:MD_Constraints element in update process and gmd:code in update-fixed-info process
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@josegar74 @mcpgovernance