Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork: [714] trunk
|
From: <e_t...@us...> - 2007-08-08 16:05:34
|
Revision: 714
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=714&view=rev
Author: e_tajariol
Date: 2007-08-08 09:05:20 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
Metadata search is now filtered on bbox and region also.
Modified Paths:
--------------
trunk/src/org/wfp/vam/intermap/util/Util.java
trunk/web/geonetwork/scripts/gn_search.js
trunk/web/geonetwork/xsl/main-page.xsl
trunk/web/intermap/scripts/im_bigmap.js
trunk/web/intermap/scripts/im_minimap.js
Modified: trunk/src/org/wfp/vam/intermap/util/Util.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/util/Util.java 2007-08-08 14:39:38 UTC (rev 713)
+++ trunk/src/org/wfp/vam/intermap/util/Util.java 2007-08-08 16:05:20 UTC (rev 714)
@@ -26,10 +26,10 @@
{
try
{
- float n = Float.parseFloat(params.getChildText("bbnorth"));
- float e = Float.parseFloat(params.getChildText("bbeast"));
- float s = Float.parseFloat(params.getChildText("bbsouth"));
- float w = Float.parseFloat(params.getChildText("bbwest"));
+ float n = Float.parseFloat(params.getChildText("northBL"));
+ float e = Float.parseFloat(params.getChildText("eastBL"));
+ float s = Float.parseFloat(params.getChildText("southBL"));
+ float w = Float.parseFloat(params.getChildText("westBL"));
return new BoundingBox(n, s, e, w);
}
catch (NullPointerException e) // child not found
Modified: trunk/web/geonetwork/scripts/gn_search.js
===================================================================
--- trunk/web/geonetwork/scripts/gn_search.js 2007-08-08 14:39:38 UTC (rev 713)
+++ trunk/web/geonetwork/scripts/gn_search.js 2007-08-08 16:05:20 UTC (rev 714)
@@ -9,7 +9,7 @@
/* */
-function prepareSearch()
+function preparePresent()
{
// Display results area
clearNode('resultList');
@@ -25,18 +25,24 @@
/* */
function doMetadataSearch()
{
- prepareSearch();
+ preparePresent();
+ var region = $('region').value;
+ if(region=="")
+ region=null;
+
// Load results via AJAX
- gn_search($('any') .value);
- // FIXME add bb
+ gn_search($('any') .value,
+ im_mm_getURLselectedbbox(),
+ region);
}
-function gn_search(text, bbn, bbe, bbs, bbw)
+function gn_search(text, bb, region)
{
- var pars = 'any=' + text;
-// add bb
-
+ var pars = 'any=' + encodeURIComponent(text) + "&"+bb;
+ if(region)
+ pars += "®ion="+region;
+
var myAjax = new Ajax.Request(
'/geonetwork/srv/en/main.search.embedded', {
method: 'get',
@@ -48,7 +54,7 @@
function gn_present(frompage, topage)
{
- prepareSearch();
+ preparePresent();
var pars = 'from=' + frompage + "&to=" + topage;
@@ -74,15 +80,15 @@
$('loadingMD').hide();
}
-function gn_toggleMetadata(id)
+/*function gn_toggleMetadata(id)
{
var parent = $('mdwhiteboard_' + id);
if (parent.firstChild)
- gn_hideMetadata(id);
+ gn_hideMetadata(id);
else
- gn_showMetadata(id);
+ gn_showMetadata(id);
}
-
+*/
function gn_showMetadata(id)
{
var pars = 'id=' + id + '&currTab=simple';
Modified: trunk/web/geonetwork/xsl/main-page.xsl
===================================================================
--- trunk/web/geonetwork/xsl/main-page.xsl 2007-08-08 14:39:38 UTC (rev 713)
+++ trunk/web/geonetwork/xsl/main-page.xsl 2007-08-08 16:05:20 UTC (rev 714)
@@ -725,7 +725,7 @@
<!-- regions combobox -->
- <select class="content" name="region">
+ <select class="content" name="region" id="region">
<option value="">
<xsl:if test="/root/gui/searchDefaults/theme='_any_'">
<xsl:attribute name="selected"/>
@@ -1164,8 +1164,8 @@
<tr>
<td align="right" colspan="2">
<!-- regions combobox -->
- <select class="content" name="region">
- <option value="">
+ <select class="content" name="region" id="region">
+ <option value="">
<xsl:if test="/root/gui/searchDefaults/theme='_any_'">
<xsl:attribute name="selected"/>
</xsl:if>
Modified: trunk/web/intermap/scripts/im_bigmap.js
===================================================================
--- trunk/web/intermap/scripts/im_bigmap.js 2007-08-08 14:39:38 UTC (rev 713)
+++ trunk/web/intermap/scripts/im_bigmap.js 2007-08-08 16:05:20 UTC (rev 714)
@@ -99,10 +99,10 @@
function im_bm_getURLbbox()
{
- return "bbnorth="+im_bm_north+
- "&bbeast="+im_bm_east+
- "&bbsouth="+im_bm_south+
- "&bbwest="+im_bm_west;
+ return "northBL="+im_bm_north+
+ "&eastBL="+im_bm_east+
+ "&southBL="+im_bm_south+
+ "&westBL="+im_bm_west;
}
Modified: trunk/web/intermap/scripts/im_minimap.js
===================================================================
--- trunk/web/intermap/scripts/im_minimap.js 2007-08-08 14:39:38 UTC (rev 713)
+++ trunk/web/intermap/scripts/im_minimap.js 2007-08-08 16:05:20 UTC (rev 714)
@@ -113,10 +113,7 @@
function im_mm_getURLbbox()
{
if(im_mm_north)
- return "bbnorth="+im_mm_north+
- "&bbeast="+im_mm_east+
- "&bbsouth="+im_mm_south+
- "&bbwest="+im_mm_west;
+ return im_urlizebb(im_mm_north, im_mm_east, im_mm_south, im_mm_west);
else
return null;
}
@@ -131,12 +128,21 @@
function im_urlizebb(n, e, s, w)
{
- return "bbnorth="+n+
- "&bbeast="+e+
- "&bbsouth="+s+
- "&bbwest="+w;
+ return "northBL="+n+
+ "&eastBL="+e+
+ "&southBL="+s+
+ "&westBL="+w;
}
+function im_mm_getURLselectedbbox()
+{
+ return im_urlizebb(
+ im_mm_ctrl_n.value,
+ im_mm_ctrl_e.value,
+ im_mm_ctrl_s.value,
+ im_mm_ctrl_w.value);
+}
+
/*****************************************************************************
*
* MiniMap operations (zoom, pan, identify)
@@ -367,6 +373,9 @@
Element.remove(im_mm_aoibox);
im_mm_aoibox = null;
}
+
+ // set back full mm bbox into input fields
+ im_mm_setTextCoords(im_mm_north, im_mm_east, im_mm_south, im_mm_west);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|