/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5851

Added by berkley almost 14 years ago

refactor checksum and some other stuff

     import org.dataone.service.exceptions.UnsupportedType;
     import org.dataone.service.exceptions.NotFound;
     import org.dataone.service.types.*;
     import org.dataone.service.types.util.ServiceTypeUtil;
     import org.jibx.runtime.BindingDirectory;
     import org.jibx.runtime.IBindingFactory;
     import org.jibx.runtime.IMarshallingContext;
-...
                 File tmpSMFile = new File(tmpDir +
                         ".sysmeta." + new Date().getTime() + ".tmp");
                 System.out.println("temp dir: " + tmpDir.getAbsolutePath());
                 MultipartRequestResolver mrr = new MultipartRequestResolver(tmpDir.getAbsolutePath());
                 MultipartRequestResolver mrr = new MultipartRequestResolver(
                         tmpDir.getAbsolutePath(), 1000000000, 0);
                 MultipartRequest mr = mrr.resolveMultipart(request);
                 Map<String, File> files = mr.getMultipartFiles();
                 Iterator keys = files.keySet().iterator();
-...
                 System.out.println("verifying checksum");
                 String docChecksumStr = CrudService.checksum(
                         new FileInputStream(outputTmpFile),
                         sm.getChecksum().getAlgorithm().name());
                         sm.getChecksum().getAlgorithm().toString());
                 System.out.println("original checksum: " + sm.getChecksum().getValue());
                 System.out.println(" created checksum: " + docChecksumStr);
                 //insert the document in local db
                 System.out.println("creating new doc");
                 CrudService.getInstance().create(token,
                         sm.getIdentifier(), new FileInputStream(outputTmpFile), sm);
                 //call cn.setReplicationStatus(guid, COMPLETE)
                 /*Questions:
                  * Call is now supposed to look like replicate(token, SystemMetadata, SourceNode)
                  * how is SystemMetadata encoded?  Multipart?
+                 *
                  * Is the token passed used to access MN_A?  How does MN_A
                  * know it's valid?
+                 *
                  * What exactly is happening when setReplicationStatus is called
                  * to the CN?  Which systemMetadata is being updated?  MN_A or MN_B or both?
+                 *
+                 *
+                 *
                  */
+            }
+        }
-...
         private void serializeServiceType(Class type, Object object, OutputStream out)
           throws JiBXException
+        {
             IBindingFactory bfact = BindingDirectory.getFactory(type);
             IMarshallingContext mctx = bfact.createMarshallingContext();
             mctx.marshalDocument(object, "UTF-8", null, out);
             ServiceTypeUtil.serializeServiceType(type, object, out);
+        }
         /**
-...
         private Object deserializeServiceType(Class type, InputStream is)
           throws JiBXException
+        {
             IBindingFactory bfact = BindingDirectory.getFactory(type);
             IUnmarshallingContext uctx = bfact.createUnmarshallingContext();
             Object o = (Object) uctx.unmarshalDocument(is, null);
             return o;
             return ServiceTypeUtil.deserializeServiceType(type, is);
+        }
         /**

     import org.jibx.runtime.JiBXException;
     import org.dataone.service.types.Identifier;
     import org.dataone.service.types.util.ServiceTypeUtil;
     import com.gc.iotools.stream.is.InputStreamFromOutputStream;
-...
         public static String checksum(InputStream is, String algorithm)
           throws Exception
+        {
             byte[] buffer = new byte[1024];
             MessageDigest complete = MessageDigest.getInstance(algorithm);
             int numRead;
             do
+            {
               numRead = is.read(buffer);
               if (numRead > 0)
+              {
                 complete.update(buffer, 0, numRead);
+              }
             } while (numRead != -1);
             return getHex(complete.digest());
             return ServiceTypeUtil.checksum(is, ChecksumAlgorithm.convert(algorithm)).getValue();
+        }
         /**
          * convert a byte array to a hex string
          */
         private static String getHex( byte [] raw )
+        {
             final String HEXES = "0123456789ABCDEF";
             if ( raw == null ) {
               return null;
+            }
             final StringBuilder hex = new StringBuilder( 2 * raw.length );
             for ( final byte b : raw ) {
               hex.append(HEXES.charAt((b & 0xF0) >> 4))
                  .append(HEXES.charAt((b & 0x0F)));
+            }
             return hex.toString();
+        }
         /**
          * parse the metacat date which looks like 2010-06-08 (YYYY-MM-DD) into
          * a proper date object
          * @param date

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5851

Added by berkley almost 14 years ago