Project

General

Profile

« Previous | Next » 

Revision 57216

Splitting some listeners and adding getJobSummary methods

View differences:

ValidatorManagerImpl.java
1 1
package eu.dnetlib.validator.service.impl;
2 2

  
3
import eu.dnetlib.domain.functionality.validator.CustomProperties;
4
import eu.dnetlib.domain.functionality.validator.JobForValidation;
5
import eu.dnetlib.domain.functionality.validator.RuleSet;
6
import eu.dnetlib.domain.functionality.validator.StoredJob;
3
import eu.dnetlib.domain.functionality.validator.*;
7 4
import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
8 5
import eu.dnetlib.enabling.tools.blackboard.BlackboardNotificationHandler;
9 6
import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;
......
65 62
			throw new ValidatorException(e);
66 63
		}
67 64
	}
65

  
66
	public List<StoredJob> getJobSummary(List<String> baseUrl, int limit) throws DaoException {
67
		return jobsDao.getJobSummary(baseUrl,limit);
68
	}
68 69
	
69 70
	public List<StoredJob> getStoredJobs(String userMail, String jobType,
70 71
			Integer offset, Integer limit, String dateFrom, String dateTo)
......
233 234
					logger.debug("Setting METADATA_PREFIX to: oai_openaire");
234 235
					job.setMetadataPrefix("oai_openaire");
235 236
				} else if (
236
//					job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire2.0") ||
237 237
						job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d$") ||
238
//					job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire3.0") ||
239
//					job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire4.0") ||
240 238
								job.getDesiredCompatibilityLevel().equalsIgnoreCase("driver")) {
241 239
					logger.debug("Chosen set: OpenAIRE For Literature Repositories");
242 240
					logger.debug("Setting METADATA_PREFIX to: oai_dc");
243 241
					job.setMetadataPrefix("oai_dc");
244 242
				} else if (job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d_data$")) {
245
					// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire2.0_data")) {
246 243
					logger.debug("Chosen set: OpenAIRE For Data Archives");
247 244
					logger.debug("Setting METADATA_PREFIX to: oai_datacite");
248 245
					job.setMetadataPrefix("oai_datacite");
249 246
				} else if (job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d(.\\d)?_cris$")) {
250
					// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire3.0_cris")) {
251 247
					logger.debug("Chosen set: OpenAIRE For Cris");
252 248
					logger.debug("Setting METADATA_PREFIX to: oai_CERIF_openaire");
253 249
					job.setMetadataPrefix("oai_CERIF_openaire");

Also available in: Unified diff