/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 6700

Added by ben leinfelder almost 13 years ago

clean up populator; use IOUtils library to do string<->stream conversions

     import java.io.ByteArrayInputStream;
     import java.io.InputStream;
     import java.io.OutputStream;
     import java.math.BigInteger;
     import java.net.HttpURLConnection;
     import java.net.URL;
-...
     import java.util.Map;
     import java.util.Vector;
     import javax.activation.DataHandler;
     import javax.activation.DataSource;
     import javax.mail.internet.MimeBodyPart;
     import javax.mail.internet.MimeMultipart;
     import org.apache.commons.io.IOUtils;
     import org.dataone.client.D1Client;
     import org.dataone.client.MNode;
-...
     import edu.ucsb.nceas.metacat.MetaCatServlet;
     import edu.ucsb.nceas.metacat.dataquery.MetacatDatabaseConnectionPoolFactory;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.metacat.restservice.InputStreamDataSource;
     /**
      * @author berkley
-...
         public void populate()
           throws Exception
+        {
             //String sourceSessionid = loginSource();
             //String sourceSessionid = login();
             //do a query
             String params = "returndoctype=eml://ecoinformatics.org/eml-2.1.0&" +
-...
             printHeader("Searching source");
             System.out.println("searching '" + sourceUrl + "' for '" + query + "'");
             InputStream is = getResponse(sourceUrl, "/metacat", params, "POST");
             String response = streamToString(is);
             String response = IOUtils.toString(is, MetaCatServlet.DEFAULT_ENCODING);
             //System.out.println("response: " + response);
             Vector<Document> docs = parseResponse(response);
-...
                 printHeader("Getting document " + doc.docid + " from source " + sourceUrl);
                 params = "action=read&qformat=xml&docid=" + docid;
                 is = getResponse(sourceUrl, "/metacat", params, "POST");
                 String doctext = streamToString(is);
                 String doctext = IOUtils.toString(is, MetaCatServlet.DEFAULT_ENCODING);
                 System.out.println("doctext: " + doctext);
                 is = stringToStream(doctext);
                 is = IOUtils.toInputStream(doctext, MetaCatServlet.DEFAULT_ENCODING);
                 //parse the document
                 DatabaseConnectionPoolInterface connectionPool = MetacatDatabaseConnectionPoolFactory.getDatabaseConnectionPoolInterface();
             	DataManager dataManager = DataManager.getInstance(connectionPool, connectionPool.getDBAdapterName());
-...
+                }
                 //go through the DistributionMetadata and download any described data
                 is = stringToStream(doctext);
                 is = IOUtils.toInputStream(doctext, MetaCatServlet.DEFAULT_ENCODING);
                 doc.doctext = doctext;
                 printHeader("creating document on destination " + destinationUrl);
-...
     	                    //get the file
     	                    params = "action=read&qformat=xml&docid=" + dataDocLocalId;
     	                    InputStream dataDocIs = getResponse(sourceUrl, "/metacat", params, "POST");
     	                    String dataDocText = streamToString(dataDocIs);
     	                    String dataDocText = IOUtils.toString(dataDocIs, MetaCatServlet.DEFAULT_ENCODING);
     	                    //set the id
     	                    Identifier did = new Identifier();
-...
     	                    } catch (NotFound e) {
     							System.out.println(e.getMessage());
+    						}
     	                    dataDocIs = stringToStream(dataDocText);
     	                    dataDocIs = IOUtils.toInputStream(dataDocText, MetaCatServlet.DEFAULT_ENCODING);
     	                    Checksum checksum = ChecksumUtil.checksum(dataDocIs, "MD5");
     	                    dataDocSysMeta.setChecksum(checksum);
     	                    String sizeStr =
-...
     	                    //create the data doc on d1
     	                    try {
     	                        mn.create(session, dataDocSysMeta.getIdentifier(), IOUtils.toInputStream(dataDocText), dataDocSysMeta);
     	                        mn.create(session, dataDocSysMeta.getIdentifier(), IOUtils.toInputStream(dataDocText, MetaCatServlet.DEFAULT_ENCODING), dataDocSysMeta);
+    	                    }
     	                    catch(Exception e) {
     	                        error = true;
-...
                 try {
                   Identifier id =
                 	  mn.create(session, sysmeta.getIdentifier(), IOUtils.toInputStream(doc.doctext), sysmeta);
                 	  mn.create(session, sysmeta.getIdentifier(), IOUtils.toInputStream(doc.doctext, MetaCatServlet.DEFAULT_ENCODING), sysmeta);
                   System.out.println("Success inserting document " + id.getValue());
                   // no need for an ORE map if there's no data
-...
     	              Document rmDoc = new Document(resourceMapId.getValue(), "http://www.openarchives.org/ore/terms", "", "");
     	              rmDoc.doctext = resourceMapXML;
     	              SystemMetadata resourceMapSysMeta = generateSystemMetadata(rmDoc);
     	              mn.create(session, resourceMapId, IOUtils.toInputStream(resourceMapXML), resourceMapSysMeta);
     	              mn.create(session, resourceMapId, IOUtils.toInputStream(resourceMapXML, MetaCatServlet.DEFAULT_ENCODING), resourceMapSysMeta);
     	              // clean up the permissions (FORCE public read)
     	              for (Identifier dataId: dataIds) {
-...
                   new Integer(day).intValue());
             return c.getTime();
+        }
         /**
          * send a request to the resource
          */
         private InputStream sendRequest(String contextRootUrl, String resource,
                 String sessionid, String method, String urlParamaters,
                 String contentType, InputStream dataStream)
             throws Exception
+        {
             HttpURLConnection connection = null ;
             String restURL = contextRootUrl + resource;
             if (urlParamaters != null) {
                 if (restURL.indexOf("?") == -1)
                     restURL += "?";
                 restURL += urlParamaters;
                 if(restURL.indexOf(" ") != -1)
+                {
                     restURL = restURL.replaceAll("\\s", "%20");
+                }
+            }
             if(sessionid != null)
+            {
                 if(restURL.indexOf("?") == -1)
+                {
                     restURL += "?sessionid=" + sessionid;
+                }
                 else
+                {
                     restURL += "&sessionid=" + sessionid;
+                }
+            }
             URL u = null;
             InputStream content = null;
             System.out.println("url: " + restURL);
             System.out.println("method: " + method);
             u = new URL(restURL);
             connection = (HttpURLConnection) u.openConnection();
             if (contentType!=null) {
                 connection.setRequestProperty("Content-Type",contentType);
+            }
             connection.setDoOutput(true);
             connection.setDoInput(true);
             connection.setRequestMethod(method);
             if (!method.equals("GET")) {
                 if (dataStream != null) {
                     OutputStream out = connection.getOutputStream();
                     IOUtils.copy(dataStream, out);
+                }
+            }
             return connection.getInputStream();
+        }
         /**
          * create a mime multipart message from object and sysmeta
          */
         private MimeMultipart createMimeMultipart(InputStream object)
           throws Exception
+        {
             final MimeMultipart mmp = new MimeMultipart();
             MimeBodyPart objectPart = new MimeBodyPart();
             objectPart.addHeaderLine("Content-Transfer-Encoding: base64");
             objectPart.setFileName("doctext");
             DataSource ds = new InputStreamDataSource("doctext", object);
             DataHandler dh = new DataHandler(ds);
             objectPart.setDataHandler(dh);
             mmp.addBodyPart(objectPart);
             return mmp;
+        }
         /**
          * parse a metacat query response and return a vector of docids
          * @param response
          * @return
-...
             return s;
+        }
         /**
          * login the source
          * @return
          * @throws Exception
          */
         private String loginSource()
           throws Exception
+        {
             return login(sourceUrl);
+        }
         /**
          * returns a sessionid
          * @return
          */
         private String login(String sourceUrl)
         private String login()
           throws Exception
+        {
             InputStream is = getResponse(sourceUrl, "/metacat",
                     "action=login&username=" + username + "&password=" + password + "&qformat=xml", "POST");
             String response = streamToString(is);
             String response = IOUtils.toString(is, MetaCatServlet.DEFAULT_ENCODING);
             //System.out.println("response: " + response);
             if(response.indexOf("sessionId") == -1)
+            {
-...
             return content;
+        }
         private String streamToString(InputStream is)
             throws Exception
+        {
             byte b[] = new byte[1024];
             int numread = is.read(b, 0, 1024);
             String response = new String();
             while(numread != -1)
+            {
                 response += new String(b, 0, numread);
                 numread = is.read(b, 0, 1024);
+            }
             return response;
+        }
         private InputStream stringToStream(String s)
           throws Exception
+        {
             ByteArrayInputStream bais = new ByteArrayInputStream(s.getBytes(MetaCatServlet.DEFAULT_ENCODING));
             return bais;
+        }
         private class Document
+        {
             public String docid;

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 6700

Added by ben leinfelder almost 13 years ago