Author: dflorey
Date: Mon Dec 12 15:19:32 2005
New Revision: 356411
URL: http://svn.apache.org/viewcvs?rev=356411&view=rev
Log:
Bugfix and minor code cleanup
Modified:
jakarta/slide/trunk/src/share/org/apache/slide/content/ContentImpl.java
jakarta/slide/trunk/src/share/org/apache/slide/store/BindingStore.java
jakarta/slide/trunk/src/stores/org/apache/slide/index/lucene/expressions/AbstractLuceneExpression.java
Modified:
jakarta/slide/trunk/src/share/org/apache/slide/content/ContentImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/slide/trunk/src/share/org/apache/slide/content/ContentImpl.java?rev=356411&r1=356410&r2=356411&view=diff
==============================================================================
--- jakarta/slide/trunk/src/share/org/apache/slide/content/ContentImpl.java
(original)
+++ jakarta/slide/trunk/src/share/org/apache/slide/content/ContentImpl.java Mon
Dec 12 15:19:32 2005
@@ -162,7 +162,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
- Uri objectUri = namespace.getUri(token, strUri);
+ Uri objectUri = namespace.getUri(token, associatedObject.getUri());
NodeRevisionDescriptors revisionDescriptors = null;
try {
revisionDescriptors = objectUri.getStore()
Modified: jakarta/slide/trunk/src/share/org/apache/slide/store/BindingStore.java
URL:
http://svn.apache.org/viewcvs/jakarta/slide/trunk/src/share/org/apache/slide/store/BindingStore.java?rev=356411&r1=356410&r2=356411&view=diff
==============================================================================
--- jakarta/slide/trunk/src/share/org/apache/slide/store/BindingStore.java
(original)
+++ jakarta/slide/trunk/src/share/org/apache/slide/store/BindingStore.java Mon
Dec 12 15:19:32 2005
@@ -60,7 +60,7 @@
public class BindingStore extends ExtendedStore {
// TODO: This is just a quick hack to enable DASL with binding store
// Please replace with something less evel!
- public final static String INDEXED_BINDING_URI_IDENTIFIER = "UURI:";
+ public final static String INDEXED_BINDING_URI_IDENTIFIER = "/UURI:";
private static PropertyName RESOURCE_ID =
PropertyName.getPropertyName("resource-id");
@@ -70,8 +70,8 @@
// overwrites inherited
public ObjectNode retrieveObject(Uri uri)
throws ServiceAccessException, ObjectNotFoundException {
- if ( uri.toString().startsWith("/"+INDEXED_BINDING_URI_IDENTIFIER)) {
- String uuri = uri.toString().substring(6);
+ if ( uri.toString().startsWith(INDEXED_BINDING_URI_IDENTIFIER)) {
+ String uuri =
uri.toString().substring(INDEXED_BINDING_URI_IDENTIFIER.length());
uri = ResourceId.create(namespace.getUri(uri.getToken(), uuri),
uuri);
ObjectNode node = super.retrieveObject(uri);
node.setUri(getFirstMapping((ResourceId)uri));
Modified:
jakarta/slide/trunk/src/stores/org/apache/slide/index/lucene/expressions/AbstractLuceneExpression.java
URL:
http://svn.apache.org/viewcvs/jakarta/slide/trunk/src/stores/org/apache/slide/index/lucene/expressions/AbstractLuceneExpression.java?rev=356411&r1=356410&r2=356411&view=diff
==============================================================================
---
jakarta/slide/trunk/src/stores/org/apache/slide/index/lucene/expressions/AbstractLuceneExpression.java
(original)
+++
jakarta/slide/trunk/src/stores/org/apache/slide/index/lucene/expressions/AbstractLuceneExpression.java
Mon Dec 12 15:19:32 2005
@@ -234,7 +234,7 @@
// Please replace with something less evel!
// At least the INDEXED_BINDING_URI_IDENTIFIER
prefix should be added at indexing time
if (Configuration.useGlobalBinding()) {
- resource =
createResource(BindingStore.INDEXED_BINDING_URI_IDENTIFIER + uri, nodeNumber);
+ resource =
createResource(BindingStore.INDEXED_BINDING_URI_IDENTIFIER.substring(1) + uri,
nodeNumber);
if (resource != null) {
try {
NodeProperty
parentProperty = resource.getProperty(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
