You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/08/22 13:53:32 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/search/basic BasicQuery.java BasicQueryEnvelope.java BasicQueryImpl.java BasicSearchLanguage.java
juergen 2002/08/22 04:53:32
Modified: src/share/org/apache/slide/search/basic BasicQuery.java
BasicQueryEnvelope.java BasicQueryImpl.java
BasicSearchLanguage.java
Log:
use the cache to get a uri, instead of directly instantiating it.
Revision Changes Path
1.15 +7 -6 jakarta-slide/src/share/org/apache/slide/search/basic/BasicQuery.java
Index: BasicQuery.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQuery.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BasicQuery.java 20 Aug 2002 11:55:13 -0000 1.14
+++ BasicQuery.java 22 Aug 2002 11:53:32 -0000 1.15
@@ -242,7 +242,8 @@
// might be null in testsuite
if (searchToken.getNamespace() != null) {
- Uri uri = new Uri (searchToken.getNamespace(), slideUri.getSlidePath(queryScope.getHref()));
+// Uri uri = new Uri (searchToken.getNamespace(), slideUri.getSlidePath(queryScope.getHref()));
+ Uri uri = searchToken.getNamespace().getUri(this.getSearchToken().getSlideToken(), slideUri.getSlidePath(queryScope.getHref()));
store = (AbstractStore)uri.getStore();
}
1.2 +7 -5 jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryEnvelope.java
Index: BasicQueryEnvelope.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryEnvelope.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicQueryEnvelope.java 20 Aug 2002 11:55:13 -0000 1.1
+++ BasicQueryEnvelope.java 22 Aug 2002 11:53:32 -0000 1.2
@@ -278,7 +278,9 @@
{
BasicQueryImpl query = null;
- Uri uri = new Uri (namespace, slideScope);
+// Uri uri = new Uri (namespace, slideScope);
+ Uri uri = namespace.getUri(token.getSlideToken(), slideScope);
+
AbstractStore store = (AbstractStore)uri.getStore();
String className = (String)store.getParameter ("basicQueryClass"); // muss defined werden
1.7 +6 -5 jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryImpl.java
Index: BasicQueryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicQueryImpl.java 20 Aug 2002 11:55:13 -0000 1.6
+++ BasicQueryImpl.java 22 Aug 2002 11:53:32 -0000 1.7
@@ -377,7 +377,8 @@
// might be null in testsuite
if (searchToken.getNamespace() != null) {
- Uri uri = new Uri (searchToken.getNamespace(), slideUri.getSlidePath(queryScope.getHref()));
+// Uri uri = new Uri (searchToken.getNamespace(), slideUri.getSlidePath(queryScope.getHref()));
+ Uri uri = searchToken.getNamespace().getUri(this.getSearchToken().getSlideToken(), slideUri.getSlidePath(queryScope.getHref()));
store = (AbstractStore)uri.getStore();
}
1.12 +6 -6 jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java
Index: BasicSearchLanguage.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicSearchLanguage.java 20 Aug 2002 11:55:13 -0000 1.11
+++ BasicSearchLanguage.java 22 Aug 2002 11:53:32 -0000 1.12
@@ -174,8 +174,8 @@
}
else {
- Uri uri = new Uri (token.getNamespace(),
- token.getSlideContext().getSlidePath(scope.getHref()));
+// Uri uri = new Uri (token.getNamespace(), );
+ Uri uri = token.getNamespace().getUri(token.getSlideToken(), token.getSlideContext().getSlidePath(scope.getHref()));
AbstractStore store = (AbstractStore)uri.getStore();
String className = (String)store.getParameter (BASIC_QUERY_CLASS);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>