Revision 5311
Added by daigle about 14 years ago
| PermissionController.java | ||
|---|---|---|
| 213 | 213 |
}//try |
| 214 | 214 |
catch (Exception e) |
| 215 | 215 |
{
|
| 216 |
logMetacat.warn("There is a exception in hasPermission method: "
|
|
| 216 |
logMetacat.warn("PermissionController.hasPermission - There is a exception in hasPermission method: "
|
|
| 217 | 217 |
+e.getMessage()); |
| 218 | 218 |
} |
| 219 | 219 |
|
| ... | ... | |
| 373 | 373 |
}//try |
| 374 | 374 |
catch( Exception e) |
| 375 | 375 |
{
|
| 376 |
logMetacat.error("error in PermissionControl.has" +
|
|
| 376 |
logMetacat.error("PermissionController.hasUnaccessableSubTree - error in PermissionControl.has" +
|
|
| 377 | 377 |
"UnaccessableSubTree "+e.getMessage()); |
| 378 | 378 |
throw new McdbException(e); |
| 379 | 379 |
} |
| ... | ... | |
| 424 | 424 |
if (startId > subTreeStartId && endId < subTreeEndId) |
| 425 | 425 |
{
|
| 426 | 426 |
needDelete = true; |
| 427 |
logMetacat.info("the subtree: "+ treeId +
|
|
| 427 |
logMetacat.info("PermissionController.mergeEquivalentSubtree - the subtree: "+ treeId +
|
|
| 428 | 428 |
" need to be get rid of from unaccessable"+ |
| 429 | 429 |
" subtree list becuase it is a subtree of"+ |
| 430 | 430 |
" another subtree in the list"); |
| ... | ... | |
| 532 | 532 |
// Bind the values to the query |
| 533 | 533 |
pStmt.setString(1, docId); |
| 534 | 534 |
pStmt.setString(2, principals[i]); |
| 535 |
logMetacat.info("the principle stack is : " +
|
|
| 535 |
logMetacat.info("PermissionController.containDocumentOwner - the principle stack is : " +
|
|
| 536 | 536 |
principals[i]); |
| 537 | 537 |
|
| 538 | 538 |
pStmt.execute(); |
| ... | ... | |
| 541 | 541 |
if (hasRow) |
| 542 | 542 |
{
|
| 543 | 543 |
pStmt.close(); |
| 544 |
logMetacat.info("find the owner");
|
|
| 544 |
logMetacat.info("PermissionController.containDocumentOwner - find the owner");
|
|
| 545 | 545 |
return true; |
| 546 | 546 |
}//if |
| 547 | 547 |
|
| ... | ... | |
| 885 | 885 |
if (user != null) |
| 886 | 886 |
{
|
| 887 | 887 |
usersPackage[0]= user.toLowerCase(); |
| 888 |
logMetacat.info("after transfer to lower case(not null): "+
|
|
| 888 |
logMetacat.info("PermissionController.createUsersPackage - after transfer to lower case(not null): "+
|
|
| 889 | 889 |
usersPackage[0]); |
| 890 | 890 |
} |
| 891 | 891 |
else |
| 892 | 892 |
{
|
| 893 | 893 |
usersPackage[0] = user; |
| 894 | 894 |
usersPackage[0]= user.toLowerCase(); |
| 895 |
logMetacat.info("after transfer to lower case(null): "+
|
|
| 895 |
logMetacat.info("PermissionController.createUsersPackage - after transfer to lower case(null): "+
|
|
| 896 | 896 |
usersPackage[0]); |
| 897 | 897 |
} |
| 898 | 898 |
usersPackage[1]=AccessControlInterface.PUBLIC; |
| ... | ... | |
| 1036 | 1036 |
{
|
| 1037 | 1037 |
if(withRevision) |
| 1038 | 1038 |
{
|
| 1039 |
logMetacat.info("Put subtree id " + subTreeId +
|
|
| 1039 |
logMetacat.info("PermissionController.getUnAccessableInlineDataIdList - Put subtree id " + subTreeId +
|
|
| 1040 | 1040 |
" and " + "inline data file name " + |
| 1041 | 1041 |
fileId + " into " + "un" + permission + |
| 1042 | 1042 |
" hash"); |
| ... | ... | |
| 1045 | 1045 |
} |
| 1046 | 1046 |
else |
| 1047 | 1047 |
{
|
| 1048 |
logMetacat.info("Put subtree id " + subTreeId +
|
|
| 1048 |
logMetacat.info("PermissionController.getUnAccessableInlineDataIdList - Put subtree id " + subTreeId +
|
|
| 1049 | 1049 |
" and " + "inline data file name " + |
| 1050 | 1050 |
DocumentUtil.getInlineDataIdWithoutRev(fileId) + |
| 1051 | 1051 |
" into " + "un" + permission + |
Also available in: Unified diff
Merge 1.9.2 changes back into the trunk