From: cvs@openprivacy.orgCVS update: sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple
Date: Wednesday March 14, 19101 @ 0:21
Author: burton
CVSWEB Options: -------------------
Main CVSWeb: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi
View this module: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple
-----------------------------------
Update of /usr/local/cvs/public/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple
In directory giga:/tmp/cvs-serv2647/src/java/org/openprivacy/sierra/query/talon/implementations/simple
Modified Files:
SimpleQueryEngine.java SimpleQueryManager.java
Log Message:
updated TypeReference mechanism so that we don't have to hard code anything... it is compile time checked.
*****************************************************************
File: sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java?annotate=1.7
CVSWeb: View this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java?rev=1.7&content-type=text/x-cvsweb-markup
CVSWeb: Diff to previous version: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java.diff?r1=1.7&r2=1.6
-----------------------------------
Index: sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java
diff -u sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java:1.6 sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java:1.7
--- sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java:1.6 Tue Mar 13 22:22:11 2001
+++ sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryEngine.java Wed Mar 14 00:21:41 2001
@@ -31,13 +31,14 @@
import org.openprivacy.sierra.util.*;
import org.openprivacy.sierra.util.sql.*;
import talon.*;
+import talon.references.*;
import talon.interfaces.*;
import talon.util.net.*;
/**
* @see QueryManager
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
public class SimpleQueryEngine extends BaseComponent implements Component, QueryEngine {
@@ -52,28 +53,17 @@
System.out.println( "adding supported payloads..." );
- getComponentHandle().getInitProperties().dump();
+ URI pmpReference = TypeReferenceFactory.getTypeReference( PropertyManagerPayload.class );
- Vector v = getComponentHandle().getInitProperties().getVector( SUPPORTED_PAYLOADS_KEY );
-
- for ( int i = 0; i < v.size(); ++i ) {
-
- String entry = (String)v.elementAt( i );
-
- this.supportedPayloads.addElement( entry );
-
- }
-
- if ( supportedPayloads.size() == 0 ) {
- throw new TalonException( "No supported payloads" );
- }
+ supportedPayloads.addElement( pmpReference );
}
+
/**
* @see QueryEngine
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
public Result execute( Query query ) throws SierraException {
return null;
@@ -84,7 +74,7 @@
* Add a reputation for indexing...
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
public void addReputation( Reputation reputation ) throws SierraException {
@@ -144,7 +134,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
private void insertIntoPropertiesTable( DatabaseConnectionPool dcp, Payload payload )
throws Exception {
@@ -225,7 +215,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
private void insertIntoIdentifiersTable( DatabaseConnectionPool dcp, Payload payload )
throws Exception {
@@ -259,7 +249,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
private void insertIntoReputationsTable( DatabaseConnectionPool dcp, Reputation reputation )
throws Exception {
@@ -293,7 +283,7 @@
/**
* @see QueryEngine
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
public boolean supports( Reputation reputation ) {
@@ -317,21 +307,25 @@
/**
* @see QueryEngine
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
public boolean supports( Payload payload ) {
- return this.supportedPayloads.contains( payload.getTypeReference().toString() );
+ return this.supportedPayloads.contains( payload.getTypeReference() );
}
/**
* @see QueryEngine
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryEngine.java,v 1.6 2001/03/14 06:22:11 burton Exp $
+ * @version $Id: SimpleQueryEngine.java,v 1.7 2001/03/14 08:21:41 burton Exp $
*/
public boolean supports( Query query ) {
+ if ( query instanceof TargetedQuery ) {
+
+ }
+
//FIXME: for now support all queries.
return true;
*****************************************************************
File: sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java?annotate=1.5
CVSWeb: View this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java?rev=1.5&content-type=text/x-cvsweb-markup
CVSWeb: Diff to previous version: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java.diff?r1=1.5&r2=1.4
-----------------------------------
Index: sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java
diff -u sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java:1.4 sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java:1.5
--- sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java:1.4 Tue Mar 13 21:44:34 2001
+++ sierra/src/java/org/openprivacy/sierra/query/talon/implementations/simple/SimpleQueryManager.java Wed Mar 14 00:21:41 2001
@@ -22,6 +22,7 @@
import java.net.*;
import java.util.*;
import org.openprivacy.sierra.reputation.talon.interfaces.*;
+import org.openprivacy.sierra.query.*;
import org.openprivacy.sierra.query.talon.interfaces.*;
import org.openprivacy.sierra.rce.talon.interfaces.*;
import org.openprivacy.sierra.store.talon.interfaces.*;
@@ -33,7 +34,7 @@
/**
* @see QueryManager
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryManager.java,v 1.4 2001/03/14 05:44:34 burton Exp $
+ * @version $Id: SimpleQueryManager.java,v 1.5 2001/03/14 08:21:41 burton Exp $
*/
public class SimpleQueryManager extends BaseComponent implements Component, QueryManager {
@@ -51,22 +52,21 @@
/**
* @see QueryManager
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: SimpleQueryManager.java,v 1.4 2001/03/14 05:44:34 burton Exp $
+ * @version $Id: SimpleQueryManager.java,v 1.5 2001/03/14 08:21:41 burton Exp $
*/
- public QueryEngine getQueryEngine( Query query ) {
+ public QueryEngine getQueryEngine( Query query ) throws QueryNotSupportedException {
- if ( query instanceof TargetedQuery ) {
+ for ( int i = 0; i < knownEngines.size(); ++i ) {
- TargetedQuery tq = (TargetedQuery)query;
+ QueryEngine engine = (QueryEngine)knownEngines.elementAt( i );
- //FIXME: figure out a way to use reputation to determine the best query to return
+ if ( engine.supports( query ) ) {
+ return engine;
+ }
- //return the first query that supports this querythis.
-
-
- }
+ }
- return null;
+ throw new QueryNotSupportedException();
}
This archive was generated by hypermail 2b30 : Wed Mar 14 2001 - 00:22:12 PST