Author: mickw Date: 2006-04-04 11:31:03 +0200 (Tue, 04 Apr 2006) New Revision: 2701
Modified: trunk/pom.xml trunk/src/java/no/schibstedsok/front/searchportal/query/token/TokenPredicate.java trunk/src/java/no/schibstedsok/front/searchportal/query/token/VeryFastTokenEvaluator.java Log: SEARCH-490 (and project reports stuff in pom) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2006-04-04 07:26:08 UTC (rev 2700) +++ trunk/pom.xml 2006-04-04 09:31:03 UTC (rev 2701) @@ -4,13 +4,13 @@ - $Id$ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <groupId>schibstedsok</groupId> <artifactId>search-front-html</artifactId> <modelVersion>4.0.0</modelVersion> <name>Schibsted Søk Engine</name> - <version>2-0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <packaging>war</packaging> <description>This is the project for Schibsted Søk's search-front application.</description> @@ -34,9 +34,9 @@ <licenses> <license> - <name>Schibsted Søk Copyright</name> - <url>LICENSE.txt</url> - <distribution>manual</distribution> + <name>Schibsted Søk Copyright</name> + <url>LICENSE.txt</url> + <distribution>manual</distribution> </license> </licenses> @@ -397,10 +397,17 @@ <reporting> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>src/checkstyle/schibstedsok_checks.xml</configLocation> + </configuration> + </plugin> </plugins> </reporting> Modified: trunk/src/java/no/schibstedsok/front/searchportal/query/token/TokenPredicate.java =================================================================== --- trunk/src/java/no/schibstedsok/front/searchportal/query/token/TokenPredicate.java 2006-04-04 07:26:08 UTC (rev 2700) +++ trunk/src/java/no/schibstedsok/front/searchportal/query/token/TokenPredicate.java 2006-04-04 09:31:03 UTC (rev 2701) @@ -30,8 +30,8 @@ TNS (Type.FAST, "tns"), FIRSTNAME (Type.FAST, "firstname"), LASTNAME (Type.FAST, "lastname"), - COMPANYENRICHMENT (Type.FAST, "companyenrichment"), - EXACTCOMPANYENRICHMENT (Type.FAST, "exact_companyenrichment"), + COMPANYENRICHMENT (Type.FAST, "companyenrich"), + EXACTCOMPANYENRICHMENT (Type.FAST, "exact_companyenrich"), COMPANYRANK (Type.FAST, "companyrank"), EXACTCOMPANYRANK (Type.FAST, "exact_companyrank"), GEOLOCAL (Type.FAST, "geolocal"), @@ -41,7 +41,7 @@ CATEGORY (Type.FAST, "category"), PRIOCOMPANYNAME (Type.FAST, "companypriority"), KEYWORD (Type.FAST, "keyword"), - FULLNAME (Type.FAST, "fullname"), // ? + FULLNAME (Type.FAST, "fullname"), EXACTWIKI (Type.FAST, "exact_wikino"), WIKIPEDIA (Type.FAST, "wikino"), ENGLISHWORDS (Type.FAST, "international"), Modified: trunk/src/java/no/schibstedsok/front/searchportal/query/token/VeryFastTokenEvaluator.java =================================================================== --- trunk/src/java/no/schibstedsok/front/searchportal/query/token/VeryFastTokenEvaluator.java 2006-04-04 07:26:08 UTC (rev 2700) +++ trunk/src/java/no/schibstedsok/front/searchportal/query/token/VeryFastTokenEvaluator.java 2006-04-04 09:31:03 UTC (rev 2701) @@ -137,7 +137,10 @@ final Element trans = (Element) l.item(i); final String name = trans.getAttribute("NAME"); - final String match = trans.getAttribute("CUSTOM").replaceAll("->", ""); + final String custom = trans.getAttribute("CUSTOM"); + final String match = custom.indexOf("->") >0 + ? custom.substring(0, custom.indexOf("->")) + : custom; addMatch(name, match, query); _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
