| Line 514... |
Line 514... |
| 514 |
Entity entity = CreationUtils.getEntity(entityID);
|
514 |
Entity entity = CreationUtils.getEntity(entityID);
|
| 515 |
// Handle borrowed slides
|
515 |
// Handle borrowed slides
|
| 516 |
List<Slide> borrowedSlides = CreationUtils.getBorrowedSlides(entity);
|
516 |
List<Slide> borrowedSlides = CreationUtils.getBorrowedSlides(entity);
|
| 517 |
|
517 |
|
| 518 |
for (Slide borrowedSlide : borrowedSlides) {
|
518 |
for (Slide borrowedSlide : borrowedSlides) {
|
| 519 |
if(borrowedSlide.getBorrowedCategoryID() == -1){
|
519 |
if(CreationUtils.getBorrowedCategoryID(borrowedSlide.getSlideDefinitionID(), entity.getCategoryID()) == -1){
|
| 520 |
continue;
|
520 |
continue;
|
| 521 |
}
|
521 |
}
|
| - |
|
522 |
// if(borrowedSlide.getBorrowedCategoryID() == -1){
|
| - |
|
523 |
// continue;
|
| - |
|
524 |
// }
|
| 522 |
String facetXMLSnip = this.processBorrowedSlide(expEntity,
|
525 |
String facetXMLSnip = this.processBorrowedSlide(expEntity,
|
| 523 |
borrowedSlide, processedFacets);
|
526 |
borrowedSlide, processedFacets);
|
| 524 |
|
527 |
|
| 525 |
if(facetXMLSnip != null &&
|
528 |
if(facetXMLSnip != null &&
|
| 526 |
!StringUtils.trim(facetXMLSnip).isEmpty()) {
|
529 |
!StringUtils.trim(facetXMLSnip).isEmpty()) {
|
| Line 642... |
Line 645... |
| 642 |
* @return
|
645 |
* @return
|
| 643 |
*/
|
646 |
*/
|
| 644 |
private String processBorrowedSlide(ExpandedEntity expEntity,
|
647 |
private String processBorrowedSlide(ExpandedEntity expEntity,
|
| 645 |
Slide borrowedSlide, Set<Long> processedFacets) throws Exception {
|
648 |
Slide borrowedSlide, Set<Long> processedFacets) throws Exception {
|
| 646 |
// Borrowed category ID
|
649 |
// Borrowed category ID
|
| 647 |
long borrowedCategoryID = borrowedSlide.getBorrowedCategoryID();
|
650 |
long borrowedCategoryID = CreationUtils.getBorrowedCategoryID(borrowedSlide.getSlideDefinitionID(), expEntity.getCategoryID());
|
| 648 |
Utils.info("borrowedCategoryID=" + borrowedCategoryID);
|
651 |
Utils.info("borrowedCategoryID=" + borrowedCategoryID);
|
| 649 |
|
652 |
|
| 650 |
// Slide definition ID
|
653 |
// Slide definition ID
|
| 651 |
long slideDefID = borrowedSlide.getSlideDefinitionID();
|
654 |
long slideDefID = borrowedSlide.getSlideDefinitionID();
|
| 652 |
Utils.info("borrowed slideDefID=" + slideDefID);
|
655 |
Utils.info("borrowed slideDefID=" + slideDefID);
|