Project

General

Profile

« Previous | Next » 

Revision 6124

Added by Chris Jones almost 13 years ago

Merged in the D1_0_6_2_BRANCH changes that include the transition from ObjectFormat calls to ObjectFormatCache calls.

View differences:

IdentifierManager.java
35 35 
import java.util.Vector;
36 36 

  		




  37
  37
  
    
import org.apache.log4j.Logger;


  		




  
  38
  
    
import org.dataone.client.ObjectFormatCache;


  		




  
  39
  
    
import org.dataone.service.exceptions.NotFound;


  		




  38
  40
  
    
import org.dataone.service.types.AccessPolicy;


  		




  39
  41
  
    
import org.dataone.service.types.AccessRule;


  		




  40
  42
  
    
import org.dataone.service.types.Checksum;


  		




  ......




  42
  44
  
    
import org.dataone.service.types.Identifier;


  		




  43
  45
  
    
import org.dataone.service.types.NodeReference;


  		




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


  		




  
  47
  
    
import org.dataone.service.types.ObjectFormatIdentifier;


  		




  45
  48
  
    
import org.dataone.service.types.ObjectInfo;


  		




  46
  49
  
    
import org.dataone.service.types.ObjectList;


  		




  47
  50
  
    
import org.dataone.service.types.Permission;


  		




  ......




  127
  130
  
    
        Subject submitterSubject = new Subject();


  		




  128
  131
  
    
        submitterSubject.setValue(submitter);


  		




  129
  132
  
    
        sysMeta.setSubmitter(submitterSubject);


  		




  130
  
  
    
        sysMeta.setObjectFormat(ObjectFormat.convert(objectFormat));


  		




  
  133
  
    
        try {


  		




  
  134
  
    
	        sysMeta.setObjectFormat(ObjectFormatCache.getFormat(objectFormat));


  		




  
  135
  
    
        } catch (NotFound nfe) {


  		




  
  136
  
    
          logMetacat.error("The objectFormat " + objectFormat +


  		




  
  137
  
    
          	" is not registered. Setting the default format.");


  		




  
  138
  
    
          ObjectFormat of = new ObjectFormat();


  		




  
  139
  
    
          ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier();


  		




  
  140
  
    
          fmtid.setValue("application/octet-stream");


  		




  
  141
  
    
          of.setFmtid(fmtid);


  		




  
  142
  
    
          of.setFormatName("Octet Stream");


  		




  
  143
  
    
          sysMeta.setObjectFormat(of);


  		




  
  144
  
    
        }


  		




  131
  145
  
    
        sysMeta.setSize(size);


  		




  132
  146
  
    
        


  		




  133
  147
  
    
        return sysMeta;


  		




  ......




  276
  290
  
    
                Subject submitterSubject = new Subject();


  		




  277
  291
  
    
                submitterSubject.setValue(submitter);


  		




  278
  292
  
    
                sysMeta.setSubmitter(submitterSubject);


  		




  279
  
  
    
                sysMeta.setObjectFormat(ObjectFormat.convert(objectFormat));


  		




  
  293
  
    
                try {


  		




  
  294
  
    
        	        sysMeta.setObjectFormat(ObjectFormatCache.getFormat(objectFormat));


  		




  
  295
  
    
                } catch (NotFound nfe) {


  		




  
  296
  
    
                  logMetacat.error("The objectFormat " + objectFormat +


  		




  
  297
  
    
                  	" is not registered. Setting the default format.");


  		




  
  298
  
    
                  ObjectFormat of = new ObjectFormat();


  		




  
  299
  
    
                  ObjectFormatIdentifier fmtid = new ObjectFormatIdentifier();


  		




  
  300
  
    
                  fmtid.setValue("application/octet-stream");


  		




  
  301
  
    
                  of.setFmtid(fmtid);


  		




  
  302
  
    
                  of.setFormatName("Octet Stream");


  		




  
  303
  
    
                  sysMeta.setObjectFormat(of);


  		




  
  304
  
    
                }


  		




  280
  305
  
    
                sysMeta.setSize(size);


  		




  281
  306
  
    
                


  		




  282
  307
  
    
                stmt.close();


  		




  ......




  1286
  1311
  
    
    	List<XMLAccessDAO> accessDAOs = new ArrayList<XMLAccessDAO>();


  		




  1287
  1312
  
    
        for (AccessRule accessRule: accessPolicy.getAllowList()) {


  		




  1288
  1313
  
    
        	List<Subject> subjects = accessRule.getSubjectList();


  		




  1289
  
  
    
        	List<Identifier> resources = accessRule.getResourceList();


  		




  1290
  1314
  
    
        	List<Permission> permissions = accessRule.getPermissionList();


  		




  1291
  1315
  
    
        	for (Subject subject: subjects) {


  		




  1292
  1316
  
    
    			XMLAccessDAO accessDAO = new XMLAccessDAO();


  		




  ......




  1572
  1596
  
    
                //cs.setAlgorithm(ChecksumAlgorithm.convert(checksumAlgorithm));


  		




  1573
  1597
  
    
                oi.setChecksum(cs);


  		




  1574
  1598
  
    
                


  		




  1575
  
  
    
                ObjectFormat oFormat = ObjectFormat.convert(format);


  		




  
  1599
  
    
                ObjectFormat oFormat = ObjectFormatCache.getFormat(format);


  		




  1576
  1600
  
    
                if(oFormat != null)


  		




  1577
  1601
  
    
                {


  		




  1578
  1602
  
    
                    oi.setObjectFormat(oFormat);


  		




  1579
  1603
  
    
                }


  		




  1580
  1604
  
    
                else


  		




  1581
  1605
  
    
                { //if there is no object format, just default to text/plain


  		




  1582
  
  
    
                    oi.setObjectFormat(ObjectFormat.OCTET_STREAM);


  		




  
  1606
  
    
                    oi.setObjectFormat(ObjectFormatCache.getFormat("application/octet-stream"));


  		




  1583
  1607
  
    
                }


  		




  1584
  1608
  
    
                                


  		




  1585
  1609
  
    
                oi.setSize(size);


  		












Also available in:  Unified diff