/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5390

Added by berkley over 14 years ago

adding getlogrecords to the rest interface.

     	        Date fromDate = new Date();
     	        Identifier id = createDoc(token, getTestDoc());
     	        Date toDate = new Date();
     	        Log lrs = cs.getLogRecords(token, fromDate, toDate);
     	        Log lrs = cs.getLogRecords(token, fromDate, toDate, null);
     	        assertNotNull(lrs);
     	        assertTrue(lrs.sizeLogEntryList() == 1);
     	        LogEntry lrLogEvent = lrs.getLogEntry(0);

     import javax.servlet.http.HttpServletResponse;
     import java.text.DateFormat;
     import org.apache.commons.httpclient.util.DateParser;
     import org.apache.commons.io.IOUtils;
     import org.apache.log4j.Logger;
     import org.dataone.service.exceptions.BaseException;
-...
         private static final String RESOURCE_META = "meta";
         private static final String RESOURCE_SESSION = "session";
         private static final String RESOURCE_IDENTIFIER = "identifier";
         private static final String RESOURCE_LOG = "log";
         /*
          * API Functions used as URL parameters
-...
                             status = true;
+                        }
                     } else if (resource.equals(RESOURCE_LOG)) {
                         //handle log events
                         if(httpVerb == GET)
+                        {
                             getLog();
                             status = true;
+                        }
                         else
+                        {
                             printError("POST, PUT, DELETE is not supported for logs.", response);
                             status = true;
+                        }
+                    }
                     if (!status)
                         printError("Incorrect parameters!", response);
                 } else {
-...
+        }
         /**
          * get the logs from the CrudService based on passed params.  Available
          * params are token, fromDate, toDate, event.  See
          * http://mule1.dataone.org/ArchitectureDocs/mn_api_crud.html#MN_crud.getLogRecords
          * for more info
          */
         private void getLog()
+        {
             OutputStream out = null;
             try
+            {
                 out = response.getOutputStream();
                 AuthToken token = new AuthToken(sessionId);
                 String fromDateS = params.get("fromDate")[0];
                 Date fromDate = null;
                 String toDateS = params.get("toDate")[0];
                 Date toDate = null;
                 String eventS = params.get("event")[0];
                 Event event = null;
                 if(fromDateS != null)
+                {
                     fromDate = DateParser.parseDate(fromDateS);
+                }
                 if(toDateS != null)
+                {
                     toDate = DateParser.parseDate(toDateS);
+                }
                 if(eventS != null)
+                {
                     event = Event.convert(eventS);
+                }
                 Log log = CrudService.getInstance().getLogRecords(token, fromDate, toDate, event);
                 serializeServiceType(Log.class, log, out);
+            }
             catch(Exception e)
+            {
                 String msg = "Could not get logs from CrudService: " + e.getMessage();
                 ServiceFailure sf = new ServiceFailure("1490", msg);
                 logMetacat.error(msg);
                 e.printStackTrace();
                 serializeException(sf, out);
+            }
+        }
         /**
          *  copies request parameters to a hashtable which is given as argument to native metacathandler functions
          */
         private void initParams() {
-...
                     out = response.getOutputStream();
                     // Serialize and write it to the output stream
                     try {
                         IBindingFactory bfact = BindingDirectory.getFactory(ObjectList.class);
                         IMarshallingContext mctx = bfact.createMarshallingContext();
                         mctx.marshalDocument(ol, "UTF-8", null, out);
                         serializeServiceType(ObjectList.class, ol, out);
                     } catch (JiBXException e) {
                         throw new ServiceFailure("1190", "Failed to serialize ObjectList: " + e.getMessage());
+                    }
-...
                 // Serialize and write it to the output stream
                 try {
                     IBindingFactory bfact = BindingDirectory.getFactory(SystemMetadata.class);
                     IMarshallingContext mctx = bfact.createMarshallingContext();
                     mctx.marshalDocument(sysmeta, "UTF-8", null, out);
                     serializeServiceType(SystemMetadata.class, sysmeta, out);
                 } catch (JiBXException e) {
                     throw new ServiceFailure("1190", "Failed to serialize SystemMetadata: " + e.getMessage());
+                }
-...
+        }
         /**
          * serialize an object of type to out
          * @param type the class of the object to serialize (i.e. SystemMetadata.class)
          * @param object the object to serialize
          * @param out the stream to serialize it to
          * @throws JiBXException
          */
         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);
+        }
         /**
          * deserialize an object of type from is
          * @param type the class of the object to serialize (i.e. SystemMetadata.class)
          * @param is the stream to deserialize from
          * @throws JiBXException
          */
         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;
+        }
         /**
          * Earthgrid API > Query Service > Query Function : translates ecogrid query document to metacat query
          * then calls DBQuery > createResultDocument function and then again translate resultset to ecogrid resultset
+         *

         /**
          * get log records.
          */
         public Log getLogRecords(AuthToken token, Date fromDate, Date toDate)
         public Log getLogRecords(AuthToken token, Date fromDate, Date toDate, Event event)
                 throws InvalidToken, ServiceFailure, NotAuthorized, InvalidRequest,
                 NotImplemented
+        {
-...
                 String ipAddress = getLogEntryField("ipAddress", entry);
                 String principal = getLogEntryField("principal", entry);
                 String docid = getLogEntryField("docid", entry);
                 String event = getLogEntryField("event", entry);
                 String eventS = getLogEntryField("event", entry);
                 String dateLogged = getLogEntryField("dateLogged", entry);
                 LogEntry le = new LogEntry();
                 Event e = Event.convert(event);
                 Event e = Event.convert(eventS);
                 if(e == null)
                 { //skip any events that are not Dataone Crud events
                     continue;
-...
                 princ.setValue(principal);
                 le.setPrincipal(princ);
                 le.setUserAgent("metacat/RESTService");
                 logs.add(le);
                 if(event == null)
+                {
                     logs.add(le);
+                }
                 if(event != null &&
                    e.toString().toLowerCase().trim().equals(event.toString().toLowerCase().trim()))
+                {
                   logs.add(le);
+                }
+            }
             log.setLogEntryList(logs);

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5390

Added by berkley over 14 years ago