Revision 57087
Added by Ioannis Diplas over 4 years ago
| 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()) {
|
|
| 222 |
if (job.isRegistration() || job.isUpdateExisting()) {
|
|
| 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())) {
|
| ... | ... | |
| 227 | 227 |
job.setSelectedUsageRules(ruleset.getUsageRulesIds()); |
| 228 | 228 |
} |
| 229 | 229 |
} |
| 230 |
|
|
| 231 |
if ( job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire4.0$") ) {
|
|
| 232 |
logger.debug("Chosen set: OpenAIRE For Thematic + Institutional Repositories");
|
|
| 233 |
logger.debug("Setting METADATA_PREFIX to: oai_openaire");
|
|
| 234 |
job.setMetadataPrefix("oai_openaire");
|
|
| 235 |
} else if ( |
|
| 230 |
if(job.getMetadataPrefix() == null || job.getMetadataPrefix().equals("")) {
|
|
| 231 |
if (job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire4.0$")) {
|
|
| 232 |
logger.debug("Chosen set: OpenAIRE For Thematic + Institutional Repositories");
|
|
| 233 |
logger.debug("Setting METADATA_PREFIX to: oai_openaire");
|
|
| 234 |
job.setMetadataPrefix("oai_openaire");
|
|
| 235 |
} else if (
|
|
| 236 | 236 |
// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire2.0") ||
|
| 237 |
job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d$") ||
|
|
| 237 |
job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d$") ||
|
|
| 238 | 238 |
// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire3.0") ||
|
| 239 | 239 |
// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire4.0") ||
|
| 240 |
job.getDesiredCompatibilityLevel().equalsIgnoreCase("driver") ) {
|
|
| 241 |
logger.debug("Chosen set: OpenAIRE For Literature Repositories");
|
|
| 242 |
logger.debug("Setting METADATA_PREFIX to: oai_dc");
|
|
| 243 |
job.setMetadataPrefix("oai_dc");
|
|
| 244 |
} else if ( job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d_data$")) {
|
|
| 240 |
job.getDesiredCompatibilityLevel().equalsIgnoreCase("driver")) {
|
|
| 241 |
logger.debug("Chosen set: OpenAIRE For Literature Repositories");
|
|
| 242 |
logger.debug("Setting METADATA_PREFIX to: oai_dc");
|
|
| 243 |
job.setMetadataPrefix("oai_dc");
|
|
| 244 |
} else if (job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d_data$")) {
|
|
| 245 | 245 |
// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire2.0_data")) {
|
| 246 |
logger.debug("Chosen set: OpenAIRE For Data Archives");
|
|
| 247 |
logger.debug("Setting METADATA_PREFIX to: oai_datacite");
|
|
| 248 |
job.setMetadataPrefix("oai_datacite");
|
|
| 249 |
} else if ( job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d(.\\d)?_cris$")) {
|
|
| 246 |
logger.debug("Chosen set: OpenAIRE For Data Archives");
|
|
| 247 |
logger.debug("Setting METADATA_PREFIX to: oai_datacite");
|
|
| 248 |
job.setMetadataPrefix("oai_datacite");
|
|
| 249 |
} else if (job.getDesiredCompatibilityLevel().toLowerCase().matches("^openaire\\d.\\d(.\\d)?_cris$")) {
|
|
| 250 | 250 |
// job.getDesiredCompatibilityLevel().equalsIgnoreCase("openaire3.0_cris")) {
|
| 251 |
logger.debug("Chosen set: OpenAIRE For Cris");
|
|
| 252 |
logger.debug("Setting METADATA_PREFIX to: oai_CERIF_openaire");
|
|
| 253 |
job.setMetadataPrefix("oai_CERIF_openaire");
|
|
| 254 |
} else {
|
|
| 255 |
logger.error("Cannot set metadata prefx for " + job.getDesiredCompatibilityLevel() + " guidelines");
|
|
| 251 |
logger.debug("Chosen set: OpenAIRE For Cris");
|
|
| 252 |
logger.debug("Setting METADATA_PREFIX to: oai_CERIF_openaire");
|
|
| 253 |
job.setMetadataPrefix("oai_CERIF_openaire");
|
|
| 254 |
} else {
|
|
| 255 |
logger.error("Cannot set metadata prefx for " + job.getDesiredCompatibilityLevel() + " guidelines");
|
|
| 256 |
} |
|
| 256 | 257 |
} |
| 257 | 258 |
|
| 258 |
|
|
| 259 | 259 |
StoredJob newJob = new StoredJob(job); |
| 260 | 260 |
|
| 261 | 261 |
int usageJobs = 0; |
| ... | ... | |
| 317 | 317 |
|
| 318 | 318 |
newJob.setValidationType(validationType); |
| 319 | 319 |
|
| 320 |
if (job.isRegistration()) {
|
|
| 320 |
if (job.isRegistration() || job.isUpdateExisting()) {
|
|
| 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()) {
|
|
| 342 |
if (job.isRegistration() || job.isUpdateExisting()) {
|
|
| 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()) {
|
|
| 401 |
if (job.isRegistration() || job.isUpdateExisting()) {
|
|
| 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()) {
|
|
| 431 |
if (job.isRegistration() || job.isUpdateExisting()) {
|
|
| 432 | 432 |
validator.submitJob(jobUsage, 1, listenerUsage, regListener); |
| 433 | 433 |
} else {
|
| 434 | 434 |
validator.submitJob(jobUsage, 1, listenerUsage, compTestListener); |
Also available in: Unified diff
Checking whether or not metadataPrefix is null or empty beforing setting it