apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1179: API searches for names should not be fuzzy. fuzzy

Browse Source 
search should be done through keyword.
This commit is contained in:
Min Chen 2013-03-08 16:24:54 -08:00
parent 860ea5c0dd
commit e40ebcce8f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -1518,7 +1518,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
// pagination
_accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("volumeType", sb.entity().getVolumeType(), SearchCriteria.Op.LIKE);
sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
@ -1555,7 +1555,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
}
if (name != null) {
sc.setParameters("name", "%" + name + "%");
sc.setParameters("name", name);
}
sc.setParameters("systemUse", 1);

6
server/src/com/cloud/user/DomainManagerImpl.java
View File

@ -365,7 +365,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
SearchBuilder<DomainVO> sb = _domainDao.createSearchBuilder();
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ);
sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE);
sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
@ -379,7 +379,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
}
if (domainName != null) {
sc.setParameters("name", "%" + domainName + "%");
sc.setParameters("name", domainName);
}
if (level != null) {
@ -492,7 +492,7 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
if (!domains.isEmpty() && !sameDomain) {
InvalidParameterValueException ex = new InvalidParameterValueException("Failed to update specified domain id with name '" + domainName + "' since it already exists in the system");
ex.addProxyObject(domain, domainId, "domainId");
ex.addProxyObject(domain, domainId, "domainId");
throw ex;
}
}