bug fixes

dspace-api/src/main/java/org/dspace/submit/lookup/MapConverterModifier.java

@@ -18,6 +18,7 @@ import java.util.Properties;
 
 import org.apache.commons.lang.StringUtils;
 import org.dspace.core.ConfigurationManager;
+import org.dspace.utils.DSpace;
 
 import gr.ekt.bte.core.AbstractModifier;
 import gr.ekt.bte.core.MutableRecord;

dspace-api/src/main/java/org/dspace/submit/lookup/MultipleSubmissionLookupDataLoader.java

@@ -129,9 +129,12 @@ public class MultipleSubmissionLookupDataLoader implements DataLoader {
 	 * @see gr.ekt.bte.core.DataLoader#getRecords(gr.ekt.bte.core.DataLoadingSpec)
 	 */
 	@Override
-	public RecordSet getRecords(DataLoadingSpec arg0)
+	public RecordSet getRecords(DataLoadingSpec loadingSpec)
 			throws MalformedSourceException {
 
+		if (loadingSpec.getOffset()>0) //Identify the end of loading
+			return new RecordSet();
+		
 		return getRecords();
 	}
 

dspace-api/src/main/java/org/dspace/submit/lookup/PubmedLookupProvider.java

@@ -58,7 +58,7 @@ public class PubmedLookupProvider extends ConfigurableLookupProvider {
 		Set<String> pmids = keys != null ? keys.get(PUBMED) : null;
 		Set<String> dois = keys != null ? keys.get(DOI) : null;
 		List<Record> results = new ArrayList<Record>();
-		if (pmids != null && pmids.size()>0 && dois == null) {
+		if (pmids != null && pmids.size()>0 && (dois == null || dois.size()==0)) {
 			for (String pmid : pmids){
 				PubmedItem p = null;
 				try
@@ -73,7 +73,7 @@ public class PubmedLookupProvider extends ConfigurableLookupProvider {
 					results.add(convert(p));
 			}
 		}
-		else if (dois != null && dois.size()>0 && pmids == null) {
+		else if (dois != null && dois.size()>0 && (pmids == null || pmids.size()==0)) {
 			StringBuffer query = new StringBuffer();
 			for (String d : dois) {
 				if (query.length() > 0) {
@@ -87,7 +87,7 @@ public class PubmedLookupProvider extends ConfigurableLookupProvider {
 				results.add(convert(p));
 			}
 		}
-		else
+		else if (dois != null && dois.size()>0 && pmids != null && pmids.size()>0)
 		{
 			//EKT:ToDo: support list of dois and pmids in the search method of pubmedService
 			List<PubmedItem> pubmedResults = pubmedService.search(dois.iterator().next(), pmids.iterator().next());

dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupOutputGenerator.java

@@ -56,7 +56,7 @@ public class SubmissionLookupOutputGenerator implements OutputGenerator {
             ItemSubmissionLookupDTO dto = new ItemSubmissionLookupDTO(entry.getValue());
             dtoList.add(dto);
         }
-        return null;
+        return new ArrayList<String>();
     }
 
     @Override

dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupService.java

@@ -126,7 +126,7 @@ public class SubmissionLookupService {
 		this.idents2provs = new HashMap<String, List<SubmissionLookupProvider>>();
 		this.searchProviders = new ArrayList<SubmissionLookupProvider>();
 
-		if (providers != null) {
+		if (providers == null) {
 			this.providers = new ArrayList<SubmissionLookupProvider>();
 			
 			for (SubmissionLookupProvider p : dataLoader.getProviders()) {

dspace-api/src/main/java/org/dspace/submit/util/EnhancedSubmissionLookupPublication.java

@@ -83,6 +83,7 @@ public class EnhancedSubmissionLookupPublication extends SubmissionLookupPublica
 			{
 				EnhancerSubmissionLookup enhancer = enhancedMetadata.get(md);
 				List<String> values = enhancer.getValues(this);
+				if (values != null && values.size()>0) {
 					List<Value> valuesvalues = new ArrayList<Value>();
 					for (String s : values){
 						valuesvalues.add(new StringValue(s));
@@ -91,6 +92,8 @@ public class EnhancedSubmissionLookupPublication extends SubmissionLookupPublica
 					return valuesvalues;
 				}
 			}
+			return null;
+		}
 		else
 		{
 			return lookupPublication.getValues(md);

dspace-api/src/main/java/org/dspace/submit/util/SubmissionLookupPublication.java

@@ -80,6 +80,9 @@ public class SubmissionLookupPublication implements MutableRecord, Serializable
 	@Override
 	public List<Value> getValues(String md) {
 		List<String> stringValues = storage.get(md);
+		if (stringValues == null){
+			return null;
+		}
 		List<Value> values = new ArrayList<Value>();
 		for (String value : stringValues){
 			values.add(new StringValue(value));

dspace-api/src/main/resources/spring/spring-dspace-addon-submissionlookup-services.xml

@@ -59,6 +59,7 @@
 	<bean name="transformationEngine" class="gr.ekt.bte.core.TransformationEngine">
 	    <property name="dataLoader" ref="multipleDataLoader"/>
     	<property name="workflow" ref="linearWorkflow"/>
+    	<property name="outputGenerator" ref="org.dspace.submit.lookup.SubmissionLookupOutputGenerator"/>
   	</bean>
 		
 	<bean name="multipleDataLoader" class="org.dspace.submit.lookup.MultipleSubmissionLookupDataLoader">
@@ -72,6 +73,8 @@
 	    
 	</bean>
 
+	<bean name="org.dspace.submit.lookup.SubmissionLookupOutputGenerator" class="org.dspace.submit.lookup.SubmissionLookupOutputGenerator"/>
+	
 	<!-- Specify here any filters or modifiers to run before the output -->
 	<bean name="linearWorkflow" class="gr.ekt.bte.core.LinearWorkflow">
 	    <property name="process">
@@ -83,8 +86,7 @@
 		</property>
 	</bean>
 	
-	<bean name="mapConverter_arxivSubject" class="org.dspace.submit.lookup.MapConverterModifier" 
+	<bean name="mapConverter_arxivSubject" class="org.dspace.submit.lookup.MapConverterModifier">
-	    init-method="init">
 	    <constructor-arg value="apConverter_arxivSubject Modifier"/>
 	    <property name="filename" value="mapConverter-arxivSubject.properties"/>
 	    <property name="fieldKeys">
@@ -94,8 +96,7 @@
 	    </property>
 	</bean>
 	
-	<bean name="mapConverter_pubstatusPubmed" class="org.dspace.submit.lookup.MapConverterModifier" 
+	<bean name="mapConverter_pubstatusPubmed" class="org.dspace.submit.lookup.MapConverterModifier">
-	    init-method="init">
 	    <constructor-arg value="mapConverter_pubstatusPubmed Modifier"/>
 	    <property name="filename" value="mapConverter-pubstatusPubmed.properties"/>
 	    <property name="fieldKeys">