Vojtech Szocs has posted comments on this change. Change subject: webadmin: remove sortby/page from searchstring ......................................................................
Patch Set 2: (1 comment) http://gerrit.ovirt.org/#/c/33787/2/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java: Line 1248: setSearchString(value, true); Line 1249: } Line 1250: } Line 1251: Line 1252: private boolean containsTokens(String searchString, String... tokens) { I've just realized that we could utilize SearchSuggestModel / ISyntaxChecker instead of doing plain String.contains() here: // assume method signature is following: // boolean containsTokens(String searchString, List<SyntaxObjectType> tokens) ISyntaxChecker syntaxChecker = getAutoCompleteModel().getSyntaxChecker(); // or even better yet, make SearchableListModel#getSyntaxChecker static SyntaxContainer syntaxCont = syntaxChecker.analyzeSyntaxState(searchString, true); // "true" argument means "search string should be complete" // assume SyntaxContainer contains method: // public List<SyntaxObject> getObjectList() { return Collections.unmodifiableList(mObjList); } List<SyntaxObjectType> searchStringTokens = ... // convert List<SyntaxObject> into List<SyntaxObjectType> Set<SyntaxObjectType> tokenSet = ... hash set from tokens Set<SyntaxObjectType> searchStringTokenSet = ... hash set from searchStringTokens // now we can do intersection between two sets, if not empty - return true, otherwise return false return !searchStringTokenSet.retainAll(tokenSet).isEmpty(); What do you think? Line 1253: String upperSearchString = searchString.toUpperCase(); Line 1254: for (String token: tokens) { Line 1255: if (upperSearchString.contains(StringConstants.SPACE + token)) { Line 1256: return true; -- To view, visit http://gerrit.ovirt.org/33787 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2b905d91e4b0a147df9c0e75c956e819ba42d0e6 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> Gerrit-Reviewer: Alexander Wels <aw...@redhat.com> Gerrit-Reviewer: Einav Cohen <eco...@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vsz...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches