/ - Diff - D-Net - D-Net project tracking tool

     package eu.dnetlib.clients.index.utils;
     import com.google.common.collect.ComparisonChain;
     /**
      * Container class for metadata format, layout and interpretation.
+     *
      * @author claudio
      */
     public class MetadataReference {
     	/**
     	 * Metadata format.
     	 */
     	private String format;
     	/**
     	 * Metadata layout.
     	 */
     	private String layout;
     	/**
     	 * Metadata interpretation.
     	 */
     	private String interpretation;
     	/**
     	 * Constructor for MetadataReference.
+    	 *
     	 * @param format         Metadata format
     	 * @param layout         Metadata layout
     	 * @param interpretation Metadata interpretation
     	 */
     	public MetadataReference(final String format, final String layout, final String interpretation) {
     		this.format = format;
     		this.layout = layout;
     		this.interpretation = interpretation;
+    	}
     	public String getFormat() {
     		return format;
+    	}
     	public String getLayout() {
     		return layout;
+    	}
     	public String getInterpretation() {
     		return interpretation;
+    	}
     	@Override
     	public boolean equals(final Object that) {
     		if (!(that instanceof MetadataReference))
     			return false;
     		final MetadataReference mdRef = (MetadataReference) that;
     		return ComparisonChain.start()
     				.compare(this.format, mdRef.getFormat())
     				.compare(this.layout, mdRef.getLayout())
     				.compare(this.interpretation, mdRef.getInterpretation())
     				.result() == 0;
+    	}
     	@Override
     	public int hashCode() {
     		return getFormat().hashCode() + getLayout().hashCode() + getInterpretation().hashCode();
+    	}
     	@Override
     	public String toString() {
     		return getFormat() + "_" + getLayout() + "_" + getInterpretation();
+    	}
+    }

     package eu.dnetlib.clients.index.utils;
     public class MetadataReferenceFactory {
     	public MetadataReference getMetadata(final String format, final String layout, final String interpretation) {
     		return new MetadataReference(format, layout, interpretation);
+    	}
     	public MetadataReference decodeMetadata(final String encoded) {
     		String[] split = encoded.split("@");
     		if (split.length == 3) return getMetadata(split[0], split[1], split[2]);
     		throw new IllegalStateException("malformed metadata reference: " + encoded);
+    	}
+    }

modules/dnet-data-provision-services/trunk/src/main/java/eu/dnetlib/oai/actions/OAIStoreActions.java
1		package eu.dnetlib.oai.actions;
2
3		public enum OAIStoreActions {
4		SYNC, COUNT_SETS, REFRESH_CONFIG, ENSURE_INDEXES, CREATE_STORE, CREATE_OAI_INDEX, DROP_STORE
5		}

     package eu.dnetlib.utils;
     import com.google.common.collect.ComparisonChain;
     /**
      * Container class for metadata format, layout and interpretation.
+     *
      * @author claudio
      */
     public class MetadataReference {
     	/**
     	 * Metadata format.
     	 */
     	private String format;
     	/**
     	 * Metadata layout.
     	 */
     	private String layout;
     	/**
     	 * Metadata interpretation.
     	 */
     	private String interpretation;
     	/**
     	 * Constructor for MetadataReference.
+    	 *
     	 * @param format         Metadata format
     	 * @param layout         Metadata layout
     	 * @param interpretation Metadata interpretation
     	 */
     	public MetadataReference(final String format, final String layout, final String interpretation) {
     		this.format = format;
     		this.layout = layout;
     		this.interpretation = interpretation;
+    	}
     	public String getFormat() {
     		return format;
+    	}
     	public String getLayout() {
     		return layout;
+    	}
     	public String getInterpretation() {
     		return interpretation;
+    	}
     	@Override
     	public boolean equals(final Object that) {
     		if (!(that instanceof MetadataReference))
     			return false;
     		final MetadataReference mdRef = (MetadataReference) that;
     		return ComparisonChain.start()
     				.compare(this.format, mdRef.getFormat())
     				.compare(this.layout, mdRef.getLayout())
     				.compare(this.interpretation, mdRef.getInterpretation())
     				.result() == 0;
+    	}
     	@Override
     	public int hashCode() {
     		return getFormat().hashCode() + getLayout().hashCode() + getInterpretation().hashCode();
+    	}
     	@Override
     	public String toString() {
     		return getFormat() + "_" + getLayout() + "_" + getInterpretation();
+    	}
+    }

     package eu.dnetlib.utils;
     public class MetadataReferenceFactory {
     	public MetadataReference getMetadata(final String format, final String layout, final String interpretation) {
     		return new MetadataReference(format, layout, interpretation);
+    	}
     	public MetadataReference decodeMetadata(final String encoded) {
     		return decodeMetadata(encoded, "@");
+    	}
     	public MetadataReference decodeMetadata(final String encoded, final String separator) {
     		String[] split = encoded.split(separator);
     		if (split.length == 3) return getMetadata(split[0], split[1], split[2]);
     		throw new IllegalStateException("malformed metadata reference: " + encoded);
+    	}
     	public static MetadataReference decode(final String encoded, final String separator) {
     		return new MetadataReferenceFactory().decodeMetadata(encoded, separator);
+    	}
+    }

modules/dnet-data-provision-services/trunk/src/main/java/eu/dnetlib/index/action/CreateIndexAction.java
1	1	package eu.dnetlib.index.action;
2	2
3		import eu.dnetlib.clients.index.utils.MetadataReference;
	3	import eu.dnetlib.utils.MetadataReference;
4	4	import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
5	5	import eu.dnetlib.enabling.tools.blackboard.BlackboardServerAction;
6	6	import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;

     import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
     import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;
     import eu.dnetlib.oai.mongo.MongoPublisherStoreDAO;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReferenceFactory;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
-...
     	@Override
     	public void execute(final BlackboardServerHandler handler, final BlackboardJob job) throws Exception {
     		final String mdformat = job.getParameters().get("format");
     		final String layout = job.getParameters().get("layout");
     		final String interp = job.getParameters().get("interpretation");
     		final String dbName = job.getParameters().get("oai_dbName");
     		final String set = job.getParameters().get("set");
     		boolean deleted = false;
     		final String collectionName = job.getParameters().get("oai_collectionName");
     		final MetadataReference mdRef = MetadataReferenceFactory.decode(collectionName, MDREF_SEPARATOR);
     		if (StringUtils.isNotBlank(set)) {
     			deleted = this.mongoPublisherStoreDAO.deleteFromStore(mdformat, interp, layout, dbName, set);
     			deleted = this.mongoPublisherStoreDAO.deleteFromStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName, set);
     		} else {
     			deleted = this.mongoPublisherStoreDAO.deleteStore(mdformat, interp, layout, dbName);
     			deleted = this.mongoPublisherStoreDAO.deleteStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName);
+    		}
     		if (deleted) {
     			log.info("OAI Deletion succeded on db " + dbName);

     import eu.dnetlib.oai.conf.OAIConfigurationExistReader;
     import eu.dnetlib.oai.mongo.MongoPublisherStore;
     import eu.dnetlib.oai.mongo.MongoPublisherStoreDAO;
     import eu.dnetlib.rmi.provision.MDFInfo;
     import eu.dnetlib.rmi.provision.OaiPublisherException;
     import eu.dnetlib.rmi.provision.OaiPublisherRuntimeException;
     import eu.dnetlib.utils.MetadataReference;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.springframework.beans.factory.annotation.Autowired;
-...
     	private MongoPublisherStoreDAO publisherStoreDAO;
     	public void synchronize(final Iterable<String> records,
     			final MDFInfo sourceMetadataFormat,
     			final MetadataReference sourceMetadataFormat,
     			final String recordSource,
     			final String dbName,
     			final boolean alwaysNewRecord,
-...
     	/**
     	 * Gets the OAI store for the given source metadata format. If the store does not exists, then a new one is created.
+    	 *
     	 * @param sourceMetadataFormat MDFInfo about the metadata format of the store to get
     	 * @param mdRef MDFInfo about the metadata format of the store to get
     	 * @return a MongoPublisherStore instance
     	 */
     	private MongoPublisherStore getStore(final MDFInfo sourceMetadataFormat, final String dbName, final boolean alwaysNewRecord) {
     	private MongoPublisherStore getStore(final MetadataReference mdRef, final String dbName, final boolean alwaysNewRecord) {
     		this.publisherStoreDAO.setAlwaysNewRecord(alwaysNewRecord);
     		MongoPublisherStore store = this.publisherStoreDAO.getStore(sourceMetadataFormat.getSourceFormatName(),
     				sourceMetadataFormat.getSourceFormatInterpretation(), sourceMetadataFormat.getSourceFormatLayout(), dbName);
     		MongoPublisherStore store = this.publisherStoreDAO.getStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName);
     		if (store == null) {
     			log.debug("Creating store for metadata format: \n" + sourceMetadataFormat + " in db: " + dbName);
     			log.debug("Creating store for metadata format: \n" + mdRef + " in db: " + dbName);
     			try {
     				store = this.publisherStoreDAO.createStore(sourceMetadataFormat.getSourceFormatName(), sourceMetadataFormat.getSourceFormatInterpretation(),
     						sourceMetadataFormat.getSourceFormatLayout(), dbName);
     				store = this.publisherStoreDAO.createStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName);
     				log.debug("Created store with id: " + store.getId());
     			} catch (OaiPublisherException e) {
     				throw new OaiPublisherRuntimeException(e);

     package eu.dnetlib.oai.actions;
     import java.util.concurrent.Callable;
     import org.springframework.beans.factory.annotation.Autowired;
     import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
     import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;
     import eu.dnetlib.oai.conf.OAISetsCounter;
     import org.springframework.beans.factory.annotation.Autowired;
     public class CountSetsAction extends AbstractOAIStoreAction {
-...
     	private void executeForAll(final String storeId, final BlackboardServerHandler handler, final BlackboardJob job, final String dbName) {
     		this.setsCounter.updateCounts(storeId, dbName, new Callable<Object>() {
     			@Override
     			public Object call() {
     				handler.done(job);
     				return null;
+    			}
     		}, new Callable<Object>() {
     			@Override
     			public Object call() {
     				handler.failed(job, new Exception("Error during OAI sets count on db " + dbName));
     				return null;
+    			}
     		this.setsCounter.updateCounts(storeId, dbName, () -> {
     			handler.done(job);
     			return null;
     		}, () -> {
     			handler.failed(job, new Exception("Error during OAI sets count on db " + dbName));
     			return null;
     		});
+    	}
     	private void executeForConfiguredSetsOnly(final String storeId, final BlackboardServerHandler handler, final BlackboardJob job, final String dbName) {
     		this.setsCounter.updateConfigurationCounts(storeId, dbName, new Callable<Object>() {
     			@Override
     			public Object call() {
     				handler.done(job);
     				return null;
+    			}
     		}, new Callable<Object>() {
     			@Override
     			public Object call() {
     				handler.failed(job, new Exception("Error during OAI sets count on db " + dbName));
     				return null;
+    			}
     		this.setsCounter.updateConfigurationCounts(storeId, dbName, () -> {
     			handler.done(job);
     			return null;
     		}, () -> {
     			handler.failed(job, new Exception("Error during OAI sets count on db " + dbName));
     			return null;
     		});
+    	}

     import eu.dnetlib.oai.sync.OAIStoreSynchronizer;
     import eu.dnetlib.rmi.common.ResultSet;
     import eu.dnetlib.rmi.provision.MDFInfo;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReferenceFactory;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.dom4j.io.SAXReader;
-...
     	public void execute(final BlackboardServerHandler handler, final BlackboardJob job) throws Exception {
     		String epr = job.getParameters().get("oai_syncEpr");
     		String recordSource = job.getParameters().get("oai_recordSource");
     		String formatName = job.getParameters().get("oai_formatName");
     		String formatLayout = job.getParameters().get("oai_formatLayout");
     		String formatInterpretation = job.getParameters().get("oai_formatInterpretation");
     		boolean alwaysNewRecord = Boolean.valueOf(job.getParameters().get("oai_alwaysNewRecord"));
     		final String dbName = job.getParameters().get("oai_dbName");
     		MDFInfo mdf = new MDFInfo("", "", "", formatName, formatLayout, formatInterpretation, "", true);
     		ResultSet<?> resutlSet = ResultSet.fromJson(epr);
     		log.info("Syncronizing content for oai on db " + dbName + "for metadata format: " + mdf);
     		Iterable<String> records = resultSetClient.iter(resutlSet, String.class);
     		final String collectionName = job.getParameters().get("oai_collectionName");
     		final MetadataReference mdRef = MetadataReferenceFactory.decode(collectionName, MDREF_SEPARATOR);
     		final ResultSet<?> rs = ResultSet.fromJson(epr);
     		log.info("Syncronizing content for oai on db " + dbName + "for metadata format: " + mdRef);
     		Iterable<String> records = resultSetClient.iter(rs, String.class);
     		// in case of DMF there is no "hat element" after oai:metadata: we must add it or the OAI-PMH export will only contain the first
     		// element inside oai:metadata.
     		if (formatName.equalsIgnoreCase("DMF")) {
     		if (mdRef.getFormat().equalsIgnoreCase("DMF")) {
     			records = addDMFBlock(records);
+    		}
     		this.synchronizer.synchronize(records, mdf, recordSource, dbName, alwaysNewRecord, () -> {
     		this.synchronizer.synchronize(records, mdRef, recordSource, dbName, alwaysNewRecord, () -> {
     			handler.done(job);
     			return null;
     		}, () -> {

     import eu.dnetlib.enabling.locators.UniqueServiceLocator;
     import eu.dnetlib.rmi.enabling.*;
     import eu.dnetlib.rmi.provision.IndexServiceException;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReferenceFactory;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;

     import eu.dnetlib.rmi.common.ResultSet;
     import eu.dnetlib.rmi.provision.MDFInfo;
     import eu.dnetlib.rmi.provision.OAIStoreService;
     import eu.dnetlib.utils.MetadataReference;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Required;
-...
     	private ResultSetClient resultSetClient;
     	@Override
     	public void feed(final ResultSet<String> recordsEpr, final MDFInfo mdfInfo, final String dbName) {
     	public void feed(final ResultSet<String> recordsEpr, final MetadataReference mdfInfo, final String dbName) {
     		this.feed(recordsEpr, mdfInfo, "", dbName);
+    	}
     	@Override
     	public void feed(final ResultSet<String> recordsEpr, final MDFInfo mdfInfo, final String recordSource, final String dbName) {
     	public void feed(final ResultSet<String> recordsEpr, final MetadataReference mdfInfo, final String recordSource, final String dbName) {
     		final Iterable<String> iter = this.resultSetClient.iter(recordsEpr, String.class);
     		this.synchronizer.synchronize(iter, mdfInfo, recordSource, dbName, false, null, null);
+    	}

     import com.mycila.xmltool.XMLDoc;
     import com.mycila.xmltool.XMLTag;
     import eu.dnetlib.clients.index.client.IndexClientException;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReferenceFactory;
     import org.dom4j.Document;
     import org.dom4j.DocumentException;
     import org.dom4j.io.SAXReader;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.xml.sax.InputSource;
+    ;
     public class MDFormatReader {
     	@Autowired
     	private ServiceTools serviceTools;
     	@Autowired
     	private MetadataReferenceFactory mdFactory;
     	public List<MetadataReference> listMDRefs() throws IndexClientException {
     		return serviceTools.listMDRefs();

     import eu.dnetlib.clients.index.client.IndexClientException;
     import eu.dnetlib.clients.index.utils.IndexFieldUtility;
     import eu.dnetlib.clients.index.utils.MDFormatReader;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.clients.index.utils.ServiceTools;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;

     import eu.dnetlib.clients.index.client.AbstractIndexClient;
     import eu.dnetlib.clients.index.client.IndexClientException;
     import eu.dnetlib.clients.index.query.Pruner.Result;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.index.cql.CqlTranslator;
     import eu.dnetlib.index.cql.TranslatedQuery;
     import org.springframework.beans.factory.annotation.Autowired;

     import eu.dnetlib.clients.index.client.IndexClientException;
     import eu.dnetlib.clients.index.utils.MDFormatReader;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.clients.index.utils.ServiceTools;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;

     import java.util.function.Function;
     import eu.dnetlib.clients.index.client.IndexClientException;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Required;

     import java.util.Map;
     import eu.dnetlib.clients.index.query.IndexQueryFactory;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.index.cql.CqlValueTransformerMap;
     public abstract class AbstractIndexClient implements IndexClient {

     import eu.dnetlib.rmi.common.BaseService;
     import eu.dnetlib.rmi.common.ResultSet;
     import eu.dnetlib.utils.MetadataReference;
     @WebService(targetNamespace = "http://services.dnetlib.eu/")
     public interface OAIStoreService extends BaseService {
     	@WebMethod
     	void feed(@WebParam(name = "recordsEpr") final ResultSet<String> recordsEpr,
     			@WebParam(name = "mdformat") final MDFInfo mdfInfo,
     			@WebParam(name = "mdformat") final MetadataReference mdfInfo,
     			@WebParam(name = "dbName") final String dbName);
     	@WebMethod(operationName = "feedWithSource")
     	void feed(@WebParam(name = "recordsEpr") final ResultSet<String> recordsEpr,
     			@WebParam(name = "mdformat") final MDFInfo mdfInfo,
     			@WebParam(name = "mdformat") final MetadataReference mdfInfo,
     			@WebParam(name = "recordSource") final String recordSource,
     			@WebParam(name = "dbName") final String dbName);

modules/dnet-core-components/trunk/src/main/java/eu/dnetlib/rmi/provision/OAIStoreActions.java
	1	package eu.dnetlib.rmi.provision;
	2
	3	public enum OAIStoreActions {
	4	SYNC, COUNT_SETS, REFRESH_CONFIG, ENSURE_INDEXES, CREATE_STORE, CREATE_OAI_INDEX, DROP_STORE
	5	}

     package eu.dnetlib.rmi.manager;
     public class MSRORuntimeException extends RuntimeException {
     	/**
+    	 *
     	 */
     	private static final long serialVersionUID = 6126457312212409217L;
     	public MSRORuntimeException(final String string) {
     		super(string);
+    	}
     	public MSRORuntimeException(final String string, final Throwable exception) {
     		super(string, exception);
+    	}
     	public MSRORuntimeException(final Throwable exception) {
     		super(exception);
+    	}
+    }

     import java.io.InputStream;
     import java.util.Iterator;
     import com.google.common.xml.XmlEscapers;
     import com.google.gson.Gson;
     import com.google.gson.GsonBuilder;
     import org.apache.commons.io.IOUtils;
-...
     		if (info != null) {
     			this.setJournalId(info.getJournalId());
     			//TODO check deprecation
     			this.setJournalName(StringEscapeUtils.escapeXml(info.getJournalName()));
     			this.setJournalISSN(info.getJournalISSN());
     			this.setOpenaireDatasource(info.getDatasourceId());

modules/dnet-core-components/trunk/src/main/resources/eu/dnetlib/index/utils/applicationContext-utils.xml
12	12	depends-on="uniqueServiceLocator"/>
13	13
14	14	<bean id="mdFactory"
15		class="eu.dnetlib.clients.index.utils.MetadataReferenceFactory" depends-on="uniqueServiceLocator"/>
16		</beans>
	15	class="eu.dnetlib.utils.MetadataReferenceFactory" depends-on="uniqueServiceLocator"/>
	16	</beans>

     	<bean id="mdFormatReader" class="eu.dnetlib.clients.index.utils.MDFormatReader"/>
     	<bean id="metadataReferenceFactory" class="eu.dnetlib.clients.index.utils.MetadataReferenceFactory"/>
     	<bean id="metadataReferenceFactory" class="eu.dnetlib.utils.MetadataReferenceFactory"/>
     </beans>
     </beans>

     import eu.dnetlib.clients.index.model.Any.ValueType;
     import eu.dnetlib.clients.index.query.IndexQueryFactory;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.index.AbstractBackendDescriptor;
     import eu.dnetlib.index.IndexCollection;
     import eu.dnetlib.index.IndexServerDAO;

     import eu.dnetlib.clients.index.model.Any.ValueType;
     import eu.dnetlib.clients.index.model.document.IndexDocument;
     import eu.dnetlib.clients.index.model.document.Status;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.index.feed.DocumentMapperFactory;
     import eu.dnetlib.index.solr.model.SolrIndexDocument;
     import org.springframework.beans.factory.annotation.Required;
-...
     			final String dsId,
     			final String version,
     			final boolean emptyResult) {
     		if (emptyResult == false) return getRecordMapper(schema, dsId, version);
     		if (!emptyResult) return getRecordMapper(schema, dsId, version);
     		else {
     			return doc -> {
     				SolrIndexDocument indexDocument = new SolrIndexDocument(schema, dsId);

     import eu.dnetlib.clients.index.query.QueryLanguage;
     import eu.dnetlib.clients.index.query.QueryResponseFactory;
     import eu.dnetlib.clients.index.query.QueryResponseParser;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.index.cql.CqlValueTransformerMap;
     import eu.dnetlib.index.query.SolrIndexQuery;
     import eu.dnetlib.index.query.SolrIndexQueryFactory;

     import eu.dnetlib.clients.index.model.Any.ValueType;
     import eu.dnetlib.clients.index.query.IndexQueryFactory;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.index.cql.CqlValueTransformerMap;
     import eu.dnetlib.index.feed.DocumentMapperFactory;
     import eu.dnetlib.rmi.provision.IndexServiceException;
-...
     	 */
     	Map<String, ValueType> getSchema(final MetadataReference mdRef) throws IndexServiceException;
+    	;
     	/**
     	 * Gets the cql value transformer map.
+    	 *

     import eu.dnetlib.clients.index.model.Any.ValueType;
     import eu.dnetlib.clients.index.model.document.IndexDocument;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     /**
      * A factory for creating DocumentMapper objects.

     import eu.dnetlib.clients.index.query.IndexQueryResponse;
     import eu.dnetlib.clients.index.query.QueryResponseFactory;
     import eu.dnetlib.clients.index.query.QueryResponseParser;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import org.apache.solr.client.solrj.response.QueryResponse;
     /**

     import eu.dnetlib.clients.index.model.document.IndexDocument;
     import eu.dnetlib.clients.index.utils.IndexFieldUtility;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.clients.index.utils.ServiceTools;
     import eu.dnetlib.enabling.tools.DnetStreamSupport;
     import eu.dnetlib.index.IndexCollection;
-...
+    	 *
     	 * @param indexCollection the server dao
     	 * @param dsId            the ds id
     	 * @return the time elapsed to complete the operation.
     	 * @throws IndexServiceException the index service exception
     	 */
     	public void cleanMarkedDocuments(final IndexCollection indexCollection, final String dsId) throws IndexServiceException {

modules/dnet-data-provision-services/trunk/src/main/java/eu/dnetlib/index/action/DeleteByQueryAction.java
1	1	package eu.dnetlib.index.action;
2	2
3		import eu.dnetlib.clients.index.utils.MetadataReference;
	3	import eu.dnetlib.utils.MetadataReference;
4	4	import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
5	5	import eu.dnetlib.enabling.tools.blackboard.BlackboardServerAction;
6	6	import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;

modules/dnet-data-provision-services/trunk/src/main/java/eu/dnetlib/index/action/DeleteIndexAction.java
1	1	package eu.dnetlib.index.action;
2	2
3		import eu.dnetlib.clients.index.utils.MetadataReference;
	3	import eu.dnetlib.utils.MetadataReference;
4	4	import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
5	5	import eu.dnetlib.enabling.tools.blackboard.BlackboardServerAction;
6	6	import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;

modules/dnet-data-provision-services/trunk/src/main/java/eu/dnetlib/index/action/AbstractIndexAction.java
1	1	package eu.dnetlib.index.action;
2	2
3		import eu.dnetlib.clients.index.utils.MetadataReference;
	3	import eu.dnetlib.utils.MetadataReference;
4	4	import eu.dnetlib.clients.index.utils.ServiceTools;
5	5	import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
6	6	import eu.dnetlib.index.feed.FeedMode;

     import java.util.concurrent.Executor;
     import java.util.concurrent.Executors;
     import eu.dnetlib.clients.index.utils.MetadataReference;
     import eu.dnetlib.clients.index.utils.MetadataReferenceFactory;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReferenceFactory;
     import eu.dnetlib.clients.index.utils.ServiceTools;
     import eu.dnetlib.enabling.actions.AbstractSubscriptionAction;
     import org.apache.commons.logging.Log;

     	@Override
     	public void execute(final BlackboardServerHandler handler, final BlackboardJob job) throws Exception {
     		final String storeId = job.getParameters().get("collection");
     		final String storeId = job.getParameters().get("oai_collectionName");
     		final String dbName = job.getParameters().get("oai_dbName");
     		// Examples: field1,field2 -- one compound index on the given two fields
     		// field1,field2;field3,field4 -- two compound indices: one on field1 and field2, the other on field3 and field4

     package eu.dnetlib.oai.actions;
     import eu.dnetlib.enabling.tools.blackboard.BlackboardServerAction;
     import eu.dnetlib.rmi.provision.OAIStoreActions;
     public abstract class AbstractOAIStoreAction implements BlackboardServerAction<OAIStoreActions> {
     	protected final static String MDREF_SEPARATOR = "-";
+    }

     import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler;
     import eu.dnetlib.oai.mongo.MongoPublisherStore;
     import eu.dnetlib.oai.mongo.MongoPublisherStoreDAO;
     import eu.dnetlib.rmi.provision.MDFInfo;
     import eu.dnetlib.utils.MetadataReference;
     import eu.dnetlib.utils.MetadataReferenceFactory;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.springframework.beans.factory.annotation.Autowired;
-...
     	@Override
     	public void execute(final BlackboardServerHandler handler, final BlackboardJob job) throws Exception {
     		final String mdformat = job.getParameters().get("format");
     		final String layout = job.getParameters().get("layout");
     		final String interp = job.getParameters().get("interpretation");
     		final String dbName = job.getParameters().get("oai_dbName");
     		if (this.mongoPublisherStoreDAO.getStore(mdformat, interp, layout, dbName) == null) {
     			final MongoPublisherStore store = this.mongoPublisherStoreDAO.createStore(mdformat, interp, layout, dbName);
     		final String collectionName = job.getParameters().get("oai_collectionName");
     		final MetadataReference mdRef = MetadataReferenceFactory.decode(collectionName, MDREF_SEPARATOR);
     		if (this.mongoPublisherStoreDAO.getStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName) == null) {
     			final MongoPublisherStore store = this.mongoPublisherStoreDAO.createStore(mdRef.getFormat(), mdRef.getInterpretation(), mdRef.getLayout(), dbName);
     			log.info("Created store with id: " + store.getId() + "on db " + dbName);
     		} else {
     			log.info("Store already exists for format=" + mdformat + " layout=" + layout + " interpretation=" + interp + " on db " + dbName);
     			log.info("Store already exist: " + collectionName + " on db " + dbName);
+    		}
     		handler.done(job);
+    	}

     	<bean id="oaiStoreBlackboardExecutor"
     	      class="eu.dnetlib.enabling.tools.blackboard.BlackboardServerActionExecutor"
     	      p:blackboardHandler-ref="blackboardHandler"
     	      p:actionType="eu.dnetlib.oai.actions.OAIStoreActions"
     	      p:actionType="eu.dnetlib.rmi.provision.OAIStoreActions"
     	      p:incomplete="false">
     		<property name="actionMap">
     			<map>
-...
     	<bean id="oaiSetsCounter" class="eu.dnetlib.oai.conf.OAISetsCounter"/>
     </beans>
     </beans>

Project

General

Profile

D-Net

Revision 43245

Added by Claudio Atzori almost 8 years ago