| Index: branches/lucene-search-2.1/src/org/wikimedia/lsearch/interoperability/RMIMessengerClient.java |
| — | — | @@ -198,7 +198,7 @@ |
| 199 | 199 | recheckRemote(iid,host); |
| 200 | 200 | HighlightPack pack = new HighlightPack(new SearchResults()); |
| 201 | 201 | pack.res.retry(); |
| 202 | | - log.warn("Error invoking remote method searchPart on host "+host+" : "+e.getMessage(),e); |
| | 202 | + log.warn("Error invoking searchPart("+iid+",(term="+searchterm+"),(q="+query+"),"+offset+","+limit+") on "+host+" : "+e.getMessage(),e); |
| 203 | 203 | e.printStackTrace(); |
| 204 | 204 | return pack; |
| 205 | 205 | } |
| Index: branches/lucene-search-2.1/src/org/wikimedia/lsearch/search/UpdateThread.java |
| — | — | @@ -139,6 +139,8 @@ |
| 140 | 140 | log.info("Syncing "+li.iid); |
| 141 | 141 | if(!iid.isMySearch()) |
| 142 | 142 | iid.forceMySearch(); |
| | 143 | + // be sure to have the latest version here |
| | 144 | + registry.refreshCurrent(iid); |
| 143 | 145 | rebuild(li,RebuildType.STANDALONE); // rsync, update registry, cache |
| 144 | 146 | pending.remove(li.iid.toString()); |
| 145 | 147 | } |
| Index: branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java |
| — | — | @@ -1054,6 +1054,11 @@ |
| 1055 | 1055 | return false; // don't support patterns like *a* |
| 1056 | 1056 | //if(index == length-1 && buffer[index]=='?') |
| 1057 | 1057 | // return false; // probably just an ordinary question mark |
| | 1058 | + |
| | 1059 | + // don't let * be in middle for performance reasons |
| | 1060 | + if(Character.isLetterOrDigit(buffer[0]) && Character.isLetterOrDigit(buffer[length-1])) |
| | 1061 | + return false; |
| | 1062 | + |
| 1058 | 1063 | for(int i=0;i<length;i++){ |
| 1059 | 1064 | if(Character.isLetterOrDigit(buffer[i])) |
| 1060 | 1065 | return true; // +card :P |