*) added visualization of GeoRSS search (very basic, but it's a start...)

*) removed double code

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6881 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
low012 15 years ago
parent bd2587954a
commit b02078b58c

@ -121,7 +121,6 @@ public class yacysearch {
// we create empty entries for template strings
prop.put("searchagain", "0");
prop.put("display", display);
prop.put("display", display);
prop.put("former", "");
prop.put("count", "10");
prop.put("offset", "0");

@ -0,0 +1,52 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>#[former]# - YaCy '#[clientname]#': Search Page</title>
#%env/templates/metas.template%#
<link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="yacysearch.rss?search=#[former]#" />
<link rel="search" type="application/opensearchdescription+xml" title="YaCy Search on '#[clientname]#'" href="opensearchdescription.xml" />
<link rel="stylesheet" type="text/css" media="screen" href="/env/highslide.css" />
<script type="text/javascript">hs.outlineType = 'rounded-white';</script>
<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
<script type="text/javascript">
var map;
function init() {
map = new OpenLayers.Map('map', {maxResolution:'auto'});
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0, 0), 0);
map.addControl(new OpenLayers.Control.LayerSwitcher());
}
function search() {
var query = document.getElementById('query').value.replace(' ', '+');
var newl = new OpenLayers.Layer.GeoRSS( 'GeoRSS', 'http://localhost:8080/yacysearch_location.rss?query=' + query);
map.addLayer(newl);
}
</script>
</head>
<body id="yacysearch_location" onload="init()">
#(display)#
#%env/templates/simpleheader.template%#
::
#%env/templates/header.template%#
::
#%env/templates/embeddedheader.template%#
#(/display)#
<div style="float:left; width:70%;">
<div id="map" style="width: 600px; height: 300px"></div>
<br/>
<form onsubmit="return false;" class="search small" accept-charset="UTF-8">
<fieldset class="yacys">
<input type="text" id="query" size="42" />
<input type="submit" onclick="search(); return false;" value="search" onsubmit="search(); return false;" />
</fieldset>
</form>
</div>
</body>
</html>

@ -27,6 +27,7 @@ import net.yacy.document.geolocalization.Location;
import de.anomic.data.LibraryProvider;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.search.Switchboard;
import de.anomic.search.SwitchboardConstants;
import de.anomic.server.serverCore;
import de.anomic.server.serverObjects;
@ -113,9 +114,14 @@ public class yacysearch_location {
prop.put("kml_contentdom", (post == null ? "text" : post.get("contentdom", "text")));
prop.put("kml_verify", (post == null) ? "true" : post.get("verify", "true"));
} else if (header.get(HeaderFramework.CONNECTION_PROP_EXT, "").equals("html")) {
final Switchboard sb = (Switchboard) env;
final boolean authenticated = sb.adminAuthenticated(header) >= 2;
int display = (post == null) ? 0 : post.getInt("display", 0);
if (!authenticated) display = 2;
prop.put("display", display);
}
// return rewrite properties
return prop;
}

Loading…
Cancel
Save