/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 8795

Added by ben leinfelder almost 11 years ago

take advantage of the ezidclient for multi-threaded/asynchronous DOI registration. This will be most useful for doing large batch updates and not so much for the one-at-a-time publish actions but works in either context. https://projects.ecoinformatics.org/ecoinfo/issues/6440

     			Identifier guid = MNodeService.getInstance(request).generateIdentifier(session, "DOI", null);
     			// check that EZID knows about it
     			HashMap<String, String> metadata = ezid.getMetadata(guid.getValue());
     			HashMap<String, String> metadata = null;
     			int count = 0;
     			do {
     				try {
     					metadata = ezid.getMetadata(guid.getValue());
     				} catch (Exception e) {
     					Thread.sleep(1000);
+    				}
     				count++;
     			} while (metadata == null && count < 10);
     			assertNotNull(metadata);
     			// add the actual object for the newly-minted DOI
-...
     			assertEquals(guid.getValue(), pid.getValue());
     			// check for the metadata for title element
     			metadata = ezid.getMetadata(pid.getValue());
     			count = 0;
     			metadata = null;
     			do {
     				try {
     					metadata = ezid.getMetadata(pid.getValue());
     					// check if the update thread finished yet, otherwise try again
     					if (metadata != null && isMetadata) {
     						String registeredTarget = metadata.get(InternalProfile.TARGET.toString());
     						if (!registeredTarget.endsWith("/#view/" + pid.getValue())) {
     							// try fetching it again
     							metadata = null;
+    						}
+    					}
     				} catch (Exception e) {
     					Thread.sleep(1000);
+    				}
     				count++;
     			} while (metadata == null && count < 10);
     			assertNotNull(metadata);
     			assertTrue(metadata.containsKey(DataCiteProfile.TITLE.toString()));
-...
     			// check for the metadata explicitly, using ezid service
     			EZIDService ezid = new EZIDService(ezidServiceBaseUrl);
     			ezid.login(ezidUsername, ezidPassword);
     			HashMap<String, String> metadata = ezid.getMetadata(pid.getValue());
     			int count = 0;
     			HashMap<String, String> metadata = null;
     			do {
     				try {
     					metadata = ezid.getMetadata(pid.getValue());
     				} catch (Exception e) {
     					Thread.sleep(1000);
+    				}
     				count++;
     			} while (metadata == null && count < 10);
     			assertNotNull(metadata);
     			assertTrue(metadata.containsKey(DataCiteProfile.TITLE.toString()));
-...
     	            // check for the metadata explicitly, using ezid service
     	            EZIDService ezid = new EZIDService(ezidServiceBaseUrl);
     	            ezid.login(ezidUsername, ezidPassword);
     	            HashMap<String, String> metadata = ezid.getMetadata(publishedIdentifier.getValue());
     	            int count = 0;
     				HashMap<String, String> metadata = null;
     				do {
     					try {
     						metadata = ezid.getMetadata(publishedIdentifier.getValue());
     					} catch (Exception e) {
     						Thread.sleep(1000);
+    					}
     					count++;
     				} while (metadata == null && count < 10);
     	            assertNotNull(metadata);
     	            assertTrue(metadata.containsKey(DataCiteProfile.TITLE.toString()));
     	            content.close();

                 // attempt to register the identifier - it checks if it is a doi
                 try {
         			DOIService.getInstance().registerDOI(sysmeta);
         		} catch (EZIDException e) {
         		} catch (Exception e) {
                     throw new ServiceFailure("1190", "Could not register DOI: " + e.getMessage());
+        		}
-...
             // attempt to register the identifier - it checks if it is a doi
             try {
     			DOIService.getInstance().registerDOI(sysmeta);
     		} catch (EZIDException e) {
     		} catch (Exception e) {
     			ServiceFailure sf = new ServiceFailure("1190", "Could not register DOI: " + e.getMessage());
     			sf.initCause(e);
                 throw sf;

     import org.ecoinformatics.datamanager.parser.generic.DataPackageParserInterface;
     import org.ecoinformatics.datamanager.parser.generic.Eml200DataPackageParser;
     import edu.ucsb.nceas.ezid.EZIDClient;
     import edu.ucsb.nceas.ezid.EZIDException;
     import edu.ucsb.nceas.ezid.EZIDService;
     import edu.ucsb.nceas.ezid.profile.DataCiteProfile;
     import edu.ucsb.nceas.ezid.profile.DataCiteProfileResourceTypeValues;
     import edu.ucsb.nceas.ezid.profile.ErcMissingValueCode;
-...
     	private String ezidPassword = null;
     	private EZIDService ezid = null;
     	private EZIDClient ezid = null;
     	private Date lastLogin = null;
-...
     			return;
+    		}
     		ezid = new EZIDService(ezidServiceBaseUrl);
     		//ezid = new EZIDClient(ezidServiceBaseUrl);
     		ezid = new EZIDClient(ezidServiceBaseUrl);
-...
     	 * @throws EZIDException
     	 * @throws ServiceFailure
     	 * @throws NotImplemented
     	 * @throws InterruptedException
     	 */
     	public boolean registerDOI(SystemMetadata sysMeta) throws EZIDException, NotImplemented, ServiceFailure {
     	public boolean registerDOI(SystemMetadata sysMeta) throws EZIDException, NotImplemented, ServiceFailure, InterruptedException {
     		// only continue if we have the feature turned on
     		if (doiEnabled) {
-...
     			if (identifier.startsWith(shoulder)) {
     				// enter metadata about this identifier
     				HashMap<String, String> metadata = null;
     				HashMap<String, String> metadata = new HashMap<String, String>();
     				// make sure we have a current login
     				this.refreshLogin();
     				// check for existing metadata
     				boolean create = false;
     				try {
     					metadata = ezid.getMetadata(identifier);
     				} catch (EZIDException e) {
     					// expected much of the time
     					logMetacat.warn("No metadata found for given identifier: " + e.getMessage());
+    				}
     				if (metadata == null) {
     					create = true;
+    				}
     				// confuses the API if we send the original metadata that it gave us, so start from scratch
     				metadata = new HashMap<String, String>();
     				// title
     				String title = ErcMissingValueCode.UNKNOWN.toString();
     				try {
-...
     				metadata.put(InternalProfile.STATUS.toString(), status);
     				metadata.put(InternalProfile.EXPORT.toString(), export);
     				// make sure we have a current login
     				this.refreshLogin();
     				// set using the API
     				if (create) {
     					ezid.createIdentifier(identifier, metadata);
     				} else {
     					ezid.setMetadata(identifier, metadata);
+    				}
     				ezid.createOrUpdate(identifier, metadata);
+    			}

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 8795

Added by ben leinfelder almost 11 years ago