Rev 457 | Rev 485 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 457 | Rev 481 | ||
|---|---|---|---|
| Line 67... | Line 67... | ||
| 67 | { |
67 | { |
| 68 | 68 | ||
| 69 | if (searchType == null) |
69 | if (searchType == null) |
| 70 | searchType = SearchTypeEnum.AllWords; |
70 | searchType = SearchTypeEnum.AllWords; |
| 71 | CommonSearchResults commonSearchResults = new CommonSearchResults(); |
71 | CommonSearchResults commonSearchResults = new CommonSearchResults(); |
| 72 | List<ISearchResults> results = new ArrayList<ISearchResults>(); |
- | |
| 73 | - | ||
| 74 | for (ModuleEnum module : ModuleEnum.values()) |
72 | if(query != null && query.trim().length() > 0) |
| 75 | { |
73 | { |
| - | 74 | ||
| - | 75 | ||
| - | 76 | List<ISearchResults> results = new ArrayList<ISearchResults>(); |
|
| - | 77 | ||
| 76 | if (module.getModuleCommonServices() != null) |
78 | for (ModuleEnum module : ModuleEnum.values()) |
| 77 | { |
79 | { |
| - | 80 | if (module.getModuleCommonServices() != null) |
|
| - | 81 | { |
|
| 78 | List<ISearchResults> iSearchResultsList = search(userSession, query, searchType, module,null, 0, from); |
82 | List<ISearchResults> iSearchResultsList = search(userSession, query, searchType, module,null, 0, from); |
| 79 | if(iSearchResultsList != null && iSearchResultsList.size() > 0) |
83 | if(iSearchResultsList != null && iSearchResultsList.size() > 0) |
| 80 | for(ISearchResults iSearchResults: iSearchResultsList) |
84 | for(ISearchResults iSearchResults: iSearchResultsList) |
| 81 | { |
- | |
| 82 | if (iSearchResults != null && iSearchResults.getTotalResults() > 0) |
- | |
| 83 | { |
85 | { |
| - | 86 | if (iSearchResults != null && iSearchResults.getTotalResults() > 0) |
|
| - | 87 | { |
|
| 84 | results.add(iSearchResults); |
88 | results.add(iSearchResults); |
| 85 | commonSearchResults.addMoreResults(iSearchResults.getTotalResults()); |
89 | commonSearchResults.addMoreResults(iSearchResults.getTotalResults()); |
| - | 90 | } |
|
| 86 | } |
91 | } |
| 87 | } |
92 | } |
| 88 | } |
93 | } |
| - | 94 | commonSearchResults.setResults(results); |
|
| - | 95 | } |
|
| - | 96 | else |
|
| - | 97 | { |
|
| - | 98 | commonSearchResults.setResults(new ArrayList<ISearchResults>()); |
|
| 89 | } |
99 | } |
| 90 | commonSearchResults.setResults(results); |
- | |
| 91 | commonSearchResults.setQuery(query); |
100 | commonSearchResults.setQuery(query); |
| 92 | commonSearchResults.setSearchType(searchType.getMessageKey()); |
101 | commonSearchResults.setSearchType(searchType.getMessageKey()); |
| 93 | return commonSearchResults; |
102 | return commonSearchResults; |
| 94 | } |
103 | } |
| 95 | 104 | ||