Revision 3073
Added by perry over 17 years ago
| lib/spatial/mapbuilder/lib/widget/AoiMetacatQuery.js | ||
|---|---|---|
| 60 | 60 |
y2 = y2 + tolerance * res; |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
var url = metacat + "?action=spatial_query&XMIN=" + x1 + "&XMAX=" + x2 +
|
|
| 64 |
"&YMIN=" + y1 + "&YMAX=" + y2 + "&SKIN=" + skin;
|
|
| 63 |
var url = metacat + "?action=spatial_query&xmin=" + x1 + "&xmax=" + x2 +
|
|
| 64 |
"&ymin=" + y1 + "&ymax=" + y2 + "&skin=" + skin;
|
|
| 65 | 65 |
|
| 66 | 66 |
if (method == 'popup') {
|
| 67 | 67 |
newwindow = window.open(url,'queryWin', |
| src/edu/ucsb/nceas/metacat/MetaCatServlet.java | ||
|---|---|---|
| 221 | 221 |
sh.regenerate(); |
| 222 | 222 |
sh.destroy(); |
| 223 | 223 |
|
| 224 |
// After running the first time, we want to to set regenerateCacheOnRestart to false |
|
| 225 |
// so that it does not regenerate the cache every time tomcat is restarted |
|
| 226 |
MetaCatUtil.setOption("regenerateCacheOnRestart","false");
|
|
| 227 |
|
|
| 224 | 228 |
// End timer |
| 225 | 229 |
long after = System.currentTimeMillis(); |
| 226 | 230 |
MetaCatUtil.printMessage(" ------ Spatial Harvester Time " + (after - before) + "ms");
|
| ... | ... | |
| 800 | 804 |
/* |
| 801 | 805 |
* Perform spatial query against spatial cache |
| 802 | 806 |
*/ |
| 803 |
float _xmax = Float.valueOf( ((String[]) params.get("XMAX"))[0] ).floatValue();
|
|
| 804 |
float _ymax = Float.valueOf( ((String[]) params.get("YMAX"))[0] ).floatValue();
|
|
| 805 |
float _xmin = Float.valueOf( ((String[]) params.get("XMIN"))[0] ).floatValue();
|
|
| 806 |
float _ymin = Float.valueOf( ((String[]) params.get("YMIN"))[0] ).floatValue();
|
|
| 807 |
float _xmax = Float.valueOf( ((String[]) params.get("xmax"))[0] ).floatValue();
|
|
| 808 |
float _ymax = Float.valueOf( ((String[]) params.get("ymax"))[0] ).floatValue();
|
|
| 809 |
float _xmin = Float.valueOf( ((String[]) params.get("xmin"))[0] ).floatValue();
|
|
| 810 |
float _ymin = Float.valueOf( ((String[]) params.get("ymin"))[0] ).floatValue();
|
|
| 807 | 811 |
SpatialQuery sq = new SpatialQuery(); |
| 808 | 812 |
Vector docids = sq.filterByBbox( _xmin, _ymin, _xmax, _ymax ); |
| 809 | 813 |
// logMetacat.info(" --- Spatial Query completed. Passing on the SQuery handler");
|
| ... | ... | |
| 829 | 833 |
*/ |
| 830 | 834 |
String[] qformatArray = new String[1]; |
| 831 | 835 |
try {
|
| 832 |
String _skin = ((String[]) params.get("SKIN"))[0];
|
|
| 836 |
String _skin = ((String[]) params.get("skin"))[0];
|
|
| 833 | 837 |
qformatArray[0] = _skin; |
| 834 | 838 |
} catch (java.lang.NullPointerException e) {
|
| 835 | 839 |
// should be "default" but keep this for backwards compatibility with knp site |
Also available in: Unified diff
Only run spatial cache regeneration once. Plus some fixes to spatial_query action api.