diff --git a/htroot/yacy/ui/yacyui-portaltest.html b/htroot/yacy/ui/yacyui-portaltest.html
index d3b6af8de..d9374e2b6 100644
--- a/htroot/yacy/ui/yacyui-portaltest.html
+++ b/htroot/yacy/ui/yacyui-portaltest.html
@@ -5,31 +5,36 @@
-
- YaCy Portal Search:
-
-
-
+
+
+
YaCy Portal Search:
+
+
Code Snippet:
<script src="http://localhost:8080/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
@@ -37,7 +42,12 @@
$(document).ready(function() {
yconf = {
url : 'http://localhost:8080',
- global : true,
+ logo : '/yacy/ui/img/yacy-logo.png',
+ link : 'http://www.yacy.net',
+ global : false,
+ width : 500,
+ height : 620,
+ position : ['top',30],
theme : 'start',
title : 'YaCy Portal Search'
};
@@ -46,15 +56,15 @@
</script>
<div id="yacylivesearch">
<form id="ysearch" method="get" accept-charset="UTF-8" action="http://localhost:8080/yacysearch.html">
- <input name="query" id="yquery" class="fancy" type="text" size="15" maxlength="80" value=""/>
- <input type="hidden" name="verify" value="true" />
+ Live Search <input name="query" id="yquery" class="fancy" type="text" size="15" maxlength="80" value=""/>
+ <input type="hidden" name="verify" value="false" />
<input type="hidden" name="maximumRecords" value="10" />
<input type="hidden" name="resource" value="local" />
<input type="hidden" name="urlmaskfilter" value=".*" />
<input type="hidden" name="prefermaskfilter" value="" />
<input type="hidden" name="former" value="" />
<input type="hidden" name="display" value="2" />
- <input type="submit" name="Enter" value="Suchen" />
+ <input type="submit" name="Enter" value="Search" />
</form>
</div>
diff --git a/source/de/anomic/data/wiki/wikiCode.java b/source/de/anomic/data/wiki/wikiCode.java
index c4440bcc5..97e0674a0 100644
--- a/source/de/anomic/data/wiki/wikiCode.java
+++ b/source/de/anomic/data/wiki/wikiCode.java
@@ -437,11 +437,7 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
} else {
kv = kl;
}
- //if (switchboard != null && switchboard.wikiDB.read(kl) != null) {
- result = result.substring(0, p0) + "" + kv + "" + result.substring(p1 + 2);
- //} else {
- // result = result.substring(0, p0) + "" + kv + "" + result.substring(p1 + 2);
- //}
+ result = result.substring(0, p0) + "" + kv + "" + result.substring(p1 + 2); // oob exception in append() !
}
}
diff --git a/source/de/anomic/tools/mediawikiIndex.java b/source/de/anomic/tools/mediawikiIndex.java
index 282760975..954cd602a 100644
--- a/source/de/anomic/tools/mediawikiIndex.java
+++ b/source/de/anomic/tools/mediawikiIndex.java
@@ -85,8 +85,8 @@ public class mediawikiIndex {
wparser = new wikiCode(u.getHost());
hparser = new plasmaParser();
// must be called before usage:
- //plasmaParser.initHTMLParsableMimeTypes("text/html");
- //plasmaParser.initParseableMimeTypes(plasmaParser.PARSER_MODE_CRAWLER, "text/html");
+ plasmaParser.initHTMLParsableMimeTypes("text/html");
+ plasmaParser.initParseableMimeTypes(plasmaParser.PARSER_MODE_CRAWLER, "text/html");
}
public static void checkIndex(File wikimediaxml) {
@@ -309,9 +309,13 @@ public class mediawikiIndex {
this.title = title;
this.source = sb;
}
- public void genHTML() throws MalformedURLException {
- html = wparser.transform(source.toString());
- url = new yacyURL("http://de.wikipedia.org/wiki/" + title, null);
+ public void genHTML() throws IOException {
+ try {
+ html = wparser.transform(source.toString());
+ url = new yacyURL("http://de.wikipedia.org/wiki/" + title, null);
+ } catch (Exception e) {
+ throw new IOException(e.getMessage());
+ }
}
public void genDocument() throws InterruptedException, ParserException {
document = hparser.parseSource(url, "text/html", "utf-8", html.getBytes());
@@ -444,7 +448,7 @@ public class mediawikiIndex {
out.put(record);
} catch (RuntimeException e) {
e.printStackTrace();
- } catch (MalformedURLException e) {
+ } catch (IOException e) {
e.printStackTrace();
} catch (ParserException e) {
e.printStackTrace();
@@ -500,7 +504,6 @@ public class mediawikiIndex {
this.osw = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(new File(targetdir, outputfilename))), "UTF-8");
osw.write("\n\n");
}
-
System.out.println("[CONSUME] Title: " + record.title);
record.document.writeXML(osw, new Date());
rc++;
@@ -562,12 +565,12 @@ public class mediawikiIndex {
plasmaParser.initParseableMimeTypes(plasmaParser.PARSER_MODE_CRAWLER, "text/html");
mediawikiIndex mi = new mediawikiIndex(urlStub);
wikiparserrecord poison = mi.newRecord();
- int threads = Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
+ int threads = Math.max(2, Runtime.getRuntime().availableProcessors() - 1);
BlockingQueue in = new ArrayBlockingQueue(threads * 10);
BlockingQueue out = new ArrayBlockingQueue(threads * 10);
ExecutorService service = Executors.newFixedThreadPool(threads + 1);
convertConsumer[] consumers = new convertConsumer[threads];
- Future[] consumerResults = new Future[threads];
+ Future[] consumerResults = new Future[threads];
for (int i = 0; i < threads; i++) {
consumers[i] = new convertConsumer(in, out, poison);
consumerResults[i] = service.submit(consumers[i]);
diff --git a/source/de/anomic/xml/SurrogateReader.java b/source/de/anomic/xml/SurrogateReader.java
index 002229629..8f519409e 100644
--- a/source/de/anomic/xml/SurrogateReader.java
+++ b/source/de/anomic/xml/SurrogateReader.java
@@ -29,6 +29,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.UTFDataFormatException;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;