| Index: trunk/lucene-search-2/src/org/wikimedia/lsearch/config/GlobalConfiguration.java |
| — | — | @@ -8,14 +8,11 @@ |
| 9 | 9 | import java.io.ByteArrayInputStream; |
| 10 | 10 | import java.io.IOException; |
| 11 | 11 | import java.io.InputStreamReader; |
| 12 | | -import java.io.StringReader; |
| 13 | 12 | import java.net.Inet4Address; |
| 14 | 13 | import java.net.InetAddress; |
| 15 | 14 | import java.net.MalformedURLException; |
| 16 | | -import java.net.NetworkInterface; |
| 17 | 15 | import java.net.URL; |
| 18 | 16 | import java.net.UnknownHostException; |
| 19 | | -import java.text.MessageFormat; |
| 20 | 17 | import java.util.ArrayList; |
| 21 | 18 | import java.util.Collection; |
| 22 | 19 | import java.util.Collections; |
| — | — | @@ -23,15 +20,13 @@ |
| 24 | 21 | import java.util.HashMap; |
| 25 | 22 | import java.util.HashSet; |
| 26 | 23 | import java.util.Hashtable; |
| 27 | | -import java.util.Iterator; |
| | 24 | +import java.util.Map.Entry; |
| 28 | 25 | import java.util.Properties; |
| 29 | 26 | import java.util.Set; |
| 30 | | -import java.util.Map.Entry; |
| 31 | 27 | import java.util.regex.Matcher; |
| 32 | 28 | import java.util.regex.Pattern; |
| 33 | 29 | |
| 34 | 30 | import org.apache.lucene.search.ArticleNamespaceScaling; |
| 35 | | -import org.apache.lucene.search.ArticleScaling; |
| 36 | 31 | import org.wikimedia.lsearch.config.IndexId.AgeScaling; |
| 37 | 32 | import org.wikimedia.lsearch.search.NamespaceFilter; |
| 38 | 33 | import org.wikimedia.lsearch.util.Localization; |
| — | — | @@ -1269,7 +1264,7 @@ |
| 1270 | 1265 | * @return lowercased db type |
| 1271 | 1266 | */ |
| 1272 | 1267 | protected String getMainDBType(String dbname){ |
| 1273 | | - Enumeration e = ((Hashtable)database.get(dbname)).keys(); |
| | 1268 | + Enumeration<String> e = database.get(dbname).keys(); |
| 1274 | 1269 | while(e.hasMoreElements()){ |
| 1275 | 1270 | String type = (String)e.nextElement(); |
| 1276 | 1271 | if(type.equals("single") || type.equals("mainsplit") || type.equals("split")) |
| — | — | @@ -1369,7 +1364,7 @@ |
| 1370 | 1365 | return namespacePrefixAll; |
| 1371 | 1366 | } |
| 1372 | 1367 | |
| 1373 | | - /** Check wether dbname has some of the suffixes */ |
| | 1368 | + /** Check if dbname has some of the suffixes */ |
| 1374 | 1369 | protected boolean checkSuffix(String[] suffixes, String dbname){ |
| 1375 | 1370 | if(suffixes == null) |
| 1376 | 1371 | return false; |
| — | — | @@ -1391,7 +1386,7 @@ |
| 1392 | 1387 | * the suffixes from the global configuration |
| 1393 | 1388 | * |
| 1394 | 1389 | * @param dbname |
| 1395 | | - * @return |
| | 1390 | + * @return if keyword scoring should be used |
| 1396 | 1391 | */ |
| 1397 | 1392 | public boolean useKeywordScoring(String dbname){ |
| 1398 | 1393 | return checkSuffix(keywordScoringSuffixes,dbname); |
| — | — | @@ -1401,7 +1396,7 @@ |
| 1402 | 1397 | * If this dbname is assigned an exact-case additional index. |
| 1403 | 1398 | * |
| 1404 | 1399 | * @param dbname |
| 1405 | | - * @return |
| | 1400 | + * @return if this dbname is assigned an additional exact-case index |
| 1406 | 1401 | */ |
| 1407 | 1402 | public boolean exactCaseIndex(String dbname){ |
| 1408 | 1403 | return checkSuffix(exactCaseSuffix,dbname); |
| Index: trunk/lucene-search-2/src/org/wikimedia/lsearch/config/package.html |
| — | — | @@ -20,7 +20,6 @@ |
| 21 | 21 | <li><basedir>/snapshot/<iid>/<timestamp> - clean snapshots of the index (on indexer hosts) |
| 22 | 22 | <li><basedir>/update/<iid>/<timestamp> - local copy of index snapshot (on searcher hosts) |
| 23 | 23 | <li><basedir>/search/<iid> - symlink to latest index update (on searcher hosts) |
| 24 | | - </ul> |
| 25 | | -<li> |
| | 24 | + </ul> |
| 26 | 25 | </ul> |
| 27 | 26 | </body></html> |
| \ No newline at end of file |