Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[4724] sandbox/BlueNetMEST
|
From: <sp...@us...> - 2009-07-30 14:48:23
|
Revision: 4724
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=4724&view=rev
Author: sppigot
Date: 2009-07-30 14:48:12 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
Fixes from emii - thanks to Craig Jones and Penny Lyle
r633, r636, r646, r650, r651, r752, r754, r755, r773
Modified Paths:
--------------
sandbox/BlueNetMEST/jeeves/src/jeeves/utils/XmlRequest.java
sandbox/BlueNetMEST/src/org/fao/geonet/kernel/search/SearchManager.java
sandbox/BlueNetMEST/src/org/fao/oaipmh/requests/Transport.java
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/user-profiles.xml
sandbox/BlueNetMEST/web/geonetwork/loc/en/xml/strings.xml
sandbox/BlueNetMEST/web/geonetwork/scripts/geonetwork.js
sandbox/BlueNetMEST/web/geonetwork/scripts/gn_search.js
sandbox/BlueNetMEST/web/geonetwork/xml/schemas/iso19139.mcp/update-fixed-info.xsl
sandbox/BlueNetMEST/web/geonetwork/xsl/admin.xsl
sandbox/BlueNetMEST/web/geonetwork/xsl/main-page.xsl
sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-iso19139.xsl
sandbox/BlueNetMEST/web/geonetwork/xsl/searchform_advanced.xsl
sandbox/BlueNetMEST/web/geonetwork/xsl/simplemetadata.xsl
sandbox/BlueNetMEST/web/geonetwork/xsl/user-selfregistration.xsl
Added Paths:
-----------
sandbox/BlueNetMEST/src/org/fao/geonet/services/metadata/IndexRebuild.java
Modified: sandbox/BlueNetMEST/jeeves/src/jeeves/utils/XmlRequest.java
===================================================================
--- sandbox/BlueNetMEST/jeeves/src/jeeves/utils/XmlRequest.java 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/jeeves/src/jeeves/utils/XmlRequest.java 2009-07-30 14:48:12 UTC (rev 4724)
@@ -190,6 +190,8 @@
AuthScope scope= new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT, AuthScope.ANY_REALM);
client.getState().setProxyCredentials(scope, cred);
+
+ proxyAuthent = true;
}
//---------------------------------------------------------------------------
@@ -277,7 +279,7 @@
post.setRequestEntity(new MultipartRequestEntity(parts, post.getParams()));
post.addRequestHeader("Accept", !useSOAP ? "application/xml" : "application/soap+xml");
post.setPath(address);
- post.setDoAuthentication(useAuthent);
+ post.setDoAuthentication(useAuthent());
//--- execute request
@@ -298,7 +300,7 @@
client.getState().setCredentials(scope, cred);
- useAuthent = true;
+ serverAuthent = true;
}
//---------------------------------------------------------------------------
@@ -418,7 +420,7 @@
}
httpMethod.setPath(address);
- httpMethod.setDoAuthentication(useAuthent);
+ httpMethod.setDoAuthentication(useAuthent());
return httpMethod;
}
@@ -506,6 +508,12 @@
}
//---------------------------------------------------------------------------
+
+ private boolean useAuthent() {
+ return proxyAuthent||serverAuthent;
+ }
+
+ //---------------------------------------------------------------------------
//---
//--- Variables
//---
@@ -514,14 +522,15 @@
private String host;
private int port;
private String address;
+ private boolean serverAuthent;
private String query;
private Method method;
private boolean useSOAP;
- private boolean useAuthent;
private Element postParams;
private boolean useProxy;
private String proxyHost;
private int proxyPort;
+ private boolean proxyAuthent;
private HttpClient client = new HttpClient();
private HttpState state = new HttpState();
Modified: sandbox/BlueNetMEST/src/org/fao/geonet/kernel/search/SearchManager.java
===================================================================
--- sandbox/BlueNetMEST/src/org/fao/geonet/kernel/search/SearchManager.java 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/src/org/fao/geonet/kernel/search/SearchManager.java 2009-07-30 14:48:12 UTC (rev 4724)
@@ -32,6 +32,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
+import jeeves.resources.dbms.Dbms;
import jeeves.utils.Log;
import jeeves.utils.Xml;
@@ -46,6 +47,7 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermEnum;
import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
import com.k_int.IR.Searchable;
@@ -445,6 +447,28 @@
}
}
+ /*
+ * Rebuild the Lucene index
+ *
+ * @param dataMan
+ * @param dbms
+ *
+ */
+ public boolean rebuildIndex(DataManager dataMan, Dbms dbms) {
+ try {
+ setupIndex(true);
+ dataMan.init(dbms, true);
+ return true;
+ } catch (Exception e) {
+ Log.error(Geonet.SEARCH_ENGINE,
+ "Exception while rebuilding lucene index, going to rebuild it: "
+ + e.getMessage());
+ return false;
+ }
+ }
+
+
+
// creates a new document
private Document newDocument(Element xml)
{
Added: sandbox/BlueNetMEST/src/org/fao/geonet/services/metadata/IndexRebuild.java
===================================================================
--- sandbox/BlueNetMEST/src/org/fao/geonet/services/metadata/IndexRebuild.java (rev 0)
+++ sandbox/BlueNetMEST/src/org/fao/geonet/services/metadata/IndexRebuild.java 2009-07-30 14:48:12 UTC (rev 4724)
@@ -0,0 +1,78 @@
+//=============================================================================
+//=== Copyright (C) 2001-2005 Food and Agriculture Organization of the
+//=== United Nations (FAO-UN), United Nations World Food Programme (WFP)
+//=== and United Nations Environment Programme (UNEP)
+//===
+//=== This program is free software; you can redistribute it and/or modify
+//=== it under the terms of the GNU General Public License as published by
+//=== the Free Software Foundation; either version 2 of the License, or (at
+//=== your option) any later version.
+//===
+//=== This program is distributed in the hope that it will be useful, but
+//=== WITHOUT ANY WARRANTY; without even the implied warranty of
+//=== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//=== General Public License for more details.
+//===
+//=== You should have received a copy of the GNU General Public License
+//=== along with this program; if not, write to the Free Software
+//=== Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//===
+//=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+//=== Rome - Italy. email: Geo...@fa...
+//==============================================================================
+
+package org.fao.geonet.services.metadata;
+
+import jeeves.constants.Jeeves;
+import jeeves.interfaces.Service;
+import jeeves.resources.dbms.Dbms;
+import jeeves.server.ServiceConfig;
+import jeeves.server.context.ServiceContext;
+
+import org.fao.geonet.GeonetContext;
+import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.kernel.DataManager;
+import org.fao.geonet.kernel.search.SearchManager;
+import org.jdom.Element;
+
+//=============================================================================
+
+/** Force rebuild Lucene index
+ */
+
+public class IndexRebuild implements Service
+{
+ //--------------------------------------------------------------------------
+ //---
+ //--- Init
+ //---
+ //--------------------------------------------------------------------------
+
+ public void init(String appPath, ServiceConfig params) throws Exception {}
+
+ //--------------------------------------------------------------------------
+ //---
+ //--- Service
+ //---
+ //--------------------------------------------------------------------------
+
+ public Element exec(Element params, ServiceContext context) throws Exception
+ {
+ GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME);
+
+ SearchManager searchMan = gc.getSearchmanager();
+ DataManager dataMan = gc.getDataManager();
+ Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB);
+
+ boolean info = searchMan.rebuildIndex(dataMan, dbms);
+
+ Element elResp = new Element(Jeeves.Elem.RESPONSE);
+ elResp.addContent(new Element("status").setText((info?"true":"false")));
+
+ return elResp;
+ };
+}
+
+//=============================================================================
+
+
Modified: sandbox/BlueNetMEST/src/org/fao/oaipmh/requests/Transport.java
===================================================================
--- sandbox/BlueNetMEST/src/org/fao/oaipmh/requests/Transport.java 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/src/org/fao/oaipmh/requests/Transport.java 2009-07-30 14:48:12 UTC (rev 4724)
@@ -158,6 +158,8 @@
if (username == null || username.trim().length() == 0)
return;
+ this.proxyAuthent = true;
+
Credentials cred = new UsernamePasswordCredentials(username, password);
AuthScope scope= new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT, AuthScope.ANY_REALM);
@@ -168,7 +170,7 @@
public void setCredentials(String username, String password)
{
- this.useAuthent = (username != null);
+ this.serverAuthent = (username != null);
if (username != null)
{
@@ -226,7 +228,7 @@
}
httpMethod.setPath(address);
- httpMethod.setDoAuthentication(useAuthent);
+ httpMethod.setDoAuthentication(useAuthent());
return httpMethod;
}
@@ -295,6 +297,12 @@
}
catch (UnsupportedEncodingException e) {}
}
+
+ //---------------------------------------------------------------------------
+
+ private boolean useAuthent() {
+ return proxyAuthent||serverAuthent;
+ }
//---------------------------------------------------------------------------
//---
@@ -306,10 +314,11 @@
private int port;
private String address;
private Method method;
- private boolean useAuthent;
+ private boolean serverAuthent;
private boolean useProxy;
private String proxyHost;
private int proxyPort;
+ private boolean proxyAuthent;
private HttpClient client = new HttpClient();
private HttpState state = new HttpState();
Modified: sandbox/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml 2009-07-30 14:48:12 UTC (rev 4724)
@@ -335,6 +335,15 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <service name="metadata.admin.index.rebuild">
+ <documentation>
+ <para>Service to force a complete rebuild of Lucene index</para>
+ </documentation>
+ <class name=".services.metadata.IndexRebuild" />
+ </service>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
<service name="metadata.admin.form">
<class name=".services.metadata.GetAdminOper"/>
Modified: sandbox/BlueNetMEST/web/geonetwork/WEB-INF/user-profiles.xml
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/WEB-INF/user-profiles.xml 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/WEB-INF/user-profiles.xml 2009-07-30 14:48:12 UTC (rev 4724)
@@ -67,6 +67,8 @@
<allow service="config"/>
<allow service="xml.config.get"/>
<allow service="xml.config.set"/>
+
+ <allow service="metadata.admin.index.rebuild"/>
</profile>
<!-- ====================================================================== -->
Modified: sandbox/BlueNetMEST/web/geonetwork/loc/en/xml/strings.xml
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/loc/en/xml/strings.xml 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/loc/en/xml/strings.xml 2009-07-30 14:48:12 UTC (rev 4724)
@@ -15,8 +15,8 @@
<dataCommonsUrl>http://bluenet.antcrc.utas.edu.au/datacommons</dataCommonsUrl>
<!-- Self registration strings -->
<registerTitle>Self-Registration Form</registerTitle>
- <profileChoice value="RegisteredUser">Registered user</profileChoice>
- <profileChoice value="Editor">Editor</profileChoice>
+ <profileChoice value="RegisteredUser" available="true">Registered user</profileChoice>
+ <profileChoice value="Editor" available="true">Editor</profileChoice>
<profileChoice value="Reviewer">Content reviewer</profileChoice>
<profileChoice value="UserAdmin">User administrator</profileChoice>
<profileChoice value="Administrator">Administrator</profileChoice>
@@ -29,8 +29,14 @@
<spacesNot js="true">Spaces in this field are not allowed</spacesNot>
<emailAddressInvalid js="true">Email address is invalid</emailAddressInvalid>
<!-- form help strings -->
+ <dataparamHelp>Start typing in the data parameter field to retrieve data parameters from the metadata</dataparamHelp>
<keywordsHelp>Start typing in the keywords field to retrieve keywords from the metadata</keywordsHelp>
<keywordsHelpRemote>Enter a keyword (Australian users of Marine data should use the Keyword MARINE to limit the remote search)</keywordsHelpRemote>
+ <metadata.admin.index>Index manager</metadata.admin.index>
+ <metadata.admin.index.desc>Rebuild Lucene index</metadata.admin.index.desc>
+ <metadata.admin.index.success js="true">Rebuild index operation was successful.</metadata.admin.index.success>
+ <metadata.admin.index.failed js="true">Failed to rebuild index.</metadata.admin.index.failed>
+ <rebuild>Rebuild</rebuild>
<!-- new strings -->
<fuzzy>Spelling match</fuzzy>
<fuzzySearch>Set the precision of the search (from exact term search to fuzzy search).</fuzzySearch>
@@ -166,7 +172,7 @@
<confirmMassiveDelete>Are you sure you want to Delete all selected Metadata from the Database?</confirmMassiveDelete>
<confirmPassword>Confirm password</confirmPassword>
<confirmNewPassword>Confirm new password</confirmNewPassword>
- <constraintsTab>Constraints</constraintsTab>
+ <constraintsTab>Metadata Re-use</constraintsTab>
<contactUs>Contact us</contactUs>
<contentInfoTab>Content Info</contentInfoTab>
<convert>Convert</convert>
Modified: sandbox/BlueNetMEST/web/geonetwork/scripts/geonetwork.js
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/scripts/geonetwork.js 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/scripts/geonetwork.js 2009-07-30 14:48:12 UTC (rev 4724)
@@ -100,6 +100,37 @@
Modalbox.show(getGNServiceURL(service),{height: 400, width: 600, params: f.serialize(true)});
}
+ function idxRebuild(service){
+ $('wait').style.display = 'block';
+ $('btIdx').style.display = 'none';
+ var http = new Ajax.Request(
+ getGNServiceURL(service),
+ {
+ method: 'get',
+ parameters: null,
+ onComplete: function(originalRequest){},
+ onLoaded: function(originalRequest){},
+ onSuccess: function(originalRequest){
+ // get the XML root item
+ var root = originalRequest.responseXML.documentElement;
+
+ var resp = root.getElementsByTagName('status')[0].firstChild.nodeValue;
+ $('wait').style.display = 'none';
+ $('btIdx').style.display = 'block';
+ if (resp == "true")
+ alert (i18n('metadata.admin.index.success'));
+ else
+ alert(i18n('metadata.admin.index.failed'));
+ },
+ onFailure: function(originalRequest){
+ $('wait').style.display = 'none';
+ $('btIdx').style.display = 'block';
+ alert(i18n('metadata.admin.index.failed'));
+ }
+ }
+ );
+ }
+
function feedbackSubmit()
{
var f = $('feedbackf');
Modified: sandbox/BlueNetMEST/web/geonetwork/scripts/gn_search.js
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/scripts/gn_search.js 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/scripts/gn_search.js 2009-07-30 14:48:12 UTC (rev 4724)
@@ -131,7 +131,7 @@
*
********************************************************************/
-function showRemoteSearch()
+function showRemoteSearch(search)
{
var myAjax = new Ajax.Updater (
'remotesearch',
@@ -140,7 +140,10 @@
method: 'get',
onComplete: function()
{
- initRemoteSearch();
+ initRemoteSearch();
+ if (search == 'true') {
+ runRemoteSearch();
+ }
},
onFailure: im_load_error
}
@@ -148,7 +151,7 @@
}
-function showAdvancedSearch()
+function showAdvancedSearch(search)
{
var myAjax = new Ajax.Updater (
'advancedsearch',
@@ -158,7 +161,10 @@
evalScripts: true,
onComplete: function()
{
- initAdvancedSearch();
+ initAdvancedSearch();
+ if (search == 'true') {
+ runAdvancedSearch();
+ }
},
onFailure: im_load_error
}
@@ -166,7 +172,7 @@
}
-function showSimpleSearch()
+function showSimpleSearch(search)
{
var myAjax = new Ajax.Updater (
'simplesearch',
@@ -175,7 +181,10 @@
method: 'get',
onComplete: function()
{
- initSimpleSearch();
+ initSimpleSearch();
+ if (search == 'true') {
+ runSimpleSearch();
+ }
},
onFailure: im_load_error
}
Modified: sandbox/BlueNetMEST/web/geonetwork/xml/schemas/iso19139.mcp/update-fixed-info.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xml/schemas/iso19139.mcp/update-fixed-info.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xml/schemas/iso19139.mcp/update-fixed-info.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -253,7 +253,7 @@
<!-- test and see whether we need to add a metadata URL to the
distributionInfo -->
- <xsl:template match="gmd:MD_DigitalTransferOptions[ancestor::gmd:distributionInfo]">
+ <xsl:template match="gmd:transferOptions[ancestor::gmd:distributionInfo and position()=1]/gmd:MD_DigitalTransferOptions">
<xsl:copy>
<xsl:copy-of select="@*"/>
<xsl:apply-templates select="gmd:unitsOfDistribution"/>
Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/admin.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xsl/admin.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xsl/admin.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -131,6 +131,12 @@
<td class="padded"><xsl:value-of select="/root/gui/strings/localizDes"/></td>
</tr>
</xsl:if>
+
+
+ <xsl:if test="/root/gui/services/service/@name='metadata.admin.index.rebuild'">
+ <xsl:call-template name="admin-index"/>
+ </xsl:if>
+
</xsl:variable>
<xsl:if test="$adminServices">
<tr>
@@ -146,4 +152,23 @@
</xsl:call-template>
</xsl:template>
+
+
+ <!-- ================================================================================= -->
+
+ <xsl:template name="admin-index">
+
+ <tr>
+ <td class="padded"><xsl:value-of select="/root/gui/strings/metadata.admin.index"/></td>
+ <td>
+ <form name="rebuild" accept-charset="UTF-8" action="{/root/gui/locService}/metadata.admin.index.rebuild" method="post">
+ <xsl:value-of select="/root/gui/strings/metadata.admin.index.desc"/>
+ </form>
+ <button class="content" onclick="idxRebuild('metadata.admin.index.rebuild')" id="btIdx" name="btIdx"><xsl:value-of select="/root/gui/strings/rebuild"/></button>
+ <img src="{/root/gui/url}/images/loading.gif" id="wait" style="display:none;"/>
+ </td>
+ </tr>
+
+ </xsl:template>
+
</xsl:stylesheet>
Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/main-page.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xsl/main-page.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xsl/main-page.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -54,6 +54,7 @@
<xsl:variable name="wmc"><xsl:copy-of select="/root/request/wmc"/></xsl:variable>
<xsl:variable name="uuid"><xsl:copy-of select="/root/request/uuid"/></xsl:variable>
<xsl:variable name="tab"><xsl:copy-of select="/root/request/tab"/></xsl:variable>
+ <xsl:variable name="search"><xsl:copy-of select="/root/request/search"/></xsl:variable>
<script type="text/javascript" language="JavaScript1.2">
@@ -61,25 +62,26 @@
{
var requestTab="<xsl:value-of select="$tab"/>";
var currentSearch = get_cookie('search');
+ var search="<xsl:value-of select="$search"/>";
<!-- show tab requested otherwise show last tab selected -->
if (requestTab == 'simple') {
- doSimpleSearchTab(1,4);
+ doSimpleSearchTab(1,5,search);
} else if (requestTab == 'advanced') {
- doAdvancedSearchTab(2,5);
+ doAdvancedSearchTab(2,5,search);
} else if (requestTab == 'remote') {
- doRemoteSearchTab(3,4);
+ doRemoteSearchTab(3,5,search);
} else if (requestTab == 'mapviewer') {
- doMapViewerTab(4,4);
+ doMapViewerTab(4,5);
} else if (currentSearch == 'advanced') {
- doAdvancedSearchTab(2,4);
+ doAdvancedSearchTab(2,5,search);
} else if (currentSearch == 'remote') {
- doRemoteSearchTab(3,5);
+ doRemoteSearchTab(3,5,search);
} else if (currentSearch == 'mapviewer') {
doMapViewerTab(4,5);
} else if (currentSearch == 'lucene') {
doLuceneSearchTab(5,5);
} else {
- doSimpleSearchTab(1,5);
+ doSimpleSearchTab(1,5,search);
$('resultList').show();
}
<!-- If a UUID is passed, it will be opened within the AJAX page -->
@@ -150,12 +152,12 @@
}
}
- function doSimpleSearchTab(myPos,numTabs) {
+ function doSimpleSearchTab(myPos,numTabs,search) {
toggleTab(myPos,numTabs);
clearNode('advancedsearch');
clearNode('remotesearch');
clearNode('lucenesearch');
- showSimpleSearch();
+ showSimpleSearch(search);
gn_updateRecentAdditions();
// IE needs a refresh of the mini map after changing tabs
if ( Prototype.Browser.IE ) {
@@ -169,12 +171,12 @@
}
}
- function doAdvancedSearchTab(myPos,numTabs) {
+ function doAdvancedSearchTab(myPos,numTabs,search) {
toggleTab(myPos,numTabs);
clearNode('simplesearch');
clearNode('remotesearch');
clearNode('lucenesearch');
- showAdvancedSearch();
+ showAdvancedSearch(search);
// IE needs a refresh of the mini map after changing tabs
if ( Prototype.Browser.IE ) {
timeVal = setTimeout('im_refreshMiniMap()',1000);
@@ -187,12 +189,12 @@
}
}
- function doRemoteSearchTab(myPos,numTabs) {
+ function doRemoteSearchTab(myPos,numTabs,search) {
toggleTab(myPos,numTabs);
clearNode('simplesearch');
clearNode('advancedsearch');
clearNode('lucenesearch');
- showRemoteSearch();
+ showRemoteSearch(search);
// IE needs a refresh of the mini map after changing tabs
if ( Prototype.Browser.IE ) {
timeVal = setTimeout('im_refreshMiniMap()',1000);
Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-iso19139.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-iso19139.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xsl/metadata-iso19139.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -2991,14 +2991,12 @@
<xsl:with-param name="tabLink" select="$tabLink"/>
</xsl:call-template>
- <!--
<xsl:call-template name="displayTab">
<xsl:with-param name="tab" select="'constraints'"/>
<xsl:with-param name="text" select="/root/gui/strings/constraintsTab"/>
<xsl:with-param name="indent" select="'   '"/>
<xsl:with-param name="tabLink" select="$tabLink"/>
</xsl:call-template>
- -->
<xsl:call-template name="displayTab">
<xsl:with-param name="tab" select="'spatial'"/>
Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/searchform_advanced.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xsl/searchform_advanced.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xsl/searchform_advanced.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -217,6 +217,13 @@
</th>
<td style="padding-bottom:5px;">
<input name="dataparam" id="dataparam" class="content" size="20" value="{/root/gui/searchDefaults/dataparam}"/>
+ <img src="{/root/gui/url}/images/help.png" onclick="$('dataparam.help').toggle()">
+ <span id="dataparam.help" class="searchHelpFrame" style="display:none;z-index:1000;">
+ <font class="error">
+ <xsl:value-of select="/root/gui/strings/dataparamHelp"/>
+ </font>
+ </span>
+ </img>
<div id="dataparamList" class="keywordList">
<!-- the dataparamList for autocompletion will show here -->
</div>
Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/simplemetadata.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xsl/simplemetadata.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xsl/simplemetadata.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -50,11 +50,11 @@
<td class="padded" valign="top"><input class="md" type="text" name="Depositor_Address_city" value="" size="50"/></td>
</tr>
<tr>
- <th class="md" width="20%" valign="top">Administrative area</th>
+ <th class="md" width="20%" valign="top">State</th>
<td class="padded" valign="top"><input class="md" type="text" name="Depositor_Address_administrativeArea" value="{/root/gui/user/record/state}" size="50"/></td>
</tr>
<tr>
- <th class="md" width="20%" valign="top">Postal code</th>
+ <th class="md" width="20%" valign="top">Postcode</th>
<td class="padded" valign="top"><input class="md" type="text" name="Depositor_Address_postalCode" value="{/root/gui/user/record/zip}" size="50"/></td>
</tr>
<tr>
@@ -62,7 +62,7 @@
<td class="padded" valign="top"><input class="md" type="text" name="Depositor_Address_country" value="{/root/gui/user/record/country}" size="50"/></td>
</tr>
<tr>
- <th class="md" width="20%" valign="top">Electronic mail address</th>
+ <th class="md" width="20%" valign="top">Email</th>
<td class="padded" valign="top"><input class="md" type="text" name="Depositor_Address_electronicMailAddress" value="{/root/gui/user/record/email}" size="50"/></td>
</tr>
</table>
@@ -125,11 +125,11 @@
<td class="padded" valign="top"><input class="md" type="text" name="DS_Address_city" value="" size="50"/></td>
</tr>
<tr>
- <th class="md" width="20%" valign="top">Administrative area</th>
+ <th class="md" width="20%" valign="top">State</th>
<td class="padded" valign="top"><input class="md" type="text" name="DS_Address_administrativeArea" value="" size="50"/></td>
</tr>
<tr>
- <th class="md" width="20%" valign="top">Postal code</th>
+ <th class="md" width="20%" valign="top">Postcode</th>
<td class="padded" valign="top"><input class="md" type="text" name="DS_Address_postalCode" value="" size="50"/></td>
</tr>
<tr>
@@ -137,7 +137,7 @@
<td class="padded" valign="top"><input class="md" type="text" name="DS_Address_country" value="" size="50"/></td>
</tr>
<tr>
- <th class="md" width="20%" valign="top">Electronic mail address</th>
+ <th class="md" width="20%" valign="top">Email</th>
<td class="padded" valign="top"><input class="md" type="text" name="DS_Address_electronicMailAddress" value="" size="50"/></td>
</tr>
</table>
Modified: sandbox/BlueNetMEST/web/geonetwork/xsl/user-selfregistration.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xsl/user-selfregistration.xsl 2009-07-30 14:40:20 UTC (rev 4723)
+++ sandbox/BlueNetMEST/web/geonetwork/xsl/user-selfregistration.xsl 2009-07-30 14:48:12 UTC (rev 4724)
@@ -91,7 +91,7 @@
<th class="padded"><xsl:value-of select="/root/gui/strings/profile"/></th>
<td class="padded">
<select class="content" size="1" name="profile">
- <xsl:for-each select="/root/gui/strings/profileChoice">
+ <xsl:for-each select="/root/gui/strings/profileChoice[@available]">
<option value="{@value}">
<xsl:value-of select="."/>
</option>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|