enables Set in ListIdentifiers and clean the Code

oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java

@@ -91,7 +91,6 @@ public class IdentifierListDeliverer {
 	
 	public ListIdentifiersType getIdentifierList(String from, String to) throws ParseException{
 		
-		System.out.println("BUH");
 		String identifier;
 		QueryBuilder queryBuilder = QueryBuilders.rangeQuery("created").from(from).to(to);
 		
@@ -139,28 +138,15 @@ public class IdentifierListDeliverer {
 	public ListIdentifiersType getIdentifierListWithSet(String from, String to, String set) throws ParseException{
 		
 		String identifier;
-		
-		//System.out.println("JUHU");
+
 		String[] setParts = set.split(":");
 		
-		//String setField = setParts[0];
-		//String setValue = setParts[1];
-		
-		//System.out.println(setField + "   " + setValue);
-		
 		QueryBuilder rangeQuery = QueryBuilders.rangeQuery("created").from(from).to(to);
 		
-		QueryBuilder termQuery = QueryBuilders.termQuery(setParts[0], setParts[1]);
-		
 		QueryBuilder fieldQuer = QueryBuilders.matchPhraseQuery(setParts[0], setParts[1]);
 		
-		System.out.println(fieldQuer);
-		//System.out.println(termQuery);
-		
 		QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(fieldQuer);
 		
-		System.out.println(boolQuery);
-		
 		SearchRequestBuilder getListIdentifiersValuesBuilder = oaiEsClient.getOaiESClient()
 				.prepareSearch(oaiEsClient.getEsIndex())
 				.setTypes(oaiEsClient.getEsType())
@@ -168,8 +154,6 @@ public class IdentifierListDeliverer {
 				.setQuery(boolQuery)
 				.setSize(10);
 		
-		System.out.println(getListIdentifiersValuesBuilder);
-		
 		SearchResponse listListIdentiierValues = getListIdentifiersValuesBuilder.execute().actionGet();
 		
 		if(listListIdentiierValues.getHits().getTotalHits()>0){

oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java

@@ -226,14 +226,8 @@ public class OAIPMHImpl implements OAIPMHProducer{
 		IdentifierListDeliverer listIdDeliv = new IdentifierListDeliverer(oaiEsClient);
 		JAXBElement<OAIPMHType> oaipmhRoot = obf.createOAIPMH(oai);
 		
-		System.out.println("Check base request");
 		if(listIdDeliv.requestChecker(request)){
 			
-			/*if(request.getSet()!=null){
-				error.setError(TGConstants.OAI_NO_SET_HIERARCHY).setValue("The repository does not support sets");
-				oai.getError().add(error.setError(TGConstants.OAI_NO_SET_HIERARCHY));
-			}
-			else*/ 
 			if(!request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)){
 				try {
 					
@@ -249,37 +243,27 @@ public class OAIPMHImpl implements OAIPMHProducer{
 			}
 			else{
 				try {
-					System.out.println("else1");
-					
-					
+				
 					if(request.getSet()==null){
 						if(listIdDeliv.getIdentifierList(request.getFrom(), request.getUntil())!=null){
-							System.out.println("if1");
 							listIDs = listIdDeliv.getIdentifierList(request.getFrom(), request.getUntil());
 							oai.setListIdentifiers(listIDs);
 						}else{
-							System.out.println("else");
 							error.setError(TGConstants.OAI_NO_RECORD_MATCH).setValue("The combination of the values " + request.getFrom() + " and " +
 									request.getUntil() + " results in an empty list");
 							oai.getError().add(error.setError(TGConstants.OAI_NO_RECORD_MATCH));
 						}
 					}else{
 						if(request.getSet()!=null && listIdDeliv.getIdentifierListWithSet(request.getFrom(), request.getUntil(), request.getSet())!=null){
-							System.out.println("I got it");
 							listIDs = listIdDeliv.getIdentifierListWithSet(request.getFrom(), request.getUntil(), request.getSet());
 							oai.setListIdentifiers(listIDs);
-							System.out.println("nasasas");
 						}else{
-							System.out.println("HAHA");
 							error.setError(TGConstants.OAI_NO_RECORD_MATCH).setValue("The combination of the values " + request.getFrom() + " and " +
 									request.getUntil() + " results in an empty list");
 							oai.getError().add(error.setError(TGConstants.OAI_NO_RECORD_MATCH));
 						}
 					
 					}
-					
-					
-						
 						
 				} catch (Exception e) {
 					// TODO Auto-generated catch block

oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java

@@ -96,7 +96,7 @@ public class OaiPmhTest {
 
 	
 	@Test
-	@Ignore 
+	//@Ignore 
 	public void testListIdentifiers() throws ParseException{
 	 
 	JAXBElement<OAIPMHType> r = testRequest.getRequest("ListIdentifiers", "",
@@ -173,7 +173,7 @@ public class OaiPmhTest {
 	 */
 	
 	@Test
-	//@Ignore
+	@Ignore
 	public void testListIdentifierSets() throws ParseException {
 		System.out.println("Test for the verb \"GetRecord\" with succesfull response");
 		JAXBElement<OAIPMHType> p = testRequest.getRequest("ListIdentifiers",