unico 2004/07/13 05:02:13
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSNotIsCollectionExpression.java
RDBMSIsCollectionExpression.java
RDBMSNotIsPrincipalExpression.java
RDBMSIsPrincipalExpression.java
src/stores/org/apache/slide/store/impl/rdbms
RDBMSComparableResourcesPool.java
Log:
some minor fixes
Revision Changes Path
1.3 +6 -6
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotIsCollectionExpression.java
Index: RDBMSNotIsCollectionExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotIsCollectionExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDBMSNotIsCollectionExpression.java 4 Jul 2004 19:26:49 -0000 1.2
+++ RDBMSNotIsCollectionExpression.java 13 Jul 2004 12:02:13 -0000 1.3
@@ -34,9 +34,9 @@
}
protected String compile() {
- return "NOT (p" + _tableIndex + ".PROPERTY_NAME = 'resourcetype' AND " +
- "p" + _tableIndex + ".PROPERTY_NAMESPACE = 'DAV:' AND " +
- "p" + _tableIndex + ".PROPERTY_VALUE LIKE '<collection/>')";
+ return "(p" + _tableIndex + ".PROPERTY_NAME = 'resourcetype' AND " +
+ "p" + _tableIndex + ".PROPERTY_NAMESPACE = 'DAV:' AND " +
+ "p" + _tableIndex + ".PROPERTY_VALUE NOT LIKE '%<collection/>%')";
}
protected String getPropertyName() {
1.3 +1 -1
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSIsCollectionExpression.java
Index: RDBMSIsCollectionExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSIsCollectionExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDBMSIsCollectionExpression.java 4 Jul 2004 19:26:49 -0000 1.2
+++ RDBMSIsCollectionExpression.java 13 Jul 2004 12:02:13 -0000 1.3
@@ -23,7 +23,7 @@
protected String compile() {
return "(p" + _tableIndex + ".PROPERTY_NAME = 'resourcetype' AND " +
"p" + _tableIndex + ".PROPERTY_NAMESPACE = 'DAV:' AND " +
- "p" + _tableIndex + ".PROPERTY_VALUE LIKE '<collection/>')";
+ "p" + _tableIndex + ".PROPERTY_VALUE LIKE '%<collection/>%')";
}
protected String getPropertyName() {
1.3 +5 -5
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotIsPrincipalExpression.java
Index: RDBMSNotIsPrincipalExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotIsPrincipalExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDBMSNotIsPrincipalExpression.java 4 Jul 2004 19:26:49 -0000 1.2
+++ RDBMSNotIsPrincipalExpression.java 13 Jul 2004 12:02:13 -0000 1.3
@@ -34,9 +34,9 @@
}
protected String compile() {
- return "NOT (p" + _tableIndex + ".PROPERTY_NAME = 'resourcetype' AND " +
+ return "(p" + _tableIndex + ".PROPERTY_NAME = 'resourcetype' AND " +
"p" + _tableIndex + ".PROPERTY_NAMESPACE = 'DAV:' AND " +
- "p" + _tableIndex + ".PROPERTY_VALUE LIKE '<principal/>')";
+ "p" + _tableIndex + ".PROPERTY_VALUE NOT LIKE '%<principal/>%')";
}
protected String getPropertyName() {
1.3 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSIsPrincipalExpression.java
Index: RDBMSIsPrincipalExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSIsPrincipalExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDBMSIsPrincipalExpression.java 4 Jul 2004 19:26:49 -0000 1.2
+++ RDBMSIsPrincipalExpression.java 13 Jul 2004 12:02:13 -0000 1.3
@@ -36,7 +36,7 @@
protected String compile() {
return "(p" + _tableIndex + ".PROPERTY_NAME = 'resourcetype' AND " +
"p" + _tableIndex + ".PROPERTY_NAMESPACE = 'DAV:' AND " +
- "p" + _tableIndex + ".PROPERTY_VALUE LIKE '<principal/>')";
+ "p" + _tableIndex + ".PROPERTY_VALUE LIKE '%<principal/>%')";
}
protected String getPropertyName() {
1.4 +11 -7
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/RDBMSComparableResourcesPool.java
Index: RDBMSComparableResourcesPool.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/RDBMSComparableResourcesPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RDBMSComparableResourcesPool.java 8 Jul 2004 15:24:41 -0000 1.3
+++ RDBMSComparableResourcesPool.java 13 Jul 2004 12:02:13 -0000 1.4
@@ -161,7 +161,9 @@
ArrayList uris = new ArrayList();
try {
final String sql = compileSQL();
-// System.out.println("\nexecute: " + sql + "\n");
+ if (_store.getLogger().isEnabled(Logger.DEBUG)) {
+ _store.getLogger().log("executing: " + sql,
AbstractRDBMSStore.LOG_CHANNEL, Logger.DEBUG);
+ }
statement = connection.prepareStatement(sql);
result = statement.executeQuery();
while (result.next()) {
@@ -261,12 +263,14 @@
return " u.URI_STRING = '" + uri + "'";
}
case QueryScope.DEPTH_1: {
- return " u.URI_STRING LIKE '" + uri +
- "%' AND NOT u.URI_STRING LIKE '" + uri + "%/%'";
+ return " (u.URI_STRING = '" + uri + "'" +
+ " OR (u.URI_STRING LIKE '" + uri + "/%'" +
+ " AND NOT u.URI_STRING LIKE '" + uri + "/%/%'))";
}
case QueryScope.DEPTH_INFINITY:
default: {
- return " u.URI_STRING LIKE '" + uri + "%'";
+ return " (u.URI_STRING = '" + uri + "'" +
+ " OR u.URI_STRING LIKE '" + uri + "/%')";
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
