Revision: 49787
Author: rainman
Date: 2009-04-24 00:45:13 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Minor stuff:
* fix a bug with update links not being deleted
* disable funky wildcards with unpredictable execution time (e.g. a*m)
* improve logging a bit so we can actually debug stuff
Modified Paths:
--------------
branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
branches/lucene-search-2.1/src/org/wikimedia/lsearch/interoperability/RMIMessengerClient.java
branches/lucene-search-2.1/src/org/wikimedia/lsearch/search/UpdateThread.java
Modified:
branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
===================================================================
---
branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
2009-04-23 23:38:10 UTC (rev 49786)
+++
branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java
2009-04-24 00:45:13 UTC (rev 49787)
@@ -1054,6 +1054,11 @@
return false; // don't support patterns like *a*
//if(index == length-1 && buffer[index]=='?')
// return false; // probably just an ordinary
question mark
+
+ // don't let * be in middle for performance reasons
+ if(Character.isLetterOrDigit(buffer[0]) &&
Character.isLetterOrDigit(buffer[length-1]))
+ return false;
+
for(int i=0;i<length;i++){
if(Character.isLetterOrDigit(buffer[i]))
return true; // +card :P
Modified:
branches/lucene-search-2.1/src/org/wikimedia/lsearch/interoperability/RMIMessengerClient.java
===================================================================
---
branches/lucene-search-2.1/src/org/wikimedia/lsearch/interoperability/RMIMessengerClient.java
2009-04-23 23:38:10 UTC (rev 49786)
+++
branches/lucene-search-2.1/src/org/wikimedia/lsearch/interoperability/RMIMessengerClient.java
2009-04-24 00:45:13 UTC (rev 49787)
@@ -198,7 +198,7 @@
recheckRemote(iid,host);
HighlightPack pack = new HighlightPack(new
SearchResults());
pack.res.retry();
- log.warn("Error invoking remote method searchPart on
host "+host+" : "+e.getMessage(),e);
+ log.warn("Error invoking
searchPart("+iid+",(term="+searchterm+"),(q="+query+"),"+offset+","+limit+") on
"+host+" : "+e.getMessage(),e);
e.printStackTrace();
return pack;
}
Modified:
branches/lucene-search-2.1/src/org/wikimedia/lsearch/search/UpdateThread.java
===================================================================
---
branches/lucene-search-2.1/src/org/wikimedia/lsearch/search/UpdateThread.java
2009-04-23 23:38:10 UTC (rev 49786)
+++
branches/lucene-search-2.1/src/org/wikimedia/lsearch/search/UpdateThread.java
2009-04-24 00:45:13 UTC (rev 49787)
@@ -139,6 +139,8 @@
log.info("Syncing "+li.iid);
if(!iid.isMySearch())
iid.forceMySearch();
+ // be sure to have the latest version here
+ registry.refreshCurrent(iid);
rebuild(li,RebuildType.STANDALONE); // rsync, update
registry, cache
pending.remove(li.iid.toString());
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
