Changeset 26027 for main/trunk
- Timestamp:
- 2012-07-26T11:31:28+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java
r26026 r26027 518 518 519 519 System.err.println(inC.transferTo(0, inC.size(), outC)); 520 520 521 521 in.close(); 522 522 out.close(); … … 539 539 { 540 540 ArrayList<File> filesToReturn = new ArrayList<File>(); 541 542 File siteCollectionDir = new File(GSFile.siteHome(GlobalProperties.getGSDL3Home(), siteName) + File.separator + "collect"); 543 if(siteCollectionDir.exists() && siteCollectionDir.isDirectory()) 541 542 String siteHome = GSFile.siteHome(GlobalProperties.getGSDL3Home(), siteName); 543 544 //Add XSL files from the site transform directory 545 File siteTransformDir = new File(siteHome + File.separator + "transform"); 546 if (siteTransformDir.exists() && siteTransformDir.isDirectory()) 547 { 548 filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(siteTransformDir)); 549 } 550 551 //Add XSL files from collection transform directories 552 File siteCollectionDir = new File(siteHome + File.separator + "collect"); 553 if (siteCollectionDir.exists() && siteCollectionDir.isDirectory()) 544 554 { 545 555 File[] collections = siteCollectionDir.listFiles(); 546 547 for (File collection : collections)548 { 549 if (collection.isDirectory())556 557 for (File collection : collections) 558 { 559 if (collection.isDirectory()) 550 560 { 551 561 File collectionTranformDir = new File(collection.getAbsolutePath() + File.separator + "transform"); 552 if (collectionTranformDir.exists() && collectionTranformDir.isDirectory())562 if (collectionTranformDir.exists() && collectionTranformDir.isDirectory()) 553 563 { 554 564 filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(collectionTranformDir)); … … 557 567 } 558 568 } 559 560 filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(new File(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interfaceName) + File.separator + "transform"))); 561 569 570 //Add XSL files from the interface transform directory 571 File interfaceTransformDir = new File(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interfaceName) + File.separator + "transform"); 572 if (interfaceTransformDir.exists() && interfaceTransformDir.isDirectory()) 573 { 574 filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(interfaceTransformDir)); 575 } 576 562 577 return filesToReturn; 563 578 } … … 566 581 { 567 582 ArrayList<File> filesToReturn = new ArrayList<File>(); 568 569 if (!directory.isDirectory())583 584 if (!directory.isDirectory()) 570 585 { 571 586 return filesToReturn; 572 587 } 573 588 574 589 File[] currentFiles = directory.listFiles(); 575 for (File current : currentFiles)576 { 577 if (current.isDirectory())590 for (File current : currentFiles) 591 { 592 if (current.isDirectory()) 578 593 { 579 594 filesToReturn.addAll(GSFile.getXSLFilesFromDirectoryRecursive(current)); 580 595 } 581 else if (current.getName().endsWith(".xsl"))596 else if (current.getName().endsWith(".xsl")) 582 597 { 583 598 filesToReturn.add(current); 584 599 } 585 600 } 586 601 587 602 return filesToReturn; 588 603 }
Note:
See TracChangeset
for help on using the changeset viewer.