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

fixed NPE during index abstract computation

Browse Source
pull/1/head
Michael Peter Christen 12 years ago
parent 16e9d4d1dd
commit 9406a2e438
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
htroot/yacy/search.java
Unescape View File

@ -393,7 +393,7 @@ public final class search {
prop.put("indexabstract", indexabstract.toString()); prop.put("indexabstract", indexabstract.toString());
// prepare result // prepare result
int resultCount = theSearch.getResultCount(); int resultCount = theSearch == null ? 0 : theSearch.getResultCount(); // theSearch may be null if we searched only for abstracts
if (resultCount == 0 || accu == null || accu.isEmpty()) { if (resultCount == 0 || accu == null || accu.isEmpty()) {
// no results // no results

38
source/net/yacy/search/query/QueryGoal.java
Unescape View File

@ -46,7 +46,7 @@ public class QueryGoal {
private static char dq = '"'; private static char dq = '"';
private static String seps = ".,/&_"; private static String seps = ".,/&_";
private String query_original, query_words; private String query_original;
private HandleSet include_hashes, exclude_hashes, all_hashes; private HandleSet include_hashes, exclude_hashes, all_hashes;
private final ArrayList<String> include_words, exclude_words, all_words; private final ArrayList<String> include_words, exclude_words, all_words;
private final ArrayList<String> include_strings, exclude_strings, all_strings; private final ArrayList<String> include_strings, exclude_strings, all_strings;
@ -54,13 +54,12 @@ public class QueryGoal {
public QueryGoal(HandleSet include_hashes, HandleSet exclude_hashes, HandleSet all_hashes) { public QueryGoal(HandleSet include_hashes, HandleSet exclude_hashes, HandleSet all_hashes) {
this.query_original = null; this.query_original = null;
this.query_words = null; this.include_words = new ArrayList<String>();
this.include_words = null; this.exclude_words = new ArrayList<String>();
this.exclude_words = null; this.all_words = new ArrayList<String>();
this.all_words = null; this.include_strings = new ArrayList<String>();
this.include_strings = null; this.exclude_strings = new ArrayList<String>();
this.exclude_strings = null; this.all_strings = new ArrayList<String>();
this.all_strings = null;
this.include_hashes = include_hashes; this.include_hashes = include_hashes;
this.exclude_hashes = exclude_hashes; this.exclude_hashes = exclude_hashes;
this.all_hashes = all_hashes; this.all_hashes = all_hashes;
@ -70,7 +69,6 @@ public class QueryGoal {
assert query_original != null; assert query_original != null;
assert query_words != null; assert query_words != null;
this.query_original = query_original; this.query_original = query_original;
this.query_words = query_words;
this.include_words = new ArrayList<String>(); this.include_words = new ArrayList<String>();
this.exclude_words = new ArrayList<String>(); this.exclude_words = new ArrayList<String>();
this.all_words = new ArrayList<String>(); this.all_words = new ArrayList<String>();
@ -79,16 +77,16 @@ public class QueryGoal {
this.all_strings = new ArrayList<String>(); this.all_strings = new ArrayList<String>();
// remove funny symbols // remove funny symbols
this.query_words = CharacterCoding.html2unicode(AbstractScraper.stripAllTags(this.query_words.toCharArray())).toLowerCase().trim(); query_words = CharacterCoding.html2unicode(AbstractScraper.stripAllTags(query_words.toCharArray())).toLowerCase().trim();
int c; int c;
for (int i = 0; i < seps.length(); i++) { for (int i = 0; i < seps.length(); i++) {
while ((c = this.query_words.indexOf(seps.charAt(i))) >= 0) { while ((c = query_words.indexOf(seps.charAt(i))) >= 0) {
this.query_words = this.query_words.substring(0, c) + (((c + 1) < this.query_words.length()) ? (' ' + this.query_words.substring(c + 1)) : ""); query_words = query_words.substring(0, c) + (((c + 1) < query_words.length()) ? (' ' + query_words.substring(c + 1)) : "");
} }
} }
// parse first quoted strings // parse first quoted strings
parseQuery(this.query_words, this.include_strings, this.exclude_strings, this.all_strings); parseQuery(query_words, this.include_strings, this.exclude_strings, this.all_strings);
// .. end then take these strings apart to generate word lists // .. end then take these strings apart to generate word lists
for (String s: this.include_strings) parseQuery(s, this.include_words, this.include_words, this.all_words); for (String s: this.include_strings) parseQuery(s, this.include_words, this.include_words, this.all_words);
@ -145,6 +143,7 @@ public class QueryGoal {
} }
public String getOriginalQueryString(final boolean encodeHTML) { public String getOriginalQueryString(final boolean encodeHTML) {
if (this.query_original == null) return null;
String ret; String ret;
if (encodeHTML){ if (encodeHTML){
try { try {
@ -157,19 +156,6 @@ public class QueryGoal {
} }
return ret; return ret;
} }
public String getWordQueryString(final boolean encodeHTML) {
String ret;
if (encodeHTML){
try {
ret = URLEncoder.encode(this.query_words, "UTF-8");
} catch (UnsupportedEncodingException e) {
ret = this.query_words;
}
} else {
ret = this.query_words;
}
return ret;
}
public HandleSet getIncludeHashes() { public HandleSet getIncludeHashes() {
if (include_hashes == null) include_hashes = Word.words2hashesHandles(include_words); if (include_hashes == null) include_hashes = Word.words2hashesHandles(include_words);

Write Preview
Loading…
Cancel
Save