Merge pull request #4807 from QualitativeDataRepository/4800-better_e…

…rror_message_on_pid_provider_failure 4800-better_error_meesage_on_pid_provider_failure
IQSS · Jul 26, 2018 · 8cfca31 · 8cfca31
2 parents 20d111e + 1f4e478
commit 8cfca31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -1197,7 +1197,7 @@ dataset.share.datasetShare.tip=Share this dataset on your favorite social media
 dataset.share.datasetShare.shareText=View this dataset.
 dataset.locked.message=Dataset Locked
 dataset.locked.inReview.message=Submitted for Review
-dataset.publish.error=This dataset may not be published because the <a href=\{1} target=\"_blank\"/> {0} </a> Service  is currently inaccessible. Please try again. Does the issue continue to persist?
+dataset.publish.error=This dataset may not be published due to an error when contacting the <a href=\{1} target=\"_blank\"/> {0} </a> Service. Please try again.
 dataset.publish.error.doi=This dataset may not be published because the DOI update failed.
 dataset.compute.computeBatchSingle=Compute Dataset
 dataset.compute.computeBatchList=List Batch

diff --git a/.../java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java b/.../java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import edu.harvard.iq.dataverse.GlobalIdServiceBean;
@@ -181,19 +182,22 @@ private void publicizeExternalIdentifier(Dataset dataset, CommandContext ctxt) t
         String protocol = getDataset().getProtocol();
         GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(protocol, ctxt);
         if ( idServiceBean != null ){
+        	List<String> args = idServiceBean.getProviderInformation();
             try {
-                idServiceBean.publicizeIdentifier(dataset);
+            	//A false return value indicates a failure in calling the service
+            	if(!idServiceBean.publicizeIdentifier(dataset)) throw new Exception();
                 dataset.setGlobalIdCreateTime(new Date()); // TODO these two methods should be in the responsibility of the idServiceBean.
                 dataset.setIdentifierRegistered(true);
                 for (DataFile df : dataset.getFiles()) {
                     logger.log(Level.FINE, "registering global id for file {0}", df.getId());
-                    idServiceBean.publicizeIdentifier(df);
+                    //A false return value indicates a failure in calling the service
+                    if(!idServiceBean.publicizeIdentifier(df)) throw new Exception();
                     df.setGlobalIdCreateTime(getTimestamp());
                     df.setIdentifierRegistered(true);
                 }
             } catch (Throwable e) {
                 ctxt.datasets().removeDatasetLocks(dataset, DatasetLock.Reason.pidRegister);
-                throw new CommandException(BundleUtil.getStringFromBundle("dataset.publish.error", idServiceBean.getProviderInformation()),this); 
+                throw new CommandException(BundleUtil.getStringFromBundle("dataset.publish.error", args),this); 
             }
         }
     }