Project

General

Profile

« Previous | Next » 

Revision 57070

Reverting the || job.isUpdate()

View differences:

modules/uoa-validator-service/trunk/src/main/java/eu/dnetlib/validator/service/impl/ValidatorManagerImpl.java
219 219
			logger.info("Submiting validation job requested by user: " + job.getUserEmail());
220 220

  
221 221

  
222
			if (job.isRegistration() || job.isUpdateExisting()) {
222
			if (job.isRegistration()) {
223 223
				logger.debug("initiating preregistration validations on repo " + job.getBaseUrl() + " for user " + job.getUserEmail() + "and desired compatibility: " + job.getDesiredCompatibilityLevel());
224 224

  
225 225
				for (RuleSet ruleset : rulesetsDao.getRuleSets(job.getDesiredCompatibilityLevel())) {
......
317 317

  
318 318
			newJob.setValidationType(validationType);
319 319

  
320
			if (job.isRegistration() || job.isUpdateExisting()) {
320
			if (job.isRegistration()) {
321 321
				newJob.setJobType("Registration Request");
322 322
				//TODO move in uoa-domain
323 323
				newJob.setActivationId(job.getActivationId());
......
339 339
			int jobIdStored = jobsDao.save(newJob);
340 340
			
341 341
			RegistrationListener regListener = null;
342
			if (job.isRegistration() || job.isUpdateExisting()) {
342
			if (job.isRegistration()) {
343 343
				regListener = listenersManager.createRegListener();
344 344
				regListener.setUserMail(job.getUserEmail());
345 345
				regListener.setDatasourceId(job.getDatasourceId());
......
398 398
					
399 399
					jobContent = new Job(jobIdStored, 1, rulesContent, props);
400 400
					
401
					if (job.isRegistration() || job.isUpdateExisting()) {
401
					if (job.isRegistration()) {
402 402
						validator.submitJob(jobContent, 1, listenerContent, regListener);
403 403
					} else {
404 404
						validator.submitJob(jobContent, 1, listenerContent, compTestListener);
......
428 428
					jobsUsage.add(new Job(jobIdStored, 2, rulesUsage, pros));
429 429
				}
430 430
				for (Job jobUsage : jobsUsage ) {
431
					if (job.isRegistration() || job.isUpdateExisting()) {
431
					if (job.isRegistration()) {
432 432
						validator.submitJob(jobUsage, 1, listenerUsage, regListener);
433 433
					} else {
434 434
						validator.submitJob(jobUsage, 1, listenerUsage, compTestListener);

Also available in: Unified diff