Author: chathura
Date: Sun Jan 20 20:45:54 2008
New Revision: 12553
Log:
Fixing a bug in advanced search.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
Sun Jan 20 20:45:54 2008
@@ -309,10 +309,16 @@
// state=active query to the sql, query is always started.
boolean queryStarted = true;
+ String activeResourcesQuery = " WHERE R.STATE=" +
RegistryConstants.ACTIVE_STATE;
+
String pathQuery = "";
if (resourceName != null && resourceName.length() != 0) {
- pathQuery = " WHERE R.PATH LIKE ?";
- queryStarted = true;
+ if (queryStarted) {
+ pathQuery = " AND R.PATH LIKE ?";
+ } else {
+ pathQuery = " WHERE R.PATH LIKE ?";
+ queryStarted = true;
+ }
}
String authorQuery = "";
@@ -438,7 +444,7 @@
}
}
- String sql = "SELECT R.PATH FROM ARTIFACTS R WHERE R.STATE=" +
RegistryConstants.ACTIVE_STATE + fromVersions + fromComments + fromTags +
pathQuery + authorQuery + updaterNameQuery + createdAfterQuery +
createdBeforeQuery + updatedAfterQuery + updatedBeforeQuery + commentsQuery +
tagsQuery;
+ String sql = "SELECT R.PATH FROM ARTIFACTS R" + fromVersions +
fromComments + fromTags + activeResourcesQuery + pathQuery + authorQuery +
updaterNameQuery + createdAfterQuery + createdBeforeQuery + updatedAfterQuery +
updatedBeforeQuery + commentsQuery + tagsQuery;
return sql;
}
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
