Revision 5445
Added by berkley over 14 years ago
| src/edu/ucsb/nceas/metacat/dataone/CrudService.java | ||
|---|---|---|
| 310 | 310 |
if (isScienceMetadata) {
|
| 311 | 311 |
// CASE METADATA: |
| 312 | 312 |
try {
|
| 313 |
System.out.println("CrudService: inserting document with guid " + guid.getValue());
|
|
| 313 | 314 |
this.insertDocument(object, guid, sessionData); |
| 314 | 315 |
localId = im.getLocalId(guid.getValue()); |
| 315 | 316 |
} catch (IOException e) {
|
| ... | ... | |
| 435 | 436 |
throws ServiceFailure |
| 436 | 437 |
{
|
| 437 | 438 |
String perm = ""; |
| 438 |
if(permission == 4)
|
|
| 439 |
if(permission >= 4)
|
|
| 439 | 440 |
{
|
| 440 | 441 |
perm = "read"; |
| 441 | 442 |
} |
| 442 |
if(permission == 6)
|
|
| 443 |
if(permission >= 6)
|
|
| 443 | 444 |
{
|
| 444 | 445 |
perm = "write"; |
| 445 | 446 |
} |
| ... | ... | |
| 731 | 732 |
info.setChecksum(cs); |
| 732 | 733 |
info.setDateSysMetadataModified(dateSysMetadataModified); |
| 733 | 734 |
Identifier id = new Identifier(); |
| 734 |
id.setValue(d.getField("identifier"));
|
|
| 735 |
id.setValue(d.getField("identifier").trim());
|
|
| 735 | 736 |
info.setIdentifier(id); |
| 736 | 737 |
info.setObjectFormat(returnedObjectFormat); |
| 737 | 738 |
String size = d.getField("size");
|
| src/edu/ucsb/nceas/metacat/IdentifierManager.java | ||
|---|---|---|
| 139 | 139 |
PreparedStatement stmt2 = dbConn.prepareStatement(sql2); |
| 140 | 140 |
rs = stmt2.executeQuery(); |
| 141 | 141 |
Vector accessVector = new Vector(); |
| 142 |
if(rs.next())
|
|
| 142 |
while(rs.next())
|
|
| 143 | 143 |
{
|
| 144 | 144 |
Hashtable accessHash = new Hashtable(); |
| 145 | 145 |
String principal_name = rs.getString(1); |
Also available in: Unified diff
fixed more access control problems. also fixed extraneous white space that was getting put into the listobject output stream