diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml index db6205afc5..6833b4861d 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml @@ -33,13 +33,8 @@ assoc.parent_node_id = #{parentNodeId} and assoc.type_qname_id = #{assocTypeQNameId} - and lower(prop.string_value) like lower(#{filter}) - - and prop.string_value like #{filter} - - order by childNode.id ASC order by childNode.id DESC diff --git a/source/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java b/source/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java index 910e2e030a..6c170b3b51 100644 --- a/source/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java +++ b/source/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -41,7 +41,6 @@ public class ArchivedNodesCannedQueryBuilder private final NodeRef archiveRootNodeRef; private final PagingRequest pagingRequest; private String filter; - private boolean filterIgnoreCase; private boolean sortOrderAscending; public Builder(NodeRef archiveRootNodeRef, PagingRequest pagingRequest) @@ -56,12 +55,6 @@ public class ArchivedNodesCannedQueryBuilder return this; } - public Builder filterIgnoreCase(boolean filterIgnoreCase) - { - this.filterIgnoreCase = filterIgnoreCase; - return this; - } - public Builder sortOrderAscending(boolean sortOrderAscending) { this.sortOrderAscending = sortOrderAscending; @@ -85,7 +78,6 @@ public class ArchivedNodesCannedQueryBuilder builder.pagingRequest.getQueryExecutionId()); pr.setRequestTotalCountMax(builder.pagingRequest.getRequestTotalCountMax()); this.pagingRequest = pr; - this.filterIgnoreCase = builder.filterIgnoreCase; this.filter = builder.filter; this.sortOrderAscending = builder.sortOrderAscending; } diff --git a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java index beda997f23..5a58865642 100644 --- a/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java +++ b/source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -953,7 +953,7 @@ public class ArchiveAndRestoreTest extends TestCase ScriptPagingDetails paging = new ScriptPagingDetails(2, 0); // Create canned query ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( - this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true).build(); + this.archiveStoreRootNodeRef, paging).build(); // Query the DB PagingResults result = runListArchivedNodesAsAdmin(queryBuilder); @@ -972,7 +972,7 @@ public class ArchiveAndRestoreTest extends TestCase // Create canned query queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( this.archiveStoreRootNodeRef, paging) - .filterIgnoreCase(true).build(); + .build(); result = runListArchivedNodesAsAdmin(queryBuilder); assertEquals("USER_A deleted only 1 item.", 1, result.getPage().size()); @@ -984,7 +984,7 @@ public class ArchiveAndRestoreTest extends TestCase AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser(); queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, paging) - .filterIgnoreCase(true).build(); + .build(); result = nodeArchiveService.listArchivedNodes(queryBuilder); // Admin can retrieve all users' deleted nodes @@ -1028,7 +1028,7 @@ public class ArchiveAndRestoreTest extends TestCase ScriptPagingDetails paging = new ScriptPagingDetails(3, 0); ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( - this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true) + this.archiveStoreRootNodeRef, paging) // Sorting by Node_DBID. DESC. (same as sorting by archived date). .sortOrderAscending(false) .build(); @@ -1084,7 +1084,7 @@ public class ArchiveAndRestoreTest extends TestCase String filter = "picture*"; ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder( - this.archiveStoreRootNodeRef, paging).filterIgnoreCase(true).filter(filter) + this.archiveStoreRootNodeRef, paging).filter(filter) .sortOrderAscending(false).build(); // Query the DB @@ -1101,7 +1101,7 @@ public class ArchiveAndRestoreTest extends TestCase // Change the filter filter = "pictureT*.jpg"; queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, - paging).filterIgnoreCase(true).filter(filter).sortOrderAscending(false).build(); + paging).filter(filter).sortOrderAscending(false).build(); result = nodeArchiveService.listArchivedNodes(queryBuilder); assertEquals("There is only 1 node that matches 'pictureT*.jpg' pattern.", 1, result @@ -1113,7 +1113,7 @@ public class ArchiveAndRestoreTest extends TestCase filter = "*Test.jpg"; queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, - paging).filterIgnoreCase(true).filter(filter).sortOrderAscending(false).build(); + paging).filter(filter).sortOrderAscending(false).build(); result = nodeArchiveService.listArchivedNodes(queryBuilder); assertEquals("There are 2 nodes that match '*Test.jpg' pattern.", 2, result.getPage().size()); @@ -1126,9 +1126,9 @@ public class ArchiveAndRestoreTest extends TestCase filter = "*test.jpg"; queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(this.archiveStoreRootNodeRef, - paging).filterIgnoreCase(false).filter(filter).sortOrderAscending(false).build(); + paging).filter(filter).sortOrderAscending(false).build(); result = nodeArchiveService.listArchivedNodes(queryBuilder); - assertEquals("There is No node that matches '*test.jpg' pattern.", 0, result.getPage().size()); + assertEquals("There are 2 nodes that matches '*test.jpg' pattern.", 2, result.getPage().size()); } }