Project

General

Profile

« Previous | Next » 

Revision 8810

Added by ben leinfelder almost 10 years ago

add support for v2 DataONE API.

View differences:

DOIService.java
31 31 

  		




  32
  32
  
    
import org.apache.log4j.Logger;


  		




  33
  33
  
    
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;


  		




  34
  
  
    
import org.dataone.client.D1Client;


  		




  
  34
  
    
import org.dataone.client.v2.itk.D1Client;


  		




  
  35
  
    
import org.dataone.service.exceptions.BaseException;


  		




  35
  36
  
    
import org.dataone.service.exceptions.InvalidRequest;


  		




  36
  37
  
    
import org.dataone.service.exceptions.InvalidToken;


  		




  37
  38
  
    
import org.dataone.service.exceptions.NotAuthorized;


  		




  ......




  39
  40
  
    
import org.dataone.service.exceptions.NotImplemented;


  		




  40
  41
  
    
import org.dataone.service.exceptions.ServiceFailure;


  		




  41
  42
  
    
import org.dataone.service.types.v1.Identifier;


  		




  42
  
  
    
import org.dataone.service.types.v1.Node;


  		




  43
  
  
    
import org.dataone.service.types.v1.ObjectFormat;


  		




  
  43
  
    
import org.dataone.service.types.v2.Node;


  		




  
  44
  
    
import org.dataone.service.types.v2.ObjectFormat;


  		




  44
  45
  
    
import org.dataone.service.types.v1.Permission;


  		




  45
  46
  
    
import org.dataone.service.types.v1.Person;


  		




  46
  47
  
    
import org.dataone.service.types.v1.Session;


  		




  47
  48
  
    
import org.dataone.service.types.v1.Subject;


  		




  48
  49
  
    
import org.dataone.service.types.v1.SubjectInfo;


  		




  49
  
  
    
import org.dataone.service.types.v1.SystemMetadata;


  		




  
  50
  
    
import org.dataone.service.types.v2.SystemMetadata;


  		




  50
  51
  
    
import org.dataone.service.types.v1.util.AuthUtils;


  		




  51
  52
  
    
import org.dataone.service.util.Constants;


  		




  52
  53
  
    
import org.ecoinformatics.datamanager.parser.DataPackage;


  		




  ......




  200
  201
  
    
				ObjectFormat objectFormat = null;


  		




  201
  202
  
    
				try {


  		




  202
  203
  
    
					objectFormat = D1Client.getCN().getFormat(sysMeta.getFormatId());


  		




  203
  
  
    
				} catch (NotFound e1) {


  		




  
  204
  
    
				} catch (BaseException e1) {


  		




  204
  205
  
    
					logMetacat.warn("Could not check format type for: " + sysMeta.getFormatId());


  		




  205
  206
  
    
				}


  		




  206
  207
  
    
				if (objectFormat != null && objectFormat.getFormatType().equals("METADATA")) {


  		




  ......




  339
  340
  
    
		// default to given DN


  		




  340
  341
  
    
		String fullName = subject.getValue();


  		




  341
  342
  
    
		


  		




  342
  
  
    
		SubjectInfo subjectInfo = D1Client.getCN().getSubjectInfo(subject);


  		




  
  343
  
    
		SubjectInfo subjectInfo = D1Client.getCN().getSubjectInfo(null, subject);


  		




  343
  344
  
    
		if (subjectInfo != null && subjectInfo.getPersonList() != null) {


  		




  344
  345
  
    
			for (Person p: subjectInfo.getPersonList()) {


  		




  345
  346
  
    
				if (p.getSubject().equals(subject)) {


  		












Also available in:  Unified diff