Changeset 29049 for main/trunk
- Timestamp:
- 2014-05-12T14:11:08+12:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java
r28984 r29049 512 512 { 513 513 boolean inSet = false; 514 for (HashMap<String, ArrayList<String>> exception : _securityExceptions) 515 { 516 for (String setName : exception.get("sets")) 514 for (HashMap<String, ArrayList<String>> exception : _securityExceptions) { 515 516 ArrayList<String> exceptionSets = exception.get("sets"); 517 if (exceptionSets.size() == 0) { 518 inSet = true; 519 for (String group : exception.get("groups")) 520 { 521 groups.add(group); 522 } 523 } 524 else { 525 for (String setName : exception.get("sets")) 517 526 { 518 if (documentIsInSet(oid, setName)) 527 if (documentIsInSet(oid, setName)) 528 { 529 inSet = true; 530 for (String group : exception.get("groups")) 519 531 { 520 inSet = true; 521 for (String group : exception.get("groups")) 522 { 523 groups.add(group); 524 } 532 groups.add(group); 525 533 } 534 break; 535 } 526 536 } 527 } 528 537 } 538 } 539 540 541 529 542 if (!inSet && _publicAccess) 530 {543 {// our doc was not part of any exception, so it must be public 531 544 groups.add(""); 532 545 } 533 546 } 534 else 547 else // if we are not doing a request with an oid, then free to access 535 548 { 536 549 groups.add("");
Note:
See TracChangeset
for help on using the changeset viewer.