Revision 2292
Added by sgarg over 20 years ago
src/edu/ucsb/nceas/metacat/MetaCatServlet.java | ||
---|---|---|
879 | 879 |
try |
880 | 880 |
{ |
881 | 881 |
Hashtable unReadableInlineDataList = |
882 |
PermissionController.getUnReadableInlineDataIdList(docId,user,groups); |
|
883 |
if (unReadableInlineDataList.containsValue(inlineDataId)) |
|
882 |
PermissionController.getUnReadableInlineDataIdList(docId, |
|
883 |
user, groups, false); |
|
884 |
if (unReadableInlineDataList.containsValue( |
|
885 |
MetaCatUtil.getInlineDataIdWithoutRev(inlineDataId))) |
|
884 | 886 |
{ |
885 | 887 |
throw new Exception("User " + user |
886 | 888 |
+ " doesn't have permission " + " to read inlinedata " |
src/edu/ucsb/nceas/metacat/DocumentImpl.java | ||
---|---|---|
1039 | 1039 |
Hashtable unReadableInlineDataList = |
1040 | 1040 |
PermissionController |
1041 | 1041 |
.getUnReadableInlineDataIdList(accessfileName, |
1042 |
user, groups); |
|
1042 |
user, groups, true);
|
|
1043 | 1043 |
if (!unReadableInlineDataList.containsValue(fileName)) { |
1044 | 1044 |
readInlinedata = true; |
1045 | 1045 |
} |
... | ... | |
1152 | 1152 |
} |
1153 | 1153 |
|
1154 | 1154 |
/** |
1155 |
* Build the index record for this document. This requires that the
|
|
1155 |
* Build the index record for this document. This requires that the |
|
1156 | 1156 |
* DocumentImpl instance exists, so first call the constructor that reads |
1157 | 1157 |
* the document from the database. |
1158 | 1158 |
*/ |
... | ... | |
1181 | 1181 |
if (currentNode.nodetype.equals("ELEMENT") || |
1182 | 1182 |
currentNode.nodetype.equals("ATTRIBUTE") ) { |
1183 | 1183 |
|
1184 |
System.err.println("Starting Node: " +
|
|
1185 |
currentNode.getNodeId() + " (" +
|
|
1186 |
currentNode.getParentNodeId() + "): " +
|
|
1184 |
System.err.println("Starting Node: " + |
|
1185 |
currentNode.getNodeId() + " (" + |
|
1186 |
currentNode.getParentNodeId() + "): " + |
|
1187 | 1187 |
currentNode.getNodeName() + " (" + |
1188 | 1188 |
currentNode.getNodeType() + ")" + |
1189 | 1189 |
"\n"); |
... | ... | |
1320 | 1320 |
//out.flush(); |
1321 | 1321 |
} |
1322 | 1322 |
|
1323 |
/**
|
|
1324 |
* Recurse up the parent node hierarchy and add each node to the
|
|
1323 |
/** |
|
1324 |
* Recurse up the parent node hierarchy and add each node to the |
|
1325 | 1325 |
* hashmap of paths to be indexed. |
1326 | 1326 |
* |
1327 | 1327 |
* @param records the set of records hashed by nodeId |
src/edu/ucsb/nceas/metacat/Eml200SAXHandler.java | ||
---|---|---|
329 | 329 |
//info about inline data object which user doesn't have read |
330 | 330 |
//permission the info come from xml_access table |
331 | 331 |
previousUnreadableInlineDataObjectHash = PermissionController. |
332 |
getUnReadableInlineDataIdList(docid, user, groups); |
|
332 |
getUnReadableInlineDataIdList(docid, user, |
|
333 |
groups, true); |
|
333 | 334 |
|
334 | 335 |
//info about data object which user doesn't have write permission |
335 | 336 |
// the info come from xml_accesss table |
336 | 337 |
previousUnwritableInlineDataObjectHash = PermissionController. |
337 |
getUnWritableInlineDataIdList(docid, user, groups); |
|
338 |
getUnWritableInlineDataIdList(docid, user, |
|
339 |
groups, true); |
|
338 | 340 |
|
339 | 341 |
} |
340 | 342 |
|
Also available in: Unified diff
changed function parameters in accordance with changes in PermissionController