Author: mickw Date: 2006-04-05 17:27:00 +0200 (Wed, 05 Apr 2006) New Revision: 2723
Removed: trunk/develop.properties trunk/maven.xml trunk/production.properties trunk/project.properties trunk/project.xml trunk/searchdev.properties Modified: trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java Log: maven 2 is the future Deleted: trunk/develop.properties =================================================================== --- trunk/develop.properties 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/develop.properties 2006-04-05 15:27:00 UTC (rev 2723) @@ -1,27 +0,0 @@ -# Default Site. See no.schibstedsok.front.searchportal.site.Site.java -# Needs to match search-html-config/XXX.properties -sesam.site.default=localhost:8080 - -# Fast Query -queryServerURL.1=http://localhost:15100 -queryServerURL.2=http://localhost:15200 -queryServerURL.3=http://cobraprod.bos3.fastsearch.net:15100 -queryServerURL.4=http://localhost:15200 - - -# Log4j -log.directory=./logs -log.file=sesam.develop -log.level=DEBUG - -relevantqueries.host=localhost -relevantqueries.port=15400 - -tokenevaluator.host=localhost -tokenevaluator.port=15400 -tokenevaluator.linkpulse=false -tokenevaluator.linkpulseToUrl=http://go.sesam.no/ -tokenevaluator.linkpulseSesam=http://localhost:8080/search-front-html/search/ -mail.smtp.host=ssmail.schibstedsok.no - - Deleted: trunk/maven.xml =================================================================== --- trunk/maven.xml 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/maven.xml 2006-04-05 15:27:00 UTC (rev 2723) @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (2005-2006) Schibsted Søk AS - - $Id$ ---> -<project default="war:webapp" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven"> - - <!-- Filter develop / production URLs --> - <!-- Filter log4j paths --> - <preGoal name="java:prepare-filesystem" > - <ant:touch file="build.properties"/> - <ant:echo message="${line.separator}" file="build.properties" append="true"/> - <ant:filter filtersfile="build.properties" /> - <ant:filter filtersfile="project.properties"/> - <ant:filter filtersfile="${target}.properties" /> - </preGoal> - - <preGoal name="war:war-resources"> - <ant:filter filtersfile="${target}.properties" /> - <ant:echo message="Filtering war resources: ${maven.war.src.includes}/tradedoubler/searchbox/*.js"/> - <ant:copy todir="${maven.war.webapp.dir}" filtering="true" preservelastmodified="true"> - <ant:fileset dir="${maven.war.src}" - includes="${maven.war.src.includes}/tradedoubler/searchbox/*.js" - excludes="${maven.war.src.excludes}"> - </ant:fileset> - </ant:copy> - </preGoal> - - <preGoal name="java:compile"> - <!-- JavaCC :: QueryParser --> - <j:set var="maven.javacc.javacc.grammar" value="src/javacc/QueryParserImpl.jj"/> - <j:set var="maven.javacc.javacc.package" value="no.schibstedsok.front.searchportal.query.parser"/> - <attainGoal name="javacc:javacc-generate"/> - <path id="javacc.generated.src" location="target/generated-src/main/java/no/schibstedsok/front/searchportal/query/parser"/> - <maven:addPath id="maven.compile.src.set" refid="javacc.generated.src"/> - - <!-- Axis --> - <attainGoal name="axis:compile"/> - - <echo> ...java:compile preGoal finished.</echo> - </preGoal> - - <goal name="deploy" prereqs="war:webapp" > - <copy todir="${maven.tomcat.home}/webapps"> - <fileset dir="${maven.build.dir}"> - <include name="${pom.artifactId}/**"/> - </fileset> - </copy> - </goal> - - - - - <!-- - - 1) Keep junit tests logging to seperate files. - - 2) Ensure search-front-config is available. - --> - <preGoal name="test:test-resources"> - <attainGoal name="ensure-config-running"/> - <attainGoal name="alter-log4j-appenders-for-testing"/> - </preGoal> - <postGoal name="test:single"><attainGoal name="restore-log4j-appenders-for-testing"/></postGoal> - <postGoal name="test:test"><attainGoal name="restore-log4j-appenders-for-testing"/></postGoal> - - <goal name="alter-log4j-appenders-for-testing"> - <ant:touch file="build.properties"/> - <ant:echo message="${line.separator}" file="build.properties" append="true"/> - <ant:loadproperties srcFile="build.properties" /> - <ant:loadproperties srcFile="project.properties"/> - <ant:loadproperties srcFile="${target}.properties"/> - <ant:touch file="target/classes/log4j.properties"/> - <copy file="target/classes/log4j.properties" tofile="target/classes/log4j.properties.original"/> - <ant:propertyfile file="target/classes/log4j.properties"> - <ant:entry key="log4j.appender.LOG_APPEND.File" value="${log.directory}/${log.file}.test.log" /> - <ant:entry key="log4j.appender.ERROR_APPEND.File" value="${log.directory}/${log.file}.test.error" /> - <ant:entry key="log4j.appender.DUMP_APPEND.File" value="${log.directory}/${log.file}.test.dump" /> - <ant:entry key="log4j.appender.SALES_APPEND.File" value="${log.directory}/${log.file}.test.sales" /> - <ant:entry key="log4j.appender.MARKETING_APPEND.File" value="${log.directory}/${log.file}.test.marketing" /> - <ant:entry key="log4j.appender.PRODUCT_APPEND.File" value="${log.directory}/${log.file}.test.product" /> - </ant:propertyfile> - </goal> - <goal name="restore-log4j-appenders-for-testing"> - <copy file="target/classes/log4j.properties.original" tofile="target/classes/log4j.properties" overwrite="true"/> - </goal> - - <goal name="ensure-config-running"> - <!-- TODO how to test search-front-config is up and available? --> - <!-- - <ant:junit failureproperty="search-front-config.unavailable"> - <test name="no.schibstedsok.front.searchportal.configuration.DefaultSiteSearchTabsCreatorTest"/> - </ant:junit> - <ant:fail if="search-front-config.unavailable"><br/> - Unable to obtain configuration resources from search-front-config. - Please start this service before trying to build/deploy search-front-html. - </ant:fail> - --> - </goal> - - <!-- --> - <!-- CONTINUUM SPECIFIC TARGETS. Only meant to be run on sch-dev0.dev. Hence the hardcoded paths. --> - <!-- TODO move to continuum-utility plugin --> - <!-- --> - - <goal name="continuum:site" prereqs="site:deploy"> - </goal> - - <goal name="continuum:repository" prereqs="war:war"> - <exec executable="/local/bin/svnlook" outputproperty="svn.revision"> - <arg line="youngest /www/schibstedsok/versys/subversion/search-front-html"/> - </exec> - <mkdir dir="/www/schibstedsok/data/httpd/dev.schibstedsok.no_443/htdocs/maven/schibstedsok/wars/search-front-html/${target}/${svn.revision}"/> - <copy - file="${maven.build.dir}/ROOT.war" - todir="/www/schibstedsok/data/httpd/dev.schibstedsok.no_443/htdocs/maven/schibstedsok/wars/search-front-html/${target}/${svn.revision}"/> - </goal> - - <goal name="continuum:continuum"> - - <!-- Build the develop webapp with testing --> - <attainGoal name="clean"/> - <attainGoal name="test:test"/> - - <!-- turn testing off --> - <j:set var="maven.test.skip" value="true"/> - - <!-- Build the searchdev war --> - <attainGoal name="clean"/> - <j:set var="target" value="searchdev"/> - <attainGoal name="continuum:repository"/> - - <!-- Build the production war --> - <attainGoal name="clean"/> - <j:set var="target" value="production"/> - <attainGoal name="continuum:repository"/> - - <!-- turn testing on again --> - <j:set var="maven.test.skip" value="false"/> - - <!-- Build Maven website & deploy --> - <j:set var="target" value="develop"/> - <attainGoal name="site:deploy"/> - </goal> - - -</project> Deleted: trunk/production.properties =================================================================== --- trunk/production.properties 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/production.properties 2006-04-05 15:27:00 UTC (rev 2723) @@ -1,27 +0,0 @@ -# Default Site. See no.schibstedsok.front.searchportal.site.Site.java -# Needs to match search-html-config/XXX.properties -sesam.site.default=sesam.no - -# Fast Query -queryServerURL.1=http://10.16.195.250:15100 -queryServerURL.2=http://10.16.195.249:15300 -queryServerURL.3=http://cobraprod.bos3.fastsearch.net:15100 - -# Log4j -log.directory=/var/log/tomcat/www.sesam.no -log.file=sesam -log.level=INFO - -tokenevaluator.host=10.16.195.250 -tokenevaluator.port=15200 -tokenevaluator.linkpulse=true -tokenevaluator.linkpulseToUrl=http://go.sesam.no/ - -relevantqueries.host=10.16.195.250 -relevantqueries.port=15200 - -tokenevaluator.linkpulseSesam=http://www.sesam.no/search/ -mail.smtp.host=localhost - -tradedoubler.context.url=http://www.sesam.no/ -tradedoubler.form.action=$$url Deleted: trunk/project.properties =================================================================== --- trunk/project.properties 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/project.properties 2006-04-05 15:27:00 UTC (rev 2723) @@ -1,87 +0,0 @@ -# -*- Mode: java-properties-generic -*- -# $Id$ - -target=develop -maven.war.final.name=ROOT.war -# Remote artifact repositories -maven.repo.remote=https://dev.schibstedsok.no/maven,http://www.ibiblio.org/maven,http://maven-plugins.sourceforge.net/maven - -# Core Maven settings -maven.docs.outputencoding=UTF-8 - -# Checkstyle plugin -maven.checkstyle.header.file=${basedir}/LICENSE.txt -maven.checkstyle.properties=src/checkstyle/schibstedsok_checks.xml - -# JUnit plugin -maven.junit.fork=true - -# Tasklist plugin [EMAIL PROTECTED] - -# JavaDoc plugin properties. -maven.javadoc.private=true -maven.javadoc.package=false -maven.javadoc.copyright=Copyright (2005-2006) Schibsted S�k AS -maven.javadoc.links=http://java.sun.com/j2se/1.5.0/docs/api/,http://java.sun.com/j2ee/1.4/docs/api/,http://jakarta.apache.org/log4j/docs/api/,http://www.junit.org/junit/javadoc/ -maven.javadoc.customtags=tag1 -tag1.name=todo -tag1.description=Marks and describes an incompletion in the class/method. -tag1.enabled=true -tag1.scope=all - -# Java compile options -maven.compile.debug=true -maven.compile.deprecation=true -maven.compile.optimize=true -maven.compile.target=1.5 -maven.compile.source=1.5 -maven.compile.encoding=UTF-8 - -# CVS -maven.user=${user.name} - -# Changelog -maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory -maven.changelog.svn.baseurl=https://dev.schibstedsok.no/svn/search-front-html - -# For test:test -project.test.log.dir=${maven.build.dir}/test-logs -project.test.work.dir=${maven.build.dir}/test-work - -# Multiproject plugin -maven.multiproject.type=war -maven.multiproject.aggregateDir=components/ -maven.multiproject.includes=components/*/project.xml - -# JXR -maven.docs.outputencoding=UTF-8 - -# Site plugin options -maven.site.deploy.method=fs -maven.site.deploy.clean=true - - - -# Artifact and site deploy -maven.repo.list=schibstedsok -maven.repo.schibstedsok.group=schibsok -maven.repo.schibstedsok.mode=0664 -maven.repo.schibstedsok.directory.mode=0775 - - -# Set the following in your build.properties (home directory) -# (Only one of the two protocols lines.) -# maven.repo.schibstedsok=scpexe://login.osl.basefarm.net -# maven.repo.schibstedsok=sftp://login.osl.basefarm.net -# -# maven.repo.schibstedsok.directory=/www/schibstedsok/data/httpd/dev.schibstedsok.no_443/htdocs/maven -# maven.repo.schibstedsok.compress=false - -# Apache axis for geo data web services. -# - -# NetBeans -maven.netbeans.exec.run=deploy -maven.netbeans.exec.build=war:webapp -maven.netbeans.exec.rebuild=clean war:webapp Deleted: trunk/project.xml =================================================================== --- trunk/project.xml 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/project.xml 2006-04-05 15:27:00 UTC (rev 2723) @@ -1,419 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (2005-2006) Schibsted Søk AS - - $Id$ ---> -<project> - <pomVersion>3</pomVersion> - <name>Schibsted Søk Search-front</name> - <groupId>schibstedsok</groupId> - <artifactId>search-front-html</artifactId> - <currentVersion>2.0</currentVersion> - <organization> - <name>Schibsted Søk AS</name> - <url>http://www.sesam.no/</url> - </organization> - <logo>http://sesam.no/images/index/logo.png</logo> - <inceptionYear>2005</inceptionYear> - <package>no.schibstedsok.front</package> - <shortDescription>Search-front application for Schibsted Søk.</shortDescription> - <description>This is the project for Schibsted Søk's search-front application.</description> - <url>https://dev.schibstedsok.no/maven/sites/search-front-html/</url> - <issueTrackingUrl>https://dev.schibstedsok.no/jira/secure/BrowseProject.jspa?id=10000</issueTrackingUrl> - <siteAddress>https://dev.schibstedsok.no/maven/sites/search-front-html/</siteAddress> - <siteDirectory>/www/schibstedsok/data/httpd/dev.schibstedsok.no_443/htdocs/maven/sites/search-front-html</siteDirectory> - <repository> - <connection>scm:svn:https://dev.schibstedsok.no/svn/search-front-html/trunk/</connection> - </repository> - <developers> - <developer> - <name>Lars Johansson</name> - <id>larsjo</id> - <email>[EMAIL PROTECTED]</email> - <organization>Conduct AS</organization> - <role>Front end Developer</role> - <timezone>+1</timezone> - </developer> - <developer> - <name>Michael Semb Wever</name> - <id>mickw</id> - <email>[EMAIL PROTECTED]</email> - <organization>Schibsted Søk</organization> - <url>http://www.wever.org</url> - <timezone>+1</timezone> - </developer> - <developer> - <name>Thomas Kjærstad</name> - <id>itthkjer</id> - <email>[EMAIL PROTECTED]</email> - <organization>Schibsted Søk AS</organization> - <timezone>+1</timezone> - </developer> - <developer> - <name>Magnus Eklund</name> - <id>magnuse</id> - <email>[EMAIL PROTECTED]</email> - <organization>Schibsted Søk AS</organization> - <timezone>+1</timezone> - </developer> - </developers> - <dependencies> - <!-- Clickstream --> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>clickstream</artifactId> - <version>1.0.3</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <!-- Maven plugins --> - <dependency> - <groupId>maven</groupId> - <artifactId>maven-scm-plugin</artifactId> - <version>1.5-beta-3</version> - <type>plugin</type> - <url>https://maven.apache.org/reference/plugins/scm/</url> - <properties> - <eclipse.dependency>false</eclipse.dependency> - </properties> - </dependency> - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-axis-plugin</artifactId> - <version>0.7</version> - <type>plugin</type> - <properties> - <eclipse.dependency>false</eclipse.dependency> - </properties> - </dependency> - <!-- Logging --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - <type>jar</type> - <url>http://logging.apache.org/log4j/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>2.0</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.4</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>velocity-tools</groupId> - <artifactId>velocity-tools-generic</artifactId> - <version>1.2</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <!-- Apache Axis --> - <dependency> - <groupId>axis</groupId> - <artifactId>axis</artifactId> - <version>1.2.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>jep</groupId> - <artifactId>jep</artifactId> - <version>2.24</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-saaj</artifactId> - <version>1.2.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-wsdl4j</artifactId> - <version>1.2.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - <version>1.2.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-ant</artifactId> - <version>1.2-beta-3</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>sitemesh</groupId> - <artifactId>sitemesh</artifactId> - <version>2.2.1</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.2-rc</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>fast</groupId> - <artifactId>dsapi</artifactId> - <version>2.0.45</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>googleapi</groupId> - <artifactId>googleapi</artifactId> - <version>1.0</version> - <type>jar</type> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>yahoo_search</groupId> - <artifactId>yahoo_search</artifactId> - <version>1.1.0</version> - <type>jar</type> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.1.3</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>conduct-testfw</groupId> - <artifactId>conduct-testfw</artifactId> - <version>1.0.1</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.0.5</version> - <type>jar</type> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <type>jar</type> - </dependency> - <!-- Apache Axis --> - <!-- Web --> - <!-- Indexes APIs --> - <!-- Testing --> - <dependency> - <groupId>javacc</groupId> - <artifactId>javacc</artifactId> - <version>3.2</version> - <type>jar</type> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>javamail</groupId> - <artifactId>mailapi</artifactId> - <version>1.3.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>jaf</groupId> - <artifactId>activation</artifactId> - <version>1.0.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>javamail</groupId> - <artifactId>smtp</artifactId> - <version>1.3.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>jug</groupId> - <artifactId>jug</artifactId> - <version>1.1.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - </dependencies> - <build> - <sourceDirectory>src/java</sourceDirectory> - <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> - <resources> - <resource> - <directory>src/conf</directory> - <filtering>true</filtering> - <includes> - <include>*.xml</include> - <include>*.properties</include> - <include>*.csv</include> - <include>*.txt</include> - </includes> - </resource> - <resource> - <directory>src/templates</directory> - <includes> - <include>*.vm</include> - <include>*.html</include> - </includes> - </resource> - <resource> - <directory>src/data</directory> - <includes> - <include>*.csv</include> - <include>*.txt</include> - </includes> - </resource> - </resources> - <unitTest> - <includes> - <include>**/*Test*.java</include> - </includes> - </unitTest> - </build> -</project> - Deleted: trunk/searchdev.properties =================================================================== --- trunk/searchdev.properties 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/searchdev.properties 2006-04-05 15:27:00 UTC (rev 2723) @@ -1,26 +0,0 @@ -# Default Site. See no.schibstedsok.front.searchportal.site.Site.java -# Needs to match search-html-config/XXX.properties -sesam.site.default=bleedingsearch.schibstedsok.no - - -queryServerURL.1=http://10.16.195.250:15100 -queryServerURL.2=http://sch-search03.dev.osl.basefarm.net:15100 -queryServerURL.3=http://cobraprod.bos3.fastsearch.net:15100 - -log.directory=/var/log/tomcat/bleedingsearch -log.file=sesam -log.level=DEBUG - -tokenevaluator.host=10.16.195.250 -tokenevaluator.port=15200 -tokenevaluator.linkpulse=false -tokenevaluator.linkpulseToUrl=http://go.sesam.no/ -tokenevaluator.linkpulseSesam=http://sesam.no/search/ - -relevantqueries.host=10.16.195.250 -relevantqueries.port=15200 - -mail.smtp.host=localhost - -tradedoubler.context.url=http://searchdev.schibstedsok.no/search/ -tradedoubler.form.action=http://clk.tradedoubler.com/click?p=41042&a=23844&g=0 Modified: trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java =================================================================== --- trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java 2006-04-05 15:16:39 UTC (rev 2722) +++ trunk/src/java/no/schibstedsok/front/searchportal/query/run/RunningQueryImpl.java 2006-04-05 15:27:00 UTC (rev 2723) @@ -254,19 +254,18 @@ // TODO This loop-(task.isDone()) code should become individual listeners to each executor to minimise time // spent in task.isDone() boolean hitsToShow = false; + for (Future<SearchResult> task : results) { - if (task.isDone()) { + if (task.isDone() && !task.isCancelled()) { final SearchResult searchResult = task.get(); - if (searchResult != null) { final SearchConfiguration configuration = searchResult.getSearchCommand().getSearchConfiguration(); hitsToShow |= searchResult.getHitCount() > 0; - hits.put(configuration.getName(), searchResult.getHitCount()); final Integer score = scores.get(configuration.getName());
_______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
