/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5621

Added by berkley over 13 years ago

fixed a bunch of small errors, did some reformatting, and fixed a bug that I thought was fixed last week

     		suite.addTest(new CrudServiceTest("testChecksumError"));
     		suite.addTest(new CrudServiceTest("testPublicAccess"));
     		suite.addTest(new CrudServiceTest("testFailedCreate"));
     		suite.addTest(new CrudServiceTest("testChecksum"));
     		return suite;
+    	}
     	/**
     	 * test the checksum creation
     	 */
     	public void testChecksum()
+    	{
     	    try
+    	    {
     	        CrudService cs = CrudService.getInstance();
     	        AuthToken token = getToken();
     	        System.out.println("token: " + token.getToken());
     	        String doc = getTestDoc();
     	        Identifier id = createDoc(token, doc);
     	        System.out.println("ID: " + id.getValue());
                 makeDocPublic(token, id, true);
     	        String doc2 = getDoc(token, id);
     	        String checksum = checksum(doc);
                 Checksum checksum2 = cs.getChecksum(token, id, "MD5");
                 System.out.println("doc: \"" + doc + "\"");
                 System.out.println("doc2: \"" + doc2 + "\"");
                 System.out.println("checksum1: " + checksum);
                 System.out.println("checksum2: " + checksum2.getValue());
                 assertTrue(checksum.equals(checksum2.getValue()));
+    	    }
     	    catch(Exception e)
+    	    {
     	        fail("Unexpected error in testChecksum: " + e.getMessage());
+    	    }
+    	}
     	/**
     	 * insert an invalid document and make sure create fails and does not
     	 * leave any artifacts behind
     	 */
-...
     	  throws Exception
+    	{
     	    CrudService cs = CrudService.getInstance();
     	    //try to get the same doc then compare them
             InputStream gotDocStream = cs.get(token, id);
             StringBuffer sb = new StringBuffer();
             byte[] b = new byte[1024];
             int numread = gotDocStream.read(b, 0, 1024);
             while(numread != -1)
+            {
                 sb.append(new String(b, 0, numread));
                 numread = gotDocStream.read(b, 0, 1024);
+            }
             return sb.toString();
             return IOUtils.toString(gotDocStream);
+    	}
     	/**

     import java.io.BufferedInputStream;
     import java.io.BufferedOutputStream;
     import java.io.ByteArrayInputStream;
     import java.io.ByteArrayOutputStream;
     import java.io.File;
     import java.io.FileOutputStream;
     import java.io.FileWriter;
-...
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     import edu.ucsb.nceas.utilities.UtilException;
     import org.apache.commons.io.IOUtils;
     import org.apache.log4j.Logger;
     import org.xml.sax.ContentHandler;
     import org.xml.sax.DTDHandler;
-...
     	 * @param accNumber
     	 *            the document id which is used to name the output file
     	 */
         private static void writeToFileSystem(Reader xml, String accNumber) throws McdbException {
         private static void writeToFileSystem(InputStream xml, String accNumber) throws McdbException {
     		// write the document to disk
     //		FileWriter fileWriter = null;
-...
     					&& (FileUtil.getFileStatus(documentPath) == FileUtil.DOES_NOT_EXIST
     							|| FileUtil.getFileSize(documentPath) == 0)) {
     				FileUtil.writeFile(documentPath, xml);
     //				fileWriter = new FileWriter(documentPath);
     //				fileWriter.write(xml);
     //				fileWriter.close();
     				//FileUtil.writeFile(documentPath, xml);
     			    try
+    			    {
     			        String s = IOUtils.toString(xml);
     			        //TODO: the doc gets put into memory here.  I can't get
     			        //it to write to the filesystem correctly without doing
     			        //this.  Need to revisit at some point.
     			        if(s.endsWith("\n"))
+    			        {
     			          s += "\n";
+    			        }
     			        //HACK: For some reason, FileOutputStream is cutting off the last
     			        //byte of the file if there is a newline present.  The only
     			        //way I could find to fix this was to add another newline.
     			        FileOutputStream fos = new FileOutputStream(documentPath);
     			        IOUtils.write(s.getBytes(), fos);
     			        byte[] b = new byte[1024];
     			        int numread = xml.read(b, 0, 1024);
     			        /*while(numread != -1)
+    			        {
     			            System.out.println("numread: " + numread + " s: \"" + new String(b, 0, numread) + "\"");
     			            System.out.println("last byte: " + b[numread] + "  one less: " + b[numread - 1] + " one more: " + b[numread + 1]);
     			            fos.write(b, 0, numread);
     			            numread = xml.read(b, 0, 1024);
     			        }*/
     			        fos.flush();
     			        fos.close();
+    			    }
     			    catch(IOException ioe)
+    			    {
     			        throw new McdbException("Could not write file: " + documentPath + " : "
     		                    + ioe.getMessage());
+    			    }
+    			}
     		} catch (PropertyNotFoundException pnfe) {
     			throw new McdbException("Could not write file: " + documentPath + " : "
     					+ pnfe.getMessage());
     		} catch (UtilException ue) {
     		} /*catch (UtilException ue) {
     			throw new McdbException("Could not write file: " + documentPath + " : "
     					+ ue.getMessage());
+    		}
     		}*/
+    	}
         /**
-...
                         //write the file to disk
                         logMetacat.debug("DocumentImpl.write - Writing xml to file system");
                         StringReader xmlReaderForFile = new StringReader(xmlString);
                     	writeToFileSystem(xmlReaderForFile, accnum);
                         ByteArrayInputStream xmlBAOS = new ByteArrayInputStream(xmlString.getBytes());
                     	writeToFileSystem(xmlBAOS, accnum);
                         // write to xml_node complete. start the indexing thread.
                         addDocidToIndexingQueue(docid, rev);
-...
                 conn.setAutoCommit(true);
                 //write the file to disk
                 StringReader xmlReaderForFile = new StringReader(xmlString);
             	writeToFileSystem(xmlReaderForFile, accnum);
                 ByteArrayInputStream xmlBAOS = new ByteArrayInputStream(xmlString.getBytes());
             	writeToFileSystem(xmlBAOS, accnum);
                 addDocidToIndexingQueue(docid, rev);
             } catch (Exception e) {
-...
                 conn.setAutoCommit(true);
                 // Write the file to disk
                 StringReader xmlReaderForFile = new StringReader(xmlString);
             	writeToFileSystem(xmlReaderForFile, accnum);
                 ByteArrayInputStream xmlBAOS = new ByteArrayInputStream(xmlString.getBytes());
             	writeToFileSystem(xmlBAOS, accnum);
                 // write to xml_node complete. start the indexing thread.
                 // this only for xml_documents

             } catch (McdbDocNotFoundException e) {
                 throw new NotFound("1020", e.getMessage());
+            }
+            }
+        }
         /**
          * get the checksum for a document.  NOT IMPLEMENTED
          * get the checksum for a document.  defaults to MD5.
          */
         public Checksum getChecksum(AuthToken token, Identifier guid)
                 throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
                 InvalidRequest, NotImplemented {
                 InvalidRequest, NotImplemented
+        {
             logCrud.info("getChecksum");
             //TODO: this could now easily be implemented
             throw new NotImplemented("1000", "This method not yet implemented.");
             return getChecksum(token, guid, "MD5");
+        }
         /**
          * get the checksum for a document.  NOT IMPLEMENTED
          * get the checksum for a document with the given algorithm
          */
         public Checksum getChecksum(AuthToken token, Identifier guid,
                 String checksumAlgorithm) throws InvalidToken, ServiceFailure,
                 NotAuthorized, NotFound, InvalidRequest, NotImplemented {
                 NotAuthorized, NotFound, InvalidRequest, NotImplemented
+        {
             logCrud.info("getChecksum");
             //TODO: this could now easily be implemented
             throw new NotImplemented("1000", "This method not yet implemented.");
             InputStream docStream = get(token, guid);
             String checksum;
             try
+            {
                 checksum = checksum(docStream, checksumAlgorithm);
+            }
             catch(Exception e)
+            {
                 throw new ServiceFailure("1000", "Error getting checksum: " + e.getMessage());
+            }
             Checksum c = new Checksum();
             c.setAlgorithm(ChecksumAlgorithm.convert(checksumAlgorithm));
             c.setValue(checksum);
             return c;
+        }
         /**
-...
+        }
         /**
          * produce an md5 checksum for item
          * return an MD5 checksum for the stream
          * @param is
          * @return
          */
         private String checksum(InputStream is)
             throws Exception
+        {
             return checksum(is, "MD5");
+        }
         /**
          * produce a checksum for item using the given algorithm
          */
         private String checksum(InputStream is, String algorithm)
           throws Exception
+        {
             byte[] buffer = new byte[1024];
             MessageDigest complete = MessageDigest.getInstance("MD5");
             MessageDigest complete = MessageDigest.getInstance(algorithm);
             int numRead;
             do

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5621

Added by berkley over 13 years ago