/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5638

Added by berkley over 13 years ago

working on integrating streaming mmp into resourceHandler

                 File f = new File("test/testMimeInput.txt");
                 FileInputStream fis = new FileInputStream(f);
                 ResourceHandler rh = new ResourceHandler(null, null, null);
                 //Hashtable h = rh.processMMP(fis);
                 Vector<File> v = rh.processMMP(fis);
                 FileInputStream smFis = new FileInputStream(v.elementAt(0));
                 FileInputStream objFis = new FileInputStream(v.elementAt(1));
                 Hashtable<String, File> h = rh.processMMP(fis);
                 FileInputStream smFis = new FileInputStream(h.get("sysmeta"));
                 FileInputStream objFis = new FileInputStream(h.get("object"));
                 String sm = IOUtils.toString(smFis);
                 String obj = IOUtils.toString(objFis);
                 System.out.println("sm: " + sm);
                 System.out.println("obj: " + obj);
                 assertTrue(obj.indexOf("<test>") != -1);
                 assertTrue(sm.indexOf("<d1:systemMetadata") != -1);
                 assertTrue(sm.indexOf("</d1:systemMetadata>") != -1);
                 assertTrue(obj.indexOf("</test>") != -1);
+            }
             catch(Exception e)
+            {

          * write the parts of an MMP to files.  The first file in the vector is
          * a system metadata file, the 2nd is the object.
          */
         private static Vector<File> writeMMPPartsToFiles(InputStream is)
         private static Hashtable<String, File> writeMMPPartsToFiles(InputStream is)
             throws IOException
+        {
             System.out.println("producing data");
-...
                 String searchString;
                 if(!searchForBoundary)
+                {
                     if(ssi == searchStrings.length)
                     if(ssi >= searchStrings.length)
+                    {
                         break;
+                    }
-...
                 int[] result = StreamUtil.lookForMatch(searchString, s);
                 System.out.println("got result from StreamUtil: " + result[0] + ", " + result[1]);
                 if(result[0] != -1 && result[1] == searchString.length())
                 if(result[0] == -1 && result[1] == -1)
                 { //same as else statement
                     if(searchForBoundary)
+                    {
                         //we're in between the start and end of a section
                         //so just write this to the stream
                         System.out.println("XXXX 4 writing string: " + s + "\nXXXX");
                         //dataSink.write(s.getBytes());
                         if(writeSM)
+                        {
                             smFos.write(s.getBytes());
+                        }
                         else
+                        {
                             objFos.write(s.getBytes());
+                        }
+                    }
+                }
                 else if(result[0] != -1 && result[1] == searchString.length())
                 { //we have the whole search string in this group of bytes
                     System.out.println("1");
                     if(searchForBoundary)
-...
+                }
+            }
             Vector<File> v = new Vector<File>();
             Hashtable<String, File> h = new Hashtable<String, File>();
             objFos.flush();
             smFos.flush();
             v.add(smFile);
             v.add(objFile);
             return v;
             h.put("sysmeta", smFile);
             h.put("object", objFile);
             return h;
+        }
         /**
          * return a vector where the first element is a string that represents the system
          * metadata and the 2nd element is an InputStream that is the object
          */
         protected Vector<File> processMMP(final InputStream is)
         protected Hashtable<String, File> processMMP(final InputStream is)
           throws IOException
+        {
          /*   final InputStreamFromOutputStream<String> objectStream =
                 new InputStreamFromOutputStream<String>()
+            {
                 @Override
                 public String produce(final OutputStream dataSink) throws Exception
+                {
                     return produceInputStream(dataSink, is);
+                }
             };
             return objectStream;*/
             return writeMMPPartsToFiles(is);
+        }
-...
                 logMetacat.debug("Disassembling MIME multipart form");
                 InputStream object = null;
                 InputStream sysmeta = null;
                 Hashtable<String, File> parts;
                 Hashtable parts/* = processMMP(request.getInputStream());*/ = new Hashtable();
                 object = (InputStream)parts.get("object");
                 try
+                {
                     parts = processMMP(request.getInputStream());
                     object = new FileInputStream(parts.get("object"));
                     sysmeta = new FileInputStream(parts.get("sysmeta"));
+                }
                 catch(IOException ioe)
+                {
                     throw new ServiceFailure("1202",
                             "IOException when processing Mime Multipart: " + ioe.getMessage());
+                }
                 sysmeta = (InputStream)parts.get("systemmetadata");
                 if ( action.equals(FUNCTION_NAME_INSERT)) { //handle inserts
                     // Check if the objectId exists
-...
                 } else {
                     throw new InvalidRequest("1000", "Operation must be create or update.");
+                }
                 //clean up the MMP files
                 //parts.get("sysmeta").delete();
                 //parts.get("object").delete();
             } catch (NotAuthorized e) {
                 response.setStatus(500);
                 serializeException(e, out);

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5638

Added by berkley over 13 years ago