Project

General

Profile

« Previous | Next » 

Revision 6366

Added by ben leinfelder over 12 years ago

use new "v1" types from DataONE

View differences:

ResourceHandler.java
68 68 
import org.dataone.service.exceptions.NotImplemented;
69 69 
import org.dataone.service.exceptions.ServiceFailure;
70 70 
import org.dataone.service.exceptions.UnsupportedType;
71 
import org.dataone.service.types.AccessPolicy;
72 
import org.dataone.service.types.Checksum;
73 
import org.dataone.service.types.DescribeResponse;
74 
import org.dataone.service.types.Event;
75 
import org.dataone.service.types.Identifier;
76 
import org.dataone.service.types.Log;
77 
import org.dataone.service.types.Node;
78 
import org.dataone.service.types.NodeList;
79 
import org.dataone.service.types.NodeReference;
80 
import org.dataone.service.types.NodeType;
81 
import org.dataone.service.types.ObjectFormat;
82 
import org.dataone.service.types.ObjectFormatIdentifier;
83 
import org.dataone.service.types.ObjectFormatList;
84 
import org.dataone.service.types.ObjectList;
85 
import org.dataone.service.types.Service;
86 
import org.dataone.service.types.Services;
87 
import org.dataone.service.types.Session;
88 
import org.dataone.service.types.SystemMetadata;
71 
import org.dataone.service.types.v1.AccessPolicy;
72 
import org.dataone.service.types.v1.Checksum;
73 
import org.dataone.service.types.v1.DescribeResponse;
74 
import org.dataone.service.types.v1.Event;
75 
import org.dataone.service.types.v1.Identifier;
76 
import org.dataone.service.types.v1.Log;
77 
import org.dataone.service.types.v1.Node;
78 
import org.dataone.service.types.v1.NodeList;
79 
import org.dataone.service.types.v1.NodeReference;
80 
import org.dataone.service.types.v1.NodeType;
81 
import org.dataone.service.types.v1.ObjectFormat;
82 
import org.dataone.service.types.v1.ObjectFormatIdentifier;
83 
import org.dataone.service.types.v1.ObjectFormatList;
84 
import org.dataone.service.types.v1.ObjectList;
85 
import org.dataone.service.types.v1.Service;
86 
import org.dataone.service.types.v1.Services;
87 
import org.dataone.service.types.v1.Session;
88 
import org.dataone.service.types.v1.SystemMetadata;
89 
import org.dataone.service.types.v1.util.ChecksumUtil;
89 90 
import org.dataone.service.types.util.ServiceTypeUtil;
90 91 
import org.jibx.runtime.BindingDirectory;
91 92 
import org.jibx.runtime.IBindingFactory;
......
95 96 
import edu.ucsb.nceas.metacat.DBUtil;
96 97 
import edu.ucsb.nceas.metacat.IdentifierManager;
97 98 
import edu.ucsb.nceas.metacat.McdbDocNotFoundException;
98 
import edu.ucsb.nceas.metacat.MetaCatServlet;
99 99 
import edu.ucsb.nceas.metacat.MetacatHandler;
100 100 
import edu.ucsb.nceas.metacat.dataone.CNodeService;
101 
import edu.ucsb.nceas.metacat.dataone.HealthService;
102 101 
import edu.ucsb.nceas.metacat.dataone.MNodeService;
103 102 
import edu.ucsb.nceas.metacat.properties.PropertyService;
104 103 
import edu.ucsb.nceas.metacat.service.SessionService;
......
574 573 
                        System.out.println("verb is GET");
575 574 
                        System.out.println("pathInfo is " + pathInfo);
576 575 
                        pathInfo = pathInfo.substring(1);
577 
                        HealthService hs = new HealthService(request, response);
578 
                        if (pathInfo.toLowerCase().equals("ping")) {
579 
                            System.out.println("processing ping request");
580 
                            hs.ping();
581 
                        } else if (pathInfo.toLowerCase().equals("status")) {
582 
                            System.out.println("processing status request");
583 
                            hs.getStatus();
584 
                        } else if (pathInfo.toLowerCase().equals("object")) {
585 
                            System.out.println("processing object request");
586 
                            boolean day = false;
587 
                            Identifier pid = null;
588 
                            String url = null;
589 
                            ObjectFormat of = null;
590 
                            Date time = null;
591
592 
                            if(params.containsKey("day"))
593 
                            {
594 
                               day = true;
595 
                            }
596 
                            if(params.containsKey("pid"))
597 
                            {
598 
                                String id = params.get("pid")[0];
599 
                                pid = new Identifier();
600 
                                pid.setValue(id);
601 
                            }
602 
                            if(params.containsKey("url"))
603 
                            {
604 
                                url = params.get("url")[0];
605 
                            }
606 
                            if(params.containsKey("format"))
607 
                            {
608 
                                String format = params.get("format")[0];
609 
                                of = ObjectFormatCache.getInstance().getFormat(format);
610 
                            }
611 
                            if(params.containsKey("time"))
612 
                            {
613 
                                String t = params.get("time")[0];
614 
                                time = dateFormat.parse(t);
615 
                            }
616
617 
                            hs.getObjectStatistics(day, pid, url, of, time);
618 
                        } else if (pathInfo.toLowerCase().equals("event")) {
619 
                            System.out.println("processing event request");
620 
                            boolean day = false;
621 
                            Identifier pid = null;
622 
                            Date created = null;
623 
                            ObjectFormat of = null;
624 
                            Date time = null;
625 
                            String ipAddress = null;
626 
                            String event = null;
627
628 
                            if(params.containsKey("day"))
629 
                            {
630 
                               day = true;
631 
                            }
632 
                            if(params.containsKey("pid"))
633 
                            {
634 
                                String id = params.get("pid")[0];
635 
                                pid = new Identifier();
636 
                                pid.setValue(id);
637 
                            }
638 
                            if(params.containsKey("created"))
639 
                            {
640 
                                String t = params.get("created")[0];
641 
                                created = dateFormat.parse(t);
642 
                            }
643 
                            if(params.containsKey("format"))
644 
                            {
645 
                                String format = params.get("format")[0];
646 
                                of = ObjectFormatCache.getInstance().getFormat(format);
647 
                            }
648 
                            if(params.containsKey("eventtime"))
649 
                            {
650 
                                String t = params.get("eventtime")[0];
651 
                                time = dateFormat.parse(t);
652 
                            }
653 
                            if(params.containsKey("ip_address"))
654 
                            {
655 
                                ipAddress = params.get("ip_address")[0];
656 
                            }
657 
                            if(params.containsKey("event"))
658 
                            {
659 
                                event = params.get("event")[0];
660 
                            }
661
662 
                            hs.getOperationStatistics(day, pid, of, created, time, ipAddress, event);
663 
                        }
576 
                        // removed HealthService - BRL 20110727
664 577 
                    }
665 578 
                    status = true;
666 579 
                } else if(resource.equals(RESOURCE_REPLICATE)) {
......
782 695
783 696 
            //verify checksum
784 697 
            System.out.println("verifying checksum");
785 
            Checksum sourceFileChecksum = ServiceTypeUtil.checksum(new FileInputStream(outputTmpFile),
698 
            Checksum sourceFileChecksum = ChecksumUtil.checksum(new FileInputStream(outputTmpFile),
786 699 
                    sm.getChecksum().getAlgorithm());
787 700
788 701 
            String cs1 = sm.getChecksum().getValue();

Also available in: Unified diff