vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

#227: revert waiting for better solution

Browse Source
This commit is contained in:
Benjamin Gamard 2018-04-06 13:18:47 +02:00
parent 45a672ab0d
commit cedd4b47b3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java
View File

@ -2,6 +2,7 @@ package com.sismics.docs.core.util.indexing;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.sismics.docs.core.constant.ConfigType;
import com.sismics.docs.core.constant.PermType;
import com.sismics.docs.core.dao.ConfigDao;
@ -244,12 +245,14 @@ public class LuceneIndexingHandler implements IndexingHandler {
}
if (criteria.getTagIdList() != null && !criteria.getTagIdList().isEmpty()) {
int index = 0;
List<String> tagCriteriaList = Lists.newArrayList();
for (String tagId : criteria.getTagIdList()) {
sb.append(String.format("left join T_DOCUMENT_TAG dt%d on dt%d.DOT_IDDOCUMENT_C = d.DOC_ID_C and dt%d.DOT_IDTAG_C = :tagId%d and dt%d.DOT_DELETEDATE_D is null ", index, index, index, index, index));
parameterMap.put("tagId" + index, tagId);
criteriaList.add(String.format("dt%d.DOT_ID_C is not null", index));
tagCriteriaList.add(String.format("dt%d.DOT_ID_C is not null", index));
index++;
}
criteriaList.add("(" + Joiner.on(" OR ").join(tagCriteriaList) + ")");
}
if (criteria.getShared() != null && criteria.getShared()) {
criteriaList.add("s.count > 0");

2
docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java
View File

@ -188,7 +188,7 @@ public class TestDocumentResource extends BaseJerseyTest {
Assert.assertEquals(2, searchDocuments("uat:" + DateTimeFormat.forPattern("yyyy-MM-dd").print(new Date().getTime()), document1Token));
Assert.assertEquals(2, searchDocuments("uafter:2010 ubefore:2040-08", document1Token));
Assert.assertEquals(1, searchDocuments("tag:super", document1Token));
Assert.assertEquals(1, searchDocuments("tag:super tag:hr", document1Token));
// TODO waiting for #227 Assert.assertEquals(1, searchDocuments("tag:super tag:hr", document1Token));
Assert.assertEquals(1, searchDocuments("shared:yes", document1Token));
Assert.assertEquals(2, searchDocuments("lang:eng", document1Token));
Assert.assertEquals(1, searchDocuments("after:2010 before:2040-08 tag:super shared:yes lang:eng title description full:uranium", document1Token));