Skip to content

Commit

Permalink
Fix keyword search with special character. This fix works on GN devel…
Browse files Browse the repository at this point in the history
…op and does not look to work on geOrchestra's gn.
  • Loading branch information
François Prunayre committed Apr 16, 2014
1 parent 7bbc34c commit d95d116
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
13 changes: 13 additions & 0 deletions web/jetty-context.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!--
This file is used by pom.xml to configure jetty. It disables the jar scan performed by jetty so that startup
is faster
-->

<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Call name="setAttribute">
<Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg>
<Arg>nomatches</Arg>
</Call>
</Configure>
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:exslt="http://exslt.org/common" xmlns:geonet="http://www.fao.org/geonetwork"
xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:srv="http://www.isotc211.org/2005/srv"
xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx"
xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx"
version="2.0" exclude-result-prefixes="exslt">

<xsl:import href="process-utility.xsl"/>


<!-- i18n information -->
<xsl:variable name="add-extent-loc">
<msg id="a" xml:lang="eng">Keyword field contains place keywords (ie. </msg>
Expand All @@ -19,7 +20,7 @@
<xsl:param name="gurl" select="'http://localhost:8080/geonetwork'"/>

<!-- The UI language. Thesaurus search is made according to GUI language -->
<xsl:param name="lang" select="'eng'"/>
<xsl:param name="lang" select="'fre'"/>

<!-- Replace or not existing extent -->
<xsl:param name="replace" select="'0'"/>
Expand Down Expand Up @@ -201,9 +202,9 @@

<xsl:if test="normalize-space($word)!=''">
<!-- Get keyword information -->
<xsl:variable name="keyword" select="document(concat($serviceUrl, $word))"/>
<xsl:variable name="keyword" select="document(concat($serviceUrl, encode-for-uri($word)))"/>
<xsl:variable name="knode" select="exslt:node-set($keyword)"/>

<!-- It should be one but if one keyword is found in more
thant one thesaurus, then each will be processed.-->
<xsl:for-each select="$knode/response/descKeys/keyword">
Expand Down

0 comments on commit d95d116

Please sign in to comment.