/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5291

Added by Matt Jones over 14 years ago

Refactored putObject method to separate the create() and update() portions in order to match the method signatures needed for DataONE.

+        }
         /**
          * Test the get() function with a not existing document
          * Test the get() function with a non existing document
          */
         public void invalidGet()
+        {
-...
         		m.login(username,password);
         		debug("\nFirst insert the document...");
         		String response = m.putObject(docid + ".1",sr,true);
         		String response = m.create(docid + ".1",sr);
         		sr.close();
         		debug("response:\n"+response);
                 assertTrue(response.indexOf("success") != -1);
-...
         		sr = new StringReader(emldoc);
         		debug("\nNow update the document...");
         		response = m.putObject(docid + ".2",sr,false);
         		response = m.update(docid + ".2",sr);
         		debug("response:\n"+response);
                 assertTrue(response.indexOf("success") != -1);
         		sr.close();
-...
             String response;
             try {
                 m.login(username,password);
                 response = m.putObject(guid, sr, true);
                 response = m.create(guid, sr);
                 debug("response:\n"+response);
                 assertTrue(response.indexOf("success") != -1);
             } catch (InsufficientKarmaException e) {

+    	}
     	/**
     	 * Put (Insert/Update) an XML document into the repository.
+    	 *
     	 * @param docid the docid to insert the document
     	 * @param xmlDocument a Reader for accessing the XML document to be inserted
     	 * @param isInsert whether the operation is update or insert
+    	 *
+    	 *
     	 * @return the metacat response message
     	 * @throws InsufficientKarmaException when the user has insufficent rights
     	 *                                    for the operation
     	 * @throws MetacatInaccessibleException when the metacat server can not be
     	 *                                    reached or does not respond
     	 * @throws MetacatException when the metacat server generates another error
     	 * @throws IOException when there is an error reading the xml document
     	 */
     	public String putObject(String docid, Reader xmlDocument, boolean isInsert)
     	throws InsufficientKarmaException, MetacatException, IOException, MetacatInaccessibleException{
     		String resource = RESOURCE_OBJECTS+"/"+docid;
     		String urlParams = "sessionid="+sessionId+"&";
     		if (isInsert)
     			urlParams += FUNCTION_KEYWORD+"="+FUNCTION_NAME_INSERT;
     		else
     			urlParams += FUNCTION_KEYWORD+"="+FUNCTION_NAME_UPDATE;
     		String response = null;
     		try{
     			response = sendData(resource, PUT, urlParams, null, "text/xml", xmlDocument, null);
     		} catch (Exception e) {
     			e.printStackTrace();
     			throw new MetacatInaccessibleException(e.getMessage());
+    		}
     		// Check for an error condition
     		if (response.indexOf("<error>") != -1) {
     			if (response.indexOf("does not have permission") != -1) {
     				throw new InsufficientKarmaException(response);
     			} else {
     				throw new MetacatException(response);
+    			}
+    		}
     		return response;
+    	}
          * Create an XML document in the repository.
+         *
          * @param docid the docid to insert the document
          * @param xmlDocument a Reader for accessing the XML document to be inserted
          * @param isInsert whether the operation is update or insert
+         *
+         *
          * @return the metacat response message
          * @throws InsufficientKarmaException when the user has insufficent rights
          *                                    for the operation
          * @throws MetacatInaccessibleException when the metacat server can not be
          *                                    reached or does not respond
          * @throws MetacatException when the metacat server generates another error
          * @throws IOException when there is an error reading the xml document
          */
         public String create(String docid, Reader xmlDocument)
         throws InsufficientKarmaException, MetacatException, IOException, MetacatInaccessibleException {
             return putObject(docid, xmlDocument, true);
+        }
         /**
          * Update an XML document in the repository, replacing an existing document.
+         *
          * @param docid the docid to insert the document
          * @param xmlDocument a Reader for accessing the XML document to be inserted
          * @param isInsert whether the operation is update or insert
+         *
+         *
          * @return the metacat response message
          * @throws InsufficientKarmaException when the user has insufficent rights
          *                                    for the operation
          * @throws MetacatInaccessibleException when the metacat server can not be
          *                                    reached or does not respond
          * @throws MetacatException when the metacat server generates another error
          * @throws IOException when there is an error reading the xml document
          */
         public String update(String docid, Reader xmlDocument)
         throws InsufficientKarmaException, MetacatException, IOException, MetacatInaccessibleException {
             return putObject(docid, xmlDocument, false);
+        }
     	/**
     	 * Delete an XML document in the repository.
+    	 *
-...
+    	}
     	/**
          * Put (Insert/Update) an XML document into the repository.
+         *
          * @param docid the docid to insert the document
          * @param xmlDocument a Reader for accessing the XML document to be inserted
          * @param isInsert whether the operation is update or insert
+         *
          * @return the metacat response message
          * @throws InsufficientKarmaException when the user has insufficent rights
          *                                    for the operation
          * @throws MetacatInaccessibleException when the metacat server can not be
          *                                    reached or does not respond
          * @throws MetacatException when the metacat server generates another error
          * @throws IOException when there is an error reading the xml document
          */
         private String putObject(String docid, Reader xmlDocument, boolean isInsert)
         throws InsufficientKarmaException, MetacatException, IOException, MetacatInaccessibleException {
         	String resource = RESOURCE_OBJECTS+"/"+docid;
         	String urlParams = "sessionid="+sessionId+"&";
         	if (isInsert)
         		urlParams += FUNCTION_KEYWORD+"="+FUNCTION_NAME_INSERT;
         	else
         		urlParams += FUNCTION_KEYWORD+"="+FUNCTION_NAME_UPDATE;
         	String response = null;
         	try{
         		response = sendData(resource, PUT, urlParams, null, "text/xml", xmlDocument, null);
         	} catch (Exception e) {
         		e.printStackTrace();
         		throw new MetacatInaccessibleException(e.getMessage());
+        	}
         	// Check for an error condition
         	if (response.indexOf("<error>") != -1) {
         		if (response.indexOf("does not have permission") != -1) {
         			throw new InsufficientKarmaException(response);
         		} else {
         			throw new MetacatException(response);
+        		}
+        	}
         	return response;
+        }
         /**
     	 * Send request to metacat REST API.
     	 * @param resource Resource name to be accessed
     	 * @param method HTTP verb, shoudl be one of GET,POST,DELETE,PUT

         public Reader authenticatedQuery(Reader xmlQuery) throws MetacatInaccessibleException,IOException;
         /**
          * Insert / Update an XML document into the repository, making it available for
          * Create an XML document into the repository, making it available for
          * searching using the query() methods.
+         *
          * @param docid the docid to insert the document
          * @param xmlDocument a Reader for accessing the XML document to be inserted
          * @param isInsert whether the operation is update or insert
+         *
          * @return the metacat response message
          * @throws InsufficientKarmaException when the user has insufficent rights
-...
          * @throws MetacatException when the metacat server generates another error
          * @throws IOException when there is an error reading the xml document
          */
         public String putObject(String docid, Reader xmlDocument,boolean isInsert)
         public String create(String docid, Reader xmlDocument)
             throws InsufficientKarmaException, MetacatException, IOException,
             MetacatInaccessibleException;
         /**
          * Update an XML document into the repository, making it available for
          * searching using the query() methods.
+         *
          * @param docid the docid to insert the document
          * @param xmlDocument a Reader for accessing the XML document to be inserted
+         *
          * @return the metacat response message
          * @throws InsufficientKarmaException when the user has insufficent rights
          *                                    for the operation
          * @throws MetacatInaccessibleException when the metacat server can not be
          *                                    reached or does not respond
          * @throws MetacatException when the metacat server generates another error
          * @throws IOException when there is an error reading the xml document
          */
         public String update(String docid, Reader xmlDocument)
             throws InsufficientKarmaException, MetacatException, IOException,
             MetacatInaccessibleException;
         /**
          * Delete an XML document in the repository.

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5291

Added by Matt Jones over 14 years ago