Project

General

Profile

« Previous | Next » 

Revision 43245

moved MetadataReference class in common package, it will be used by both index service and oai store service

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 8
import org.apache.commons.lang3.StringUtils;
7 9
import org.apache.commons.logging.Log;
8 10
import org.apache.commons.logging.LogFactory;
......
17 19

  
18 20
	@Override
19 21
	public void execute(final BlackboardServerHandler handler, final BlackboardJob job) throws Exception {
20
		final String mdformat = job.getParameters().get("format");
21
		final String layout = job.getParameters().get("layout");
22
		final String interp = job.getParameters().get("interpretation");
22

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

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

  
26 30
		if (StringUtils.isNotBlank(set)) {
27
			deleted = this.mongoPublisherStoreDAO.deleteFromStore(mdformat, interp, layout, dbName, set);
31
			deleted = this.mongoPublisherStoreDAO.deleteFromStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName, set);
28 32
		} else {
29
			deleted = this.mongoPublisherStoreDAO.deleteStore(mdformat, interp, layout, dbName);
33
			deleted = this.mongoPublisherStoreDAO.deleteStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName);
30 34
		}
31 35
		if (deleted) {
32 36
			log.info("OAI Deletion succeded on db " + dbName);

Also available in: Unified diff