Changeset 3571


Ignore:
Timestamp:
Jul 19, 2007, 8:47:16 AM (14 years ago)
Author:
Martin Svensson
Message:

References #451 Some minor bugs are fixed.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plugins/core/net/sf/basedb/plugins/PackedFileExporter.java

    r3568 r3571  
    214214        // Store first part of the parameter values for the job
    215215        storeValue(job, request, ri.getParameter("fileFormat"));
    216         storeValue(job, request, ri.getParameter("files"));
    217         storeValue(job, request, ri.getParameter("directories"));
     216        storeValues(job, request, ri.getParameter("files"));
     217        storeValues(job, request, ri.getParameter("directories"));
    218218        response.setContinue(COMMAND_CONFIGURE_JOB_STEP2);
    219219      }
     
    371371            "fileFormat",
    372372            "File format",
    373             "Please specify which format to use when packing the files",
     373            "Please select which packing format.",
    374374            new StringParameterType(255, null, true, 1, 0, 0, formats)
    375375          );
     
    381381            "files",
    382382            "Files",
    383             "Select the files that should be put in the compressed file,",
     383            "Select the files that should be put in the compressed file.",
    384384            new PathParameterType(Path.Type.FILE, null, false, 0, 0, 0, null)
    385385          );
     
    490490    boolean isInDirectory = false;
    491491    String fileDir = filePath.substring(0, filePath.lastIndexOf("/"));
    492     if ( (directories.size() > 0) && (fileDir.length() > 0))
     492    if ( (directories.size() > 0) && (fileDir.length() > 0) && (directories != null))
    493493    {           
    494494      for (String dir : directories)
  • trunk/src/test/TestPackedFileExporter.java

    r3568 r3571  
    7474    filePaths.add("/unpackzip/index.html");
    7575    List<String> directoryPaths = new ArrayList<String>();
    76     //directoryPaths.add("/unpackzip/images");
     76    directoryPaths.add("/unpackzip/images");
    7777   
    7878    String tarGz = "/" + packedDir + "/test.compressed.file.tar.gz";
     
    9494   
    9595    // Clean up
    96     TestJob.test_delete(zipJobId);
    97     TestDirectory.test_delete(dirId, true);
    9896    if (TestUtil.waitBeforeDelete()) TestUtil.waitForEnter();
    9997    TestDirectory.test_delete(packedDirId, true);
     98    TestJob.test_delete(zipJobId);
     99    TestJob.test_delete(tarJobId);
     100    TestDirectory.test_delete(dirId, true);   
    100101       
    101102    write("++Testing PackedFileExporter "+(ok ? "OK" : "Failed")+"\n");
Note: See TracChangeset for help on using the changeset viewer.