Project

General

Profile

« Previous | Next » 

Revision 45455

Included changes about the CQL translation as in most recent version of cnr-cql-utils of DNet40 + refactoring of OAI parameters

View differences:

DropStoreAction.java
3 3
import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
4 4
import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;
5 5
import eu.dnetlib.oai.mongo.MongoPublisherStoreDAO;
6
import eu.dnetlib.utils.MetadataReference;
7
import eu.dnetlib.utils.MetadataReferenceFactory;
6
import eu.dnetlib.oai.utils.OAIParameterNames;
8 7
import org.apache.commons.lang3.StringUtils;
9 8
import org.apache.commons.logging.Log;
10 9
import org.apache.commons.logging.LogFactory;
......
19 18

  
20 19
	@Override
21 20
	public void execute(final BlackboardServerHandler handler, final BlackboardJob job) throws Exception {
21
		String mdformat = job.getParameters().get(OAIParameterNames.OAI_FORMAT_NAME);
22
		String layout = job.getParameters().get(OAIParameterNames.OAI_FORMAT_LAYOUT);
23
		String interp = job.getParameters().get(OAIParameterNames.OAI_FORMAT_INTERPRETATION);
24
		String dbName = job.getParameters().get(OAIParameterNames.OAI_DB);
25
		String coll = job.getParameters().get(OAIParameterNames.OAI_COLLECTON);
26
		String set = job.getParameters().get(OAIParameterNames.OAI_SOURCE);
22 27

  
23
		final String dbName = job.getParameters().get("oai_dbName");
24
		final String set = job.getParameters().get("set");
25 28
		boolean deleted = false;
26

  
27
		final String collectionName = job.getParameters().get("oai_collectionName");
28
		final MetadataReference mdRef = MetadataReferenceFactory.decode(collectionName, MDREF_SEPARATOR);
29

  
30 29
		if (StringUtils.isNotBlank(set)) {
31
			deleted = this.mongoPublisherStoreDAO.deleteFromStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName, set);
30
			deleted = mongoPublisherStoreDAO.deleteFromStore(mdformat, interp, layout, dbName, set);
32 31
		} else {
33
			deleted = this.mongoPublisherStoreDAO.deleteStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName);
32
			deleted = this.mongoPublisherStoreDAO.deleteStore(mdformat, interp, layout, dbName);
34 33
		}
35 34
		if (deleted) {
36
			log.info("OAI Deletion succeded on db " + dbName);
35
			log.info("OAI Deletion succeeded on db " + dbName+" oaistore: "+coll+", for set (all if empty) : "+set);
37 36
		} else {
38
			log.info("OAI Deletion failed on db " + dbName);
37
			log.info("Probably the store to delete "+coll+" does not exist. OAI Deletion failed on db " + dbName);
39 38
		}
40 39
		handler.done(job);
41 40
	}

Also available in: Unified diff