Author: ssmalamb
Date: 2007-06-12 10:01:03 +0200 (Tue, 12 Jun 2007)
New Revision: 5307
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/PrisjaktSearchCommand.java
trunk/core-api/src/main/wsdl/prisjakt.wsdl
trunk/query-api/src/main/java/no/schibstedsok/searchportal/query/token/TokenPredicate.java
Log:
Changed Prisjakt to use new Fast lists and new web service
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/PrisjaktSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/PrisjaktSearchCommand.java
2007-06-12 07:55:06 UTC (rev 5306)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/PrisjaktSearchCommand.java
2007-06-12 08:01:03 UTC (rev 5307)
@@ -1,26 +1,29 @@
// Copyright (2007) Schibsted Søk AS
package no.schibstedsok.searchportal.mode.command;
-import no.schibstedsok.searchportal.query.token.TokenEvaluationEngine;
-import no.schibstedsok.searchportal.query.token.TokenPredicate;
-import no.schibstedsok.searchportal.result.BasicResultList;
-import no.schibstedsok.searchportal.result.BasicResultItem;
-import no.schibstedsok.searchportal.InfrastructureException;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URLEncoder;
import java.rmi.RemoteException;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+
+import javax.xml.rpc.ServiceException;
+
+import no.schibstedsok.searchportal.query.token.TokenEvaluationEngine;
+import no.schibstedsok.searchportal.query.token.TokenPredicate;
+import no.schibstedsok.searchportal.result.BasicResultItem;
+import no.schibstedsok.searchportal.result.BasicResultList;
+import no.schibstedsok.searchportal.result.ResultItem;
+import no.schibstedsok.searchportal.result.ResultList;
import nu.prisjakt.www.wsdl.Butik;
import nu.prisjakt.www.wsdl.Kategori;
import nu.prisjakt.www.wsdl.PrisjaktLocator;
import nu.prisjakt.www.wsdl.PrisjaktPortType;
-import nu.prisjakt.www.wsdl.Resultat;
import nu.prisjakt.www.wsdl.Produkt;
-import javax.xml.rpc.ServiceException;
-import no.schibstedsok.searchportal.result.ResultItem;
-import no.schibstedsok.searchportal.result.ResultList;
+import nu.prisjakt.www.wsdl.Resultat;
+import nu.prisjakt.www.wsdl.Tillverkare;
+
import org.apache.axis.client.Stub;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -62,101 +65,70 @@
public ResultList<? extends ResultItem> execute() {
final TokenEvaluationEngine engine = getEngine();
- /*Butiker*/
- final boolean isChain =
engine.evaluateQuery(TokenPredicate.COMPANY_CHAIN, getQuery());
- /*Kategorier*/
- final boolean isService =
engine.evaluateQuery(TokenPredicate.CLASSIFIED_CATEGORY, getQuery());
-
- /*Produkter*/
- final boolean isElectronics =
engine.evaluateQuery(TokenPredicate.PRODUCT_ELECTRONIC, getQuery());
- final boolean isHousehold =
engine.evaluateQuery(TokenPredicate.PRODUCT_HOUSEHOLD, getQuery());
- final boolean isMusic =
engine.evaluateQuery(TokenPredicate.PRODUCT_MUSIC, getQuery());
-
final ResultList<ResultItem> result = new
BasicResultList<ResultItem>();
-
- if (isChain || isService || isElectronics || isHousehold || isMusic) {
- final PrisjaktLocator service = new PrisjaktLocator();
-
- try {
- final PrisjaktPortType port
- = service.getPrisjaktPort(new
java.net.URL(service.getPrisjaktPortAddress()));
- ((Stub)port).setTimeout(1000);
- final Resultat prisjaktResult =
port.getData(getTransformedQuery());
-
- final String query = getTransformedQuery();
- LOG.debug("Executing prisjact command with searchquery: " +
query);
-
- /**
- * Prisjakt kräver i nuläget en special hantering av url
encodingen.
- * Vi måste ersätta + vi får vid encodingen med %20 som
prisjakt kräver.
- */
- final String urlencQuery = URLEncoder.encode(query,
"iso-8859-1");
- int index = urlencQuery.indexOf('+');
- if (index != -1) {
- String urlS =StringUtils.replace(urlencQuery, "+", "%20");
- result.addField("urlEncodedsearchquery", urlS);
-
- } else {
- result.addField("urlEncodedsearchquery", urlencQuery);
- }
-
- result.addField("searchquery", query);
-
+ final PrisjaktLocator service = new PrisjaktLocator();
+ PrisjaktPortType port;
+ final String query = getTransformedQuery();
+ result.setHitCount(0);
+ try {
+ LOG.debug("PJ: pre1");
+ port = service.getPrisjaktPort(new
java.net.URL(service.getPrisjaktPortAddress()));
+ LOG.debug("PJ: pre2");
+ ((Stub)port).setTimeout(1000);
+ LOG.debug("PJ: pre3");
+ result.addField("urlEncodedsearchquery", URLEncoder.encode(query,
"iso-8859-1").replaceAll("\\+", "%20"));
+ result.addField("searchquery", query);
+ if (engine.evaluateQuery(TokenPredicate.PRISJAKT_PRODUCTS,
getQuery())) {
+ LOG.debug("PJ: prod");
+ final Resultat prisjaktResult = port.getProduktViaNamn(query);
final Produkt[] products = prisjaktResult.getProdukter();
- final Butik[] butiker = prisjaktResult.getButiker();
+ result.addField("searchtype", "productsearch");
+ result.setHitCount(products.length);
+ productConverter(result, products);
+ } else if
(engine.evaluateQuery(TokenPredicate.PRISJAKT_CATEGORIES, getQuery())) {
+ LOG.debug("PJ: cat");
+ final Resultat prisjaktResult = port.getKategoriViaNamn(query);
final Kategori[] kategorier = prisjaktResult.getKategorier();
-
- if (isElectronics || isHousehold || isMusic) {
- if (products != null) {
- result.addField("searchtype", "productsearch");
- result.setHitCount(products.length);
- productConverter(result, products);
- } else {
- result.setHitCount(0);
- }
- } else if (isService) {
- if (kategorier != null) {
- result.addField("searchtype", "categorysearch");
- result.setHitCount(kategorier.length);
- catagorieConverter(result, kategorier);
- } else {
- result.setHitCount(0);
- }
- } else {
- if (butiker != null) {
- result.addField("searchtype", "storesearch");
- result.setHitCount(butiker.length);
- storeConverter(result, butiker);
- } else {
- result.setHitCount(0);
- }
- }
-
- LOG.debug("Number of results " + result.getHitCount());
-
- } catch (ServiceException se) {
- LOG.error(ERR_FAILED_PRISJAKT_SEARCH, se);
- throw new InfrastructureException(se);
- } catch (MalformedURLException murle) {
- LOG.error(ERR_FAILED_PRISJAKT_SEARCH, murle);
- throw new InfrastructureException(murle);
- } catch (RemoteException re) {
- LOG.error(ERR_FAILED_PRISJAKT_SEARCH, re);
- throw new InfrastructureException(re);
- } catch (UnsupportedEncodingException usee) {
-
- LOG.error(ERR_FAILED_ENCODE_PRISJAKT,usee);
+ result.addField("searchtype", "categorysearch");
+ result.setHitCount(kategorier.length);
+ catagorieConverter(result, kategorier);
+ } else if
(engine.evaluateQuery(TokenPredicate.PRISJAKT_MANUFACTURERS, getQuery())) {
+ LOG.debug("PJ: manufacturers");
+ final Resultat prisjaktResult =
port.getTillverkareViaNamn(query);
+ final Tillverkare[] manufacturers =
prisjaktResult.getTillverkare_plur();
+ result.addField("searchtype", "manufacturersearch");
+ result.setHitCount(manufacturers.length);
+ manufacturerConverter(result, manufacturers);
+ } else if (engine.evaluateQuery(TokenPredicate.PRISJAKT_SHOPS,
getQuery())) {
+ LOG.debug("PJ: shop");
+ final Resultat prisjaktResult = port.getButikViaNamn(query);
+ final Butik[] butiker = prisjaktResult.getButiker();
+ result.addField("searchtype", "storesearch");
+ result.setHitCount(butiker.length);
+ storeConverter(result, butiker);
}
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ServiceException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (RemoteException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
return result;
}
private void productConverter(final ResultList<ResultItem> result, final
Produkt[] products) {
-
+
for (final Produkt product : products) {
-
+
ResultItem item = new BasicResultItem();
item = item.addField("productName", product.getProduktnamn());
final int lPris = product.getLagstaPris();
@@ -166,34 +138,32 @@
.getAntalButiker()));
/* &st=4 tillägget gör att vi får en liten bild ifrån prisjakt*/
if (product.getBild().equalsIgnoreCase("")) {
- item = item.addField("pruductPicture", "");
+ item = item.addField("productPicture", "");
} else {
- item = item.addField("pruductPicture", product.getBild() +
"&st=4");
+ item = item.addField("productPicture", product.getBild() +
"&st=4");
}
-
- item = item.addField("categorieURL", product.getKategoriurl());
- item = item.addField("pruductURL", product.getUrl());
- item = item.addField("categorieName", product.getKategorinamn());
+ item = item.addField("productURL", product.getUrl());
+ item = item.addField("categoryName", product.getKategorinamn());
result.addResult(item);
}
}
private void catagorieConverter(final ResultList<ResultItem> result, final
Kategori[] kategorier) {
-
+
for (final Kategori katag : kategorier) {
-
+
ResultItem item = new BasicResultItem();
item = item.addField("numberofProducts",
Integer.toString(katag.getAntalProdukter()));
- item = item.addField("categorieURL", katag.getUrl());
- item = item.addField("categorieName", katag.getKategorinamn());
+ item = item.addField("categoryURL", katag.getUrl());
+ item = item.addField("categoryName", katag.getKategorinamn());
result.addResult(item);
}
}
private void storeConverter(ResultList<ResultItem> result, Butik[] stores)
{
-
+
for (final Butik store : stores) {
-
+
ResultItem item = new BasicResultItem();
item = item.addField("numberofProducts",
Integer.toString(store.getAntalProdukter()));
item = item.addField("storeURL", store.getUrl());
@@ -202,6 +172,18 @@
}
}
+ private void manufacturerConverter(ResultList<ResultItem> result,
Tillverkare[] manufacturers) {
+
+ for (final Tillverkare manufacturer : manufacturers) {
+
+ ResultItem item = new BasicResultList();
+ item = item.addField("numberofProducts",
Integer.toString(manufacturer.getAntalProdukter()));
+ item = item.addField("manufacturerURL", manufacturer.getUrl());
+ item = item.addField("manufacturerName",
manufacturer.getTillverkarnamn());
+ result.addResult(item);
+ }
+ }
+
/**
* Formatera nummer med tusenavskiljare utan decimaler.
*/
@@ -210,6 +192,8 @@
return nummer == null ? ""
:NUMMER_AVSK_FORMAT.format(nummer.doubleValue());
}
+ /** Isn't there a java class for number formatting? */
+
/**
* Formatera med tusenavskiljare och lägger till decimaldel med
komma-tecken
* om decimaldel förekommer. Tar bort alla inledande och avslutande
blanksteg
Modified: trunk/core-api/src/main/wsdl/prisjakt.wsdl
===================================================================
--- trunk/core-api/src/main/wsdl/prisjakt.wsdl 2007-06-12 07:55:06 UTC (rev
5306)
+++ trunk/core-api/src/main/wsdl/prisjakt.wsdl 2007-06-12 08:01:03 UTC (rev
5307)
@@ -7,26 +7,50 @@
<xsd:complexType name="Produkt">
<xsd:all>
<xsd:element name="Produktnamn" type="xsd:string"/>
+ <xsd:element name="Produkt_id" type="xsd:int"/>
<xsd:element name="Kategorinamn" type="xsd:string"/>
- <xsd:element name="Kategoriurl" type="xsd:string"/>
+ <xsd:element name="Kategori_id" type="xsd:int"/>
+ <xsd:element name="Url" type="xsd:string"/>
<xsd:element name="AntalButiker" type="xsd:int"/>
<xsd:element name="LagstaPris" type="xsd:int"/>
<xsd:element name="Bild" type="xsd:string"/>
- <xsd:element name="Url" type="xsd:string"/>
</xsd:all>
</xsd:complexType>
<xsd:complexType name="Kategori">
<xsd:all>
<xsd:element name="Kategorinamn" type="xsd:string"/>
+ <xsd:element name="Kategori_id" type="xsd:int"/>
<xsd:element name="Url" type="xsd:string"/>
+ <xsd:element name="LagstaPris" type="xsd:int"/>
<xsd:element name="AntalProdukter" type="xsd:int"/>
</xsd:all>
</xsd:complexType>
+ <xsd:complexType name="Tillverkare">
+ <xsd:all>
+ <xsd:element name="Tillverkarnamn" type="xsd:string"/>
+ <xsd:element name="Tillverkare_id" type="xsd:int"/>
+ <xsd:element name="Url" type="xsd:string"/>
+ <xsd:element name="LagstaPris" type="xsd:int"/>
+ <xsd:element name="AntalProdukter" type="xsd:int"/>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="Tillverkare_Kategori">
+ <xsd:all>
+ <xsd:element name="Kategori_id" type="xsd:int"/>
+ <xsd:element name="Kategorinamn" type="xsd:string"/>
+ <xsd:element name="Tillverkare_id" type="xsd:int"/>
+ <xsd:element name="Tillverkarnamn" type="xsd:string"/>
+ <xsd:element name="LagstaPris" type="xsd:int"/>
+ <xsd:element name="AntalProdukter" type="xsd:int"/>
+ <xsd:element name="Url" type="xsd:string"/>
+ </xsd:all>
+ </xsd:complexType>
<xsd:complexType name="Butik">
<xsd:all>
<xsd:element name="Butiksnamn" type="xsd:string"/>
+ <xsd:element name="AntalProdukter" type="xsd:int"/>
+ <xsd:element name="Butik_id" type="xsd:int"/>
<xsd:element name="Url" type="xsd:string"/>
- <xsd:element name="AntalProdukter" type="xsd:int"/>
</xsd:all>
</xsd:complexType>
<xsd:complexType name="Produkter">
@@ -43,6 +67,20 @@
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
+ <xsd:complexType name="Tillverkare_plur">
+ <xsd:complexContent>
+ <xsd:restriction base="SOAP-ENC:Array">
+ <xsd:attribute ref="SOAP-ENC:arrayType"
wsdl:arrayType="tns:Tillverkare[]"/>
+ </xsd:restriction>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="Tillverkare_Kategorier">
+ <xsd:complexContent>
+ <xsd:restriction base="SOAP-ENC:Array">
+ <xsd:attribute ref="SOAP-ENC:arrayType"
wsdl:arrayType="tns:Tillverkare_Kategori[]"/>
+ </xsd:restriction>
+ </xsd:complexContent>
+ </xsd:complexType>
<xsd:complexType name="Butiker">
<xsd:complexContent>
<xsd:restriction base="SOAP-ENC:Array">
@@ -54,14 +92,38 @@
<xsd:all>
<xsd:element name="Produkter" type="tns:Produkter"/>
<xsd:element name="Kategorier" type="tns:Kategorier"/>
+ <xsd:element name="Tillverkare_plur" type="tns:Tillverkare_plur"/>
+ <xsd:element name="Tillverkare_Kategorier"
type="tns:Tillverkare_Kategorier"/>
<xsd:element name="Butiker" type="tns:Butiker"/>
</xsd:all>
</xsd:complexType>
+ <xsd:complexType name="IndataTillverkare_Kategori">
+ <xsd:all>
+ <xsd:element name="Kategori_id" type="xsd:int"/>
+ <xsd:element name="Tillverkare_id" type="xsd:int"/>
+ </xsd:all>
+ </xsd:complexType>
</xsd:schema>
</types>
-<message name="GetDataRequest"><part name="search" type="xsd:string"
/></message>
-<message name="GetDataResponse"><part name="return" type="tns:Resultat"
/></message>
-<portType name="PrisjaktPortType"><operation
name="GetData"><documentation>H�mta produkter, kategorier och
butiker</documentation><input message="tns:GetDataRequest"/><output
message="tns:GetDataResponse"/></operation></portType>
-<binding name="PrisjaktBinding" type="tns:PrisjaktPortType"><soap:binding
style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/><operation
name="GetData"><soap:operation soapAction="http://www.prisjakt.nu/wsdl#GetData";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation></binding>
-<service name="Prisjakt"><port name="PrisjaktPort"
binding="tns:PrisjaktBinding"><soap:address
location="http://www.prisjakt.nu/sesam/soap.php"/></port></service>
+<message name="GetTillverkare_KategoriViaIdRequest"><part name="search"
type="tns:IndataTillverkare_Kategori" /></message>
+<message name="GetTillverkare_KategoriViaIdResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetKategoriViaIdRequest"><part name="search" type="xsd:int"
/></message>
+<message name="GetKategoriViaIdResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetKategoriViaNamnRequest"><part name="search"
type="xsd:string" /></message>
+<message name="GetKategoriViaNamnResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetProduktViaIdRequest"><part name="search" type="xsd:int"
/></message>
+<message name="GetProduktViaIdResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetProduktViaNamnRequest"><part name="search" type="xsd:string"
/></message>
+<message name="GetProduktViaNamnResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetTillverkareViaIdRequest"><part name="search" type="xsd:int"
/></message>
+<message name="GetTillverkareViaIdResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetTillverkareViaNamnRequest"><part name="search"
type="xsd:string" /></message>
+<message name="GetTillverkareViaNamnResponse"><part name="return"
type="tns:Resultat" /></message>
+<message name="GetButikViaIdRequest"><part name="search" type="xsd:int"
/></message>
+<message name="GetButikViaIdResponse"><part name="return" type="tns:Resultat"
/></message>
+<message name="GetButikViaNamnRequest"><part name="search" type="xsd:string"
/></message>
+<message name="GetButikViaNamnResponse"><part name="return"
type="tns:Resultat" /></message>
+<portType name="PrisjaktPortType"><operation
name="GetTillverkare_KategoriViaId"><documentation>H�mta kombination av
tillverkare och kategori via Tillverkare_id och
Kategori_id</documentation><input
message="tns:GetTillverkare_KategoriViaIdRequest"/><output
message="tns:GetTillverkare_KategoriViaIdResponse"/></operation><operation
name="GetKategoriViaId"><documentation>H�mta kategori via
Kategori_id</documentation><input
message="tns:GetKategoriViaIdRequest"/><output
message="tns:GetKategoriViaIdResponse"/></operation><operation
name="GetKategoriViaNamn"><documentation>H�mta kategori(er) via
Kategorinamn</documentation><input
message="tns:GetKategoriViaNamnRequest"/><output
message="tns:GetKategoriViaNamnResponse"/></operation><operation
name="GetProduktViaId"><documentation>H�mta produkt via
Produkt_id</documentation><input message="tns:GetProduktViaIdRequest"/><output
message="tns:GetProduktViaIdResponse"/></operation><operation
name="GetProduktViaNamn"><documentation>H�mt
a produkter(er) via produktnamn</documentation><input
message="tns:GetProduktViaNamnRequest"/><output
message="tns:GetProduktViaNamnResponse"/></operation><operation
name="GetTillverkareViaId"><documentation>H�mta tillverkare via
Tillverkare_id</documentation><input
message="tns:GetTillverkareViaIdRequest"/><output
message="tns:GetTillverkareViaIdResponse"/></operation><operation
name="GetTillverkareViaNamn"><documentation>H�mta tillverkare via
Tillverkarnamn</documentation><input
message="tns:GetTillverkareViaNamnRequest"/><output
message="tns:GetTillverkareViaNamnResponse"/></operation><operation
name="GetButikViaId"><documentation>H�mta butik via
Butik_id</documentation><input message="tns:GetButikViaIdRequest"/><output
message="tns:GetButikViaIdResponse"/></operation><operation
name="GetButikViaNamn"><documentation>H�mta butiker via
Butiksnamn</documentation><input message="tns:GetButikViaNamnRequest"/><output
message="tns:GetButikViaNamnResponse"/></operation></portType
>
+<binding name="PrisjaktBinding" type="tns:PrisjaktPortType"><soap:binding
style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/><operation
name="GetTillverkare_KategoriViaId"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetTillverkare_KategoriViaId";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetKategoriViaId"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetKategoriViaId";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><
operation name="GetKategoriViaNamn"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetKategoriViaNamn";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetProduktViaId"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetProduktViaId";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetProduktViaNamn"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetProduktViaNamn";
style="rpc"/><input><soap:body use="encoded" name
space="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetTillverkareViaId"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetTillverkareViaId";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetTillverkareViaNamn"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetTillverkareViaNamn";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace
="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetButikViaId"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetButikViaId";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation><operation
name="GetButikViaNamn"><soap:operation
soapAction="http://www.prisjakt.nu/wsdl#GetButikerViaNamn";
style="rpc"/><input><soap:body use="encoded"
namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input><output><soap:body
use="encoded" namespace="http://www.prisjakt.nu/wsdl";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output></operation></binding>
+<service name="Prisjakt"><port name="PrisjaktPort"
binding="tns:PrisjaktBinding"><soap:address
location="http://sesam.prisjakt.nu/soap_ny.php"/></port></service>
</definitions>
\ No newline at end of file
Modified:
trunk/query-api/src/main/java/no/schibstedsok/searchportal/query/token/TokenPredicate.java
===================================================================
---
trunk/query-api/src/main/java/no/schibstedsok/searchportal/query/token/TokenPredicate.java
2007-06-12 07:55:06 UTC (rev 5306)
+++
trunk/query-api/src/main/java/no/schibstedsok/searchportal/query/token/TokenPredicate.java
2007-06-12 08:01:03 UTC (rev 5307)
@@ -80,8 +80,14 @@
TRADEMARK (Type.FAST),
WIKIPEDIA (Type.FAST),
EXACT_WIKI (Type.FAST),
-
+ PRISJAKT_CATEGORIES_AND_MANUFACTURERS (Type.FAST),
+ PRISJAKT_CATEGORIES (Type.FAST),
+ PRISJAKT_MANUFACTURERS (Type.FAST),
+ PRISJAKT_PRODUCTS (Type.FAST),
+ PRISJAKT_SHOPS (Type.FAST),
+
+
// RegExp TokenPredicates -- magic words
BOOK_MAGIC (Type.REGEX),
CATALOGUE_MAGIC (Type.REGEX),
@@ -130,7 +136,7 @@
/** JepTokenPredicate. **/
MATHPREDICATE (Type.JEP);
- /** The types of TokenPredicates that exist.
+ /** The types of TokenPredicates that exist.
*/
public enum Type { GENERIC, FAST, REGEX, JEP }
@@ -189,36 +195,36 @@
}
/**
- *
- * @return
+ *
+ * @return
*/
public Type getType(){
return type;
}
/** Utility method to use all TokenPredicates in existence.
- * @return
+ * @return
*/
public static Collection<TokenPredicate> getTokenPredicates() {
return Collections.unmodifiableCollection(Arrays.asList(values()));
}
/** Utility method to use all FastTokenPredicates in existence.
- * @return
+ * @return
*/
public static Set<TokenPredicate> getFastTokenPredicates() {
return Collections.unmodifiableSet(Static.FAST_TOKENS);
}
/** Utility method to use all MagicTokenPredicates in existence.
- * @return
+ * @return
*/
public static Set<TokenPredicate> getMagicTokenPredicates() {
return Collections.unmodifiableSet(Static.MAGIC_TOKENS);
}
/** Utility method to use all TriggerTokenPredicates in existence.
- * @return
+ * @return
*/
public static Set<TokenPredicate> getTriggerTokenPredicates() {
return Collections.unmodifiableSet(Static.TRIGGER_TOKENS);
@@ -284,7 +290,7 @@
throw new IllegalStateException(ERR_ENGINE_MISSING_STATE);
}
-
+
public static final class EvaluationException extends RuntimeException{
public EvaluationException(final VeryFastListQueryException vflqe){
super(vflqe);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
