/ - Diff - Metacat - Ecoinformatics Redmine

     			Identifier guid = new Identifier();
     			guid.setValue("testReserveIdentifier." + System.currentTimeMillis());
     			// reserve it
     			Identifier retPid = CNodeService.getInstance().reserveIdentifier(session, guid, null, null);
     			assertEquals(guid, retPid);
     			boolean result = CNodeService.getInstance().reserveIdentifier(session, guid);
     			assertTrue(result);
     	    } catch(NotImplemented ni) {
             	// this is not implemented in Metacat
                 assertTrue(true);

     			logMetacat.warn("pid not specified");
+    		}
     		// call the implementation
     		Identifier retPid = CNodeService.getInstance().reserveIdentifier(session, pid, scope, format);
     		boolean result = CNodeService.getInstance().reserveIdentifier(session, pid);
     		OutputStream out = response.getOutputStream();
     		response.setStatus(200);
     		response.setContentType("text/xml");
     		TypeMarshaller.marshalTypeToOutputStream(retPid, out);
     		// nothing to send back
+        }
         /**

                           Identifier dataGuid = new Identifier();
                           dataGuid.setValue(dataGuidString);
                           // TODO: add describes for ORE
                           sysMeta.addResourceMap(null);
                           // TODO add describedBy sysmeta ORE
                           //logMetacat.debug("Setting describedBy for " + dataGuid.getValue() + " to " + identifier.getValue());
                           dataSysMeta.addResourceMap(null);
                           // set object format
                           logMetacat.debug("Updating system metadata for " + dataGuid.getValue() + " to " + dataDocMimeType);
                           ObjectFormat f = ObjectFormatCache.getInstance().getFormat(dataDocMimeType);

+    	}
     	/**
     	 * Provides a mechanism for updating system metadata independently of its
     	 * associated object
+     	 *
     	 * @param session - the Session object containing the credentials for the Subject
     	 * @param pid - The identifier of the system metadata
     	 * @param sysmeta - The system metadata to be registered
+    	 *
     	 * @return true if the update succeeds
+    	 *
     	 * @throws NotImplemented
     	 * @throws NotAuthorized
     	 * @throws ServiceFailure
     	 * @throws InvalidRequest
     	 * @throws InvalidSystemMetadata
     	 * @throws NotFound
     	 */
     	@Override
     	public boolean updateSystemMetadata(Session session, Identifier guid,
     	  SystemMetadata sysmeta)
     	  throws NotImplemented, NotAuthorized, ServiceFailure, InvalidRequest,
     	  InvalidSystemMetadata, NotFound {
     		// TODO: control who can call this?
     	      if (session == null) {
     	          //TODO: many of the thrown exceptions do not use the correct error codes
     	          //check these against the docs and correct them
     	          throw new NotAuthorized("4861", "No Session - could not authorize for update." +
     	                  "  If you are not logged in, please do so and retry the request.");
+    	      }
     	      // verify that guid == SystemMetadata.getIdentifier()
     	      logMetacat.debug("Comparing guid|sysmeta_guid: " + guid.getValue() + "|" + sysmeta.getIdentifier().getValue());
     	      if (!guid.getValue().equals(sysmeta.getIdentifier().getValue())) {
     	          throw new InvalidRequest("4863",
     	              "GUID in method call (" + guid.getValue() + ") does not match GUID in system metadata (" +
     	              sysmeta.getIdentifier().getValue() + ").");
+    	      }
     	      logMetacat.debug("Checking if identifier exists...");
     	      // Check that the identifier exists
     	      if (!IdentifierManager.getInstance().identifierExists(guid.getValue())) {
     	          throw new NotFound("000",
     	              "GUID does not exist");
+    	      }
     	      // update the system metadata into the object store
     	      logMetacat.debug("Starting to update SystemMetadata...");
     	      sysmeta.setDateSysMetadataModified(new Date());
     	      try {
     			    IdentifierManager.getInstance().updateSystemMetadata(sysmeta);
     			    // force replication of this record
     			    ForceReplicationSystemMetadataHandler forceReplication =
     			    	new ForceReplicationSystemMetadataHandler(guid.getValue(), null);
     		    } catch (Exception e) {
     	          throw new ServiceFailure("4862", "Error updating system metadata: " + e.getClass() + ": " + e.getMessage());
+    		    }
     	      logMetacat.debug("Returning from updateSystemMetadata");
     	      EventLog.getInstance().log(null, session.getSubject().getValue(), guid.getValue(), "updateSystemMetadata");
     	      return true;
+    	}
     	/**
        * Given an optional scope and format, reserves and returns an identifier
        * within that scope and format that is unique and will not be
        * used by any other sessions.
-...
     	 * @throws NotImplemented
     	 */
     	@Override
     	public Identifier reserveIdentifier(Session session, Identifier pid,
     	  String scope, String format)
     	  throws InvalidToken, ServiceFailure, NotAuthorized, IdentifierNotUnique,
     	  NotImplemented, InvalidRequest {
     	public boolean reserveIdentifier(Session session, Identifier pid)
     	throws InvalidToken, ServiceFailure,
             NotAuthorized, IdentifierNotUnique, NotImplemented, InvalidRequest {
     		throw new NotImplemented("4191", "reserveIdentifier not implemented on this node");
+    	}
     	@Override
     	public Identifier generateIdentifier(Session session, String scheme, String fragment)
     	throws InvalidToken, ServiceFailure,
             NotAuthorized, NotImplemented, InvalidRequest {
     		throw new NotImplemented("4191", "generateIdentifier not implemented on this node");
+    	}
     	/**
      	 * Checks whether the pid is reserved by the subject in the session param
      	 * If the reservation is held on the pid by the subject, we return true.

Project

General

Profile

Metacat

Revision 6378

Added by ben leinfelder about 13 years ago