mirror of
https://github.com/sismics/docs.git
synced 2024-11-22 14:07:55 +01:00
Add custom parameter for exact search by title
This commit is contained in:
parent
b0d0e93364
commit
d98c1bddec
@ -52,7 +52,7 @@ public class DocumentCriteria {
|
|||||||
private List<List<String>> tagIdList;
|
private List<List<String>> tagIdList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tag IDs to excluded.
|
* Tag IDs to exclude.
|
||||||
* The first and second level list will be excluded.
|
* The first and second level list will be excluded.
|
||||||
*/
|
*/
|
||||||
private List<List<String>> excludedTagIdList;
|
private List<List<String>> excludedTagIdList;
|
||||||
@ -82,6 +82,11 @@ public class DocumentCriteria {
|
|||||||
*/
|
*/
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The title.
|
||||||
|
*/
|
||||||
|
private String title;
|
||||||
|
|
||||||
public List<String> getTargetIdList() {
|
public List<String> getTargetIdList() {
|
||||||
return targetIdList;
|
return targetIdList;
|
||||||
}
|
}
|
||||||
@ -194,4 +199,12 @@ public class DocumentCriteria {
|
|||||||
public void setMimeType(String mimeType) {
|
public void setMimeType(String mimeType) {
|
||||||
this.mimeType = mimeType;
|
this.mimeType = mimeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -295,6 +295,10 @@ public class LuceneIndexingHandler implements IndexingHandler {
|
|||||||
criteriaList.add("d.DOC_UPDATEDATE_D <= :updateDateMax");
|
criteriaList.add("d.DOC_UPDATEDATE_D <= :updateDateMax");
|
||||||
parameterMap.put("updateDateMax", criteria.getUpdateDateMax());
|
parameterMap.put("updateDateMax", criteria.getUpdateDateMax());
|
||||||
}
|
}
|
||||||
|
if (criteria.getTitle() != null) {
|
||||||
|
criteriaList.add("d.DOC_TITLE_C = :title");
|
||||||
|
parameterMap.put("title", criteria.getTitle());
|
||||||
|
}
|
||||||
if (criteria.getTagIdList() != null && !criteria.getTagIdList().isEmpty()) {
|
if (criteria.getTagIdList() != null && !criteria.getTagIdList().isEmpty()) {
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (List<String> tagIdList : criteria.getTagIdList()) {
|
for (List<String> tagIdList : criteria.getTagIdList()) {
|
||||||
|
@ -598,6 +598,10 @@ public class DocumentResource extends BaseResource {
|
|||||||
// New fulltext search criteria
|
// New fulltext search criteria
|
||||||
fullQuery.add(params[1]);
|
fullQuery.add(params[1]);
|
||||||
break;
|
break;
|
||||||
|
case "title":
|
||||||
|
// New title criteria
|
||||||
|
documentCriteria.setTitle(params[1]);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
fullQuery.add(criteria);
|
fullQuery.add(criteria);
|
||||||
break;
|
break;
|
||||||
|
@ -143,7 +143,7 @@ public class TestDocumentResource extends BaseJerseyTest {
|
|||||||
json = target().path("/document").request()
|
json = target().path("/document").request()
|
||||||
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, document3Token)
|
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, document3Token)
|
||||||
.put(Entity.form(new Form()
|
.put(Entity.form(new Form()
|
||||||
.param("title", "My super title document 3")
|
.param("title", "My_super_title_document_3")
|
||||||
.param("description", "My super description for document 3")
|
.param("description", "My super description for document 3")
|
||||||
.param("language", "eng")
|
.param("language", "eng")
|
||||||
.param("create_date", Long.toString(create3Date))), JsonObject.class);
|
.param("create_date", Long.toString(create3Date))), JsonObject.class);
|
||||||
@ -217,6 +217,7 @@ public class TestDocumentResource extends BaseJerseyTest {
|
|||||||
Assert.assertEquals(1, searchDocuments("mime:image/png", document1Token));
|
Assert.assertEquals(1, searchDocuments("mime:image/png", document1Token));
|
||||||
Assert.assertEquals(0, searchDocuments("mime:empty/void", document1Token));
|
Assert.assertEquals(0, searchDocuments("mime:empty/void", document1Token));
|
||||||
Assert.assertEquals(1, searchDocuments("after:2010 before:2040-08 tag:super shared:yes lang:eng simple:title simple:description full:uranium", document1Token));
|
Assert.assertEquals(1, searchDocuments("after:2010 before:2040-08 tag:super shared:yes lang:eng simple:title simple:description full:uranium", document1Token));
|
||||||
|
Assert.assertEquals(1, searchDocuments("title:My_super_title_document_3", document3Token));
|
||||||
|
|
||||||
// Search documents (nothing)
|
// Search documents (nothing)
|
||||||
Assert.assertEquals(0, searchDocuments("random", document1Token));
|
Assert.assertEquals(0, searchDocuments("random", document1Token));
|
||||||
@ -228,6 +229,7 @@ public class TestDocumentResource extends BaseJerseyTest {
|
|||||||
Assert.assertEquals(0, searchDocuments("before:2040-05-38", document1Token));
|
Assert.assertEquals(0, searchDocuments("before:2040-05-38", document1Token));
|
||||||
Assert.assertEquals(0, searchDocuments("tag:Nop", document1Token));
|
Assert.assertEquals(0, searchDocuments("tag:Nop", document1Token));
|
||||||
Assert.assertEquals(0, searchDocuments("lang:fra", document1Token));
|
Assert.assertEquals(0, searchDocuments("lang:fra", document1Token));
|
||||||
|
Assert.assertEquals(0, searchDocuments("title:Unknown title", document3Token));
|
||||||
|
|
||||||
// Get document 1
|
// Get document 1
|
||||||
json = target().path("/document/" + document1Id).request()
|
json = target().path("/document/" + document1Id).request()
|
||||||
|
Loading…
Reference in New Issue
Block a user