boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yacy/yacy_search_server

Browse Source
pull/27/head
sixcooler 10 years ago
parent 301ba6131a 2b775d5be6
commit 7e2723a894
6 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File

9
defaults/solr/schema.xml
Unescape View File

@ -57,7 +57,7 @@
<fields>
<field name="_version_" type="long" indexed="true" stored="true" docValues="true" /> <!-- a mandatory solr field used for operation in SolrCloud -->
<field name="text" type="text_general" indexed="true" stored="false" multiValued="true"/> <!-- this is default in solrconfix.xml; not used but you get errors when not defining it -->
<!-- primary key of document, the URL hash **mandatory field** -->
<field name="id" type="string" indexed="true" stored="true" docValues="true"/>
@ -73,9 +73,6 @@
<!-- content of title tag -->
<field name="title" type="text_general" indexed="true" stored="true" multiValued="true"/>
<!-- point in degrees of latitude,longitude as declared in WSG84 -->
<field name="coordinate_p" type="location" indexed="true" stored="true"/>
<!-- content of author-tag -->
<field name="author" type="text_general" indexed="true" stored="true"/>
@ -83,8 +80,8 @@
<field name="keywords" type="text_general" indexed="true" stored="true"/>
<!-- all visible text -->
<field name="text_t" type="text_general" indexed="true" stored="true"/>
<field name="text_t" type="text_general" indexed="true" stored="true"/>
<dynamicField name="*_i" type="int" indexed="true" stored="true"/>
<dynamicField name="*_l" type="long" indexed="true" stored="true"/>
<dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>

6
htroot/IndexImportMediawiki_p.html
Unescape View File

@ -2,8 +2,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>YaCy '#[clientname]#': MediaWiki Dump Import</title>
#%env/templates/metas.template%#
#(import)#::<meta http-equiv="REFRESH" content="10" />#(/import)#
#%env/templates/metas.template%#
#(import)#::<meta http-equiv="REFRESH" content="10;url=IndexImportMediawiki_p.html" />
<!-- the url= removes http get parameters on refresh, preventing restart of import -->
#(/import)#
</head>
<body id="IndexImportMediawiki">
#%env/templates/header.template%#

2
source/net/yacy/data/wiki/WikiCode.java
Unescape View File

@ -1061,7 +1061,7 @@ public class WikiCode extends AbstractWikiParser implements WikiParser {
if (d.length == 1) {float l = Float.parseFloat(d[0]); if (l < 0) {lono = "W"; l = -l;} lon = (float) Math.floor(l); lonm = 60.0f * (l - lon);}
else if (d.length == 2) {lon = Float.parseFloat(d[0]); lonm = Float.parseFloat(d[1]);}
else if (d.length == 3) {lon = Float.parseFloat(d[0]); lonm = Float.parseFloat(d[1]) + Float.parseFloat(d[2]) / 60.0f;}
if (d[d.length-1].toUpperCase().equals("w")) {lon = -lon; lonm = -lonm;}
if (d[d.length-1].toUpperCase().equals("W")) {lon = -lon; lonm = -lonm;}
}
}
if (lon != 0.0d && lat != 0.0d) {

10
source/net/yacy/document/importer/MediawikiImporter.java
Unescape View File

@ -153,16 +153,6 @@ public class MediawikiImporter extends Thread implements Importer {
if (p > 0) targetstub = targetstub.substring(0, p);
InputStream is = new BufferedInputStream(new FileInputStream(this.sourcefile), 1024 * 1024);
if (this.sourcefile.getName().endsWith(".bz2")) {
int b = is.read();
if (b != 'B') {
try {is.close();} catch (final IOException e) {}
throw new IOException("Invalid bz2 content.");
}
b = is.read();
if (b != 'Z') {
try {is.close();} catch (final IOException e) {}
throw new IOException("Invalid bz2 content.");
}
is = new BZip2CompressorInputStream(is);
} else if (this.sourcefile.getName().endsWith(".gz")) {
is = new GZIPInputStream(is);

4
source/net/yacy/document/parser/images/bmpParser.java
Unescape View File

@ -154,9 +154,9 @@ public class bmpParser {
else if (bitcount == 8) parseBMP8(s, offset, width, height, colortable);
else if (bitcount == 24) parseBMP24(s, offset, width, height);
else if (bitcount == 32) parseBMP32(s, offset, width, height);
else System.out.println("unsupported BMP format: biCompression = " + compression + ", biBitCount = " + bitcount);
else ConcurrentLog.fine("IMAGEPARSER", "unsupported BMP format: biCompression = " + compression + ", biBitCount = " + bitcount);
} else {
System.out.println("unsupported BMP format: biCompression = " + compression + ", biBitCount = " + bitcount);
ConcurrentLog.fine("IMAGEPARSER", "unsupported BMP format: biCompression = " + compression + ", biBitCount = " + bitcount);
}
}
}

6
source/net/yacy/peers/Seed.java
Unescape View File

@ -992,8 +992,12 @@ public class Seed implements Cloneable, Comparable<Seed>, Comparator<Seed>
return !my;
}
/**
* set unused flags to zero
* currently last used flag is FLAG_SSL_AVAILABLE=4 (2015-10-24)
*/
public final void setUnusedFlags() {
for ( int i = 4; i < 20; i++ ) {
for ( int i = 5; i < 20; i++ ) {
setFlag(i, false);
}
}

Write Preview
Loading…
Cancel
Save