/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5808

Added by berkley over 13 years ago

refactored MMP handling

+        }
         /**
          * process a mime multipart message
          * locate the boundary marker for an MMP
          * @param is
          * @return
          * @throws IOException
          */
         /*private Hashtable processMMP(InputStream is)
           throws IOException
+        {
             //TODO: verify that this is how the RFC for MMP should work
             //SORTAHACK: Since mmp seems to have a bug where large object parts get truncated,
             //parse the stream here.  This has the disavantage of putting the
             //stream into memory.
             InputStream object = null;
             InputStream sysmeta = null;
             String s = IOUtils.toString(is);
             System.out.println("mime: " + s);
             //figure out what the boundary marker is
             String searchString = "boundary=";
             int searchStringIndex = s.indexOf(searchString);
             String boundary = s.substring(searchStringIndex + searchString.length() + 1,
                     s.indexOf("\"", searchStringIndex + searchString.length() + 1));
             boundary = "--" + boundary;
             //System.out.println("boundary is " + boundary);
             //find the system metadata
             searchString = "Content-Disposition: attachment; filename=systemmetadata";
             searchStringIndex = s.indexOf(searchString);
             String sm = s.substring(searchStringIndex +
                     searchString.length() + 2,
                     s.indexOf(boundary, searchStringIndex));
             sysmeta = new ByteArrayInputStream(sm.getBytes());
             //find the object
             searchString = "Content-Disposition: attachment; filename=object";
             searchStringIndex = s.indexOf(searchString);
             String o = s.substring(searchStringIndex +
                     searchString.length() + 2,
                     s.indexOf(boundary, searchStringIndex));
             object = new ByteArrayInputStream(o.getBytes());
             Hashtable h = new Hashtable();
             h.put("object", object);
             h.put("systemmetadata", sysmeta);
             //System.out.println("o: \"" + o + "\"");
             //System.out.println("sm: \"" + sm + "\"");
             return h;
+        }
         */
         protected static String[] findBoundaryString(InputStream is)
             throws IOException
+        {
-...
             return endResult;
+        }
         /**
          * find the part marked by the boundary and the searchstring and write it to f
          * @param beginSearch
          * @param is
          * @param boundary
          * @param searchString
          * @param f
          * @return
          * @throws IOException
          */
         protected String writeMMPPartToFile(String beginSearch,
                 InputStream is, String boundary, String searchString, File f)
             throws IOException
-...
             return "";
+        }
         /**
          * write mime multipart parts to files.  this defaults ot getting
          * the parts "systemmetadata" and "object"
          * @param is
          * @return
          * @throws IOException
          */
         protected Hashtable<String, File> writeMMPPartsToFiles(InputStream is)
             throws IOException
+        {
             String[] searchStrings = {
                     "Content-Disposition: attachment; filename=systemmetadata\n\n",
                     "Content-Disposition: attachment; filename=object\n\n"};
             String[] names = {
                     "systemmetadata",
                     "object"
             };
             return writeMMPPartsToFiles(is, searchStrings, names);
+        }
         /**
          * write the mime multipart parts to files.  search for the parts by the names
          * of the searchStrings in order
          * @param is the inputstream of the MMP
          * @param searchStrings the string to search for for the part in the MMP
          * @param names the name to give the indexed part in the returned hashtable
          * @return
          * @throws IOException
          */
         protected Hashtable<String, File> writeMMPPartsToFiles(InputStream is,
                 String[] searchStrings, String[] names)
             throws IOException
+        {
             Logger logMetacat = Logger.getLogger(ResourceHandler.class);
             logMetacat.info("Processing Mime Multipart");
             String[] boundaryResults = findBoundaryString(is);
             String boundary = boundaryResults[0];
             String s = boundaryResults[1];
             String[] searchStrings = {
                     "Content-Disposition: attachment; filename=systemmetadata\n\n",
                     "Content-Disposition: attachment; filename=object\n\n"};
             File[] fileArr = getMMPTempFiles();
             File[] fileArr = getMMPTempFiles(searchStrings);
             Hashtable<String, File> h = new Hashtable<String, File>();
             //System.out.println("==========================Looking for SM");
             //System.out.println("writing sm to " + fileArr[0].getAbsolutePath());
             logMetacat.info("writing mime system metadata to " + fileArr[0].getAbsolutePath());
             s = writeMMPPartToFile(s.trim(), is, boundary, searchStrings[0], fileArr[0]);
             logMetacat.info("writeMMPPartToFile returned '" + s.trim() + "' after processing the system metadata");
             //System.out.println("==========================Looking for Object");
             //System.out.println("writing obj to " + fileArr[1].getAbsolutePath());
             logMetacat.info("writing mime object to " + fileArr[1].getAbsolutePath());
             writeMMPPartToFile(s.trim(), is, boundary, searchStrings[1], fileArr[1]);
             h.put("sysmeta", fileArr[0]);
             h.put("object", fileArr[1]);
             for(int i=0; i<searchStrings.length; i++)
+            {
                 System.out.println("searchStrings: " + searchStrings[i]);
                 System.out.println("file: " + fileArr[0].getAbsolutePath());
                 logMetacat.info("writing mime part " + searchStrings[i] + " to " + fileArr[0].getAbsolutePath());
                 s = writeMMPPartToFile(s.trim(), is, boundary, searchStrings[i], fileArr[i]);
                 logMetacat.info("writeMMPPartToFile returned '" + s.trim() + "' after processing part " + searchStrings[i]);
                 h.put(names[i], fileArr[i]);
+            }
             return h;
+        }
         private static File[] getMMPTempFiles()
         private static File[] getMMPTempFiles(String[] searchStrings)
             throws IOException
+        {
             Logger logMetacat = Logger.getLogger(ResourceHandler.class);
-...
                 tmpDir = new File("/tmp");
+            }
             long datetimetag = new Date().getTime();
             File smFile = new File(tmpDir, "sm." + datetimetag + ".tmp");
             File objFile = new File(tmpDir, "obj." + datetimetag + ".tmp");
             File[] fileArr = {smFile, objFile};
             File[] fileArr = new File[searchStrings.length];
             for(int i=0; i<searchStrings.length; i++)
+            {
                 File f = new File(tmpDir, searchStrings[i] + "." + datetimetag + ".tmp");
                 fileArr[i] = f;
+            }
             return fileArr;
+        }
-...
                     InputStream reqStr = request.getInputStream();
                     parts = processMMP(reqStr);
                     object = new FileInputStream(parts.get("object"));
                     sysmeta = new FileInputStream(parts.get("sysmeta"));
                     sysmeta = new FileInputStream(parts.get("systemmetadata"));
                     /*String obj = IOUtils.toString(object);
                     String sm = IOUtils.toString(sysmeta);
-...
+                }
                 //clean up the MMP files
                 parts.get("sysmeta").delete();
                 parts.get("systemmetadata").delete();
                 parts.get("object").delete();
             } catch (NotAuthorized e) {
                 response.setStatus(500);
-...
+            {
                 if(parts != null)
+                {
                     parts.get("sysmeta").delete();
                     parts.get("object").delete();
                     Enumeration keys = parts.keys();
                     while(keys.hasMoreElements())
+                    {
                         String key = (String)keys.nextElement();
                         File f = parts.get(key);
                         f.delete();
+                    }
+                }
+            }
+        }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5808

Added by berkley over 13 years ago