hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 06:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

port pr1890 minus jspui

Browse Source
This commit is contained in:
Terry Brady
2018-08-06 11:43:45 -07:00
parent 3eb16056c6
commit 5437f7f8b9
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace-api/src/main/java/org/dspace/search/Harvest.java
View File

@@ -18,6 +18,7 @@ import org.apache.log4j.Logger;
import org.dspace.authorize.factory.AuthorizeServiceFactory; import org.dspace.authorize.factory.AuthorizeServiceFactory;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.DCDate; import org.dspace.content.DCDate;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.content.Item; import org.dspace.content.Item;
@@ -98,15 +99,20 @@ public class Harvest {
discoverQuery.addFilterQueries("search.resourcetype:" + Constants.ITEM); discoverQuery.addFilterQueries("search.resourcetype:" + Constants.ITEM);
if (scope != null) { if (scope != null) {
discoverQuery.addFieldPresentQueries("location:" + scope.getID()); if (scope instanceof Community) {
discoverQuery.addFilterQueries("location:m" + scope.getID());
} else if (scope instanceof Collection) {
discoverQuery.addFilterQueries("location:l" + scope.getID());
}
} }
if (startDate != null) { if (startDate != null && endDate != null) {
discoverQuery.addFilterQueries("lastModified => " + new DCDate(startDate).toString()); discoverQuery.addFilterQueries("lastModified:[" + new DCDate(startDate).toString()
} + " TO " + new DCDate(endDate).toString()+ "]");
} else if (startDate != null) {
if (endDate != null) { discoverQuery.addFilterQueries("lastModified:[" + new DCDate(startDate).toString() + " TO *]");
discoverQuery.addFilterQueries("lastModified <= " + new DCDate(startDate).toString()); } else if (endDate != null) {
discoverQuery.addFilterQueries("lastModified:[* TO " + new DCDate(endDate).toString()+ " ]");
} }
if (!withdrawn) { if (!withdrawn) {