mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
jquery bugfix
This commit is contained in:
parent
8d6e77ad0c
commit
e806106b10
2
htroot/env/templates/jqueryheader.template
vendored
2
htroot/env/templates/jqueryheader.template
vendored
|
@ -1,5 +1,5 @@
|
||||||
<!-- jQuery header /env/jqueryheader.template -->
|
<!-- jQuery header /env/jqueryheader.template -->
|
||||||
<link media="screen" type="text/css" href="/currentyacypeer/query/themes/start/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
|
<link media="screen" type="text/css" href="/currentyacypeer/jquery/themes/start/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
|
||||||
<link media="screen" type="text/css" href="/currentyacypeer/jquery/css/jquery-ui-combobox.css" rel="stylesheet" />
|
<link media="screen" type="text/css" href="/currentyacypeer/jquery/css/jquery-ui-combobox.css" rel="stylesheet" />
|
||||||
<link media="screen" type="text/css" href="/currentyacypeer/jquery/slider/jquery.slider.min.css" rel="stylesheet" />
|
<link media="screen" type="text/css" href="/currentyacypeer/jquery/slider/jquery.slider.min.css" rel="stylesheet" />
|
||||||
<script src="/currentyacypeer/jquery/js/jquery-1.7.min.js" type="text/javascript"></script>
|
<script src="/currentyacypeer/jquery/js/jquery-1.7.min.js" type="text/javascript"></script>
|
||||||
|
|
6
htroot/env/templates/metas.template
vendored
6
htroot/env/templates/metas.template
vendored
|
@ -1,8 +1,8 @@
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
<link rel="shortcut icon" href="favicon.ico" />
|
<link rel="shortcut icon" href="favicon.ico" />
|
||||||
<meta name="Content-Language" content="English, Englisch" />
|
<meta name="Content-Language" content="English, Englisch" />
|
||||||
<meta name="keywords" content="Anomic YaCy HTTP Proxy search engine spider indexer java network open free download Mac Windows Linux Software development" />
|
<meta name="keywords" content="YaCy HTTP search engine spider indexer java network open free download Mac Windows Linux Software development" />
|
||||||
<meta name="description" content="Anomic Software HTTP Proxy Freeware Home Page" />
|
<meta name="description" content="Software HTTP Freeware Home Page" />
|
||||||
<meta name="copyright" content="Michael Christen et al." />
|
<meta name="copyright" content="Michael Christen et al." />
|
||||||
<link rel="stylesheet" type="text/css" media="all" href="/env/base.css" />
|
<link rel="stylesheet" type="text/css" media="all" href="/env/base.css" />
|
||||||
<link rel="stylesheet" type="text/css" media="screen" href="/env/style.css" />
|
<link rel="stylesheet" type="text/css" media="screen" href="/env/style.css" />
|
||||||
|
@ -17,4 +17,4 @@
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
#%env/templates/jqueryheader.template%#
|
#%env/templates/jqueryheader.template%#
|
||||||
#%env/templates/portalheader.template%#
|
#%env/templates/portalheader.template%#
|
||||||
<!-- (C), Architecture and Realisation: Michael Peter Christen; Contact: mc <at> anomic.de -->
|
<!-- (C), Architecture: Michael Peter Christen; Contact: mc <at> yacy.net -->
|
||||||
|
|
|
@ -12,23 +12,24 @@ import java.nio.charset.Charset;
|
||||||
import net.yacy.cora.protocol.RequestHeader;
|
import net.yacy.cora.protocol.RequestHeader;
|
||||||
import net.yacy.interaction.AugmentHtmlStream;
|
import net.yacy.interaction.AugmentHtmlStream;
|
||||||
import net.yacy.kelondro.data.meta.DigestURI;
|
import net.yacy.kelondro.data.meta.DigestURI;
|
||||||
import net.yacy.search.Switchboard;
|
|
||||||
|
|
||||||
public class AugmentedHtmlStream extends FilterOutputStream {
|
public class AugmentedHtmlStream extends FilterOutputStream {
|
||||||
private final Writer out;
|
private final Writer out;
|
||||||
private final ByteArrayOutputStream buffer;
|
private final ByteArrayOutputStream buffer;
|
||||||
private final Charset charset;
|
private final Charset charset;
|
||||||
private final DigestURI url;
|
private final DigestURI url;
|
||||||
private final RequestHeader requestHeader;
|
private final String urls;
|
||||||
|
private final RequestHeader requestHeader;
|
||||||
|
|
||||||
public AugmentedHtmlStream(OutputStream out, Charset charset, DigestURI url, RequestHeader requestHeader) {
|
public AugmentedHtmlStream(OutputStream out, Charset charset, DigestURI url, RequestHeader requestHeader) {
|
||||||
super(out);
|
super(out);
|
||||||
this.out = new BufferedWriter(new OutputStreamWriter(out, charset));
|
this.out = new BufferedWriter(new OutputStreamWriter(out, charset));
|
||||||
this.buffer = new ByteArrayOutputStream();
|
this.buffer = new ByteArrayOutputStream();
|
||||||
this.charset = charset;
|
this.charset = charset;
|
||||||
this.url = url;
|
this.url = url;
|
||||||
this.requestHeader = requestHeader;
|
this.urls = this.url.toNormalform(false, true);
|
||||||
}
|
this.requestHeader = requestHeader;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(int b) throws IOException {
|
public void write(int b) throws IOException {
|
||||||
|
@ -48,22 +49,13 @@ public class AugmentedHtmlStream extends FilterOutputStream {
|
||||||
this.out.close();
|
this.out.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public StringBuffer process(StringBuffer data) {
|
public StringBuffer process(StringBuffer data) {
|
||||||
|
if (this.urls.contains("currentyacypeer/")) {
|
||||||
if (Switchboard.getSwitchboard().getConfigBool("proxyAugmentation", false) == true) {
|
return data;
|
||||||
|
} else {
|
||||||
if (!this.url.toNormalform(false, true).contains("currentyacypeer/")) {
|
return AugmentHtmlStream.process (data, this.charset, this.url, this.requestHeader);
|
||||||
|
}
|
||||||
return AugmentHtmlStream.process (data, this.charset, this.url, this.requestHeader);
|
}
|
||||||
|
|
||||||
} else {
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean supportsMime(String mime) {
|
public static boolean supportsMime(String mime) {
|
||||||
// System.out.println("mime" +mime);
|
// System.out.println("mime" +mime);
|
||||||
|
|
|
@ -468,14 +468,6 @@ public final class HTTPDProxyHandler {
|
||||||
path = path.substring(16);
|
path = path.substring(16);
|
||||||
}
|
}
|
||||||
|
|
||||||
// point virtual directory to my peer
|
|
||||||
if (path.startsWith("/currentyacypeer/")) {
|
|
||||||
host = sb.peers.myIP();
|
|
||||||
port = sb.peers.myPort();
|
|
||||||
path = path.substring(16);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// resolve yacy and yacyh domains
|
// resolve yacy and yacyh domains
|
||||||
String yAddress = resolveYacyDomains(host);
|
String yAddress = resolveYacyDomains(host);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user