Changeset 22848

Show
Ignore:
Timestamp:
03.09.2010 17:44:59 (9 years ago)
Author:
ak19
Message:

Further changes to ticket 152 (movable collectdir. Both export.pl and exportcol.pl--for Export (to other formats) and Write To CD-Rom menu options, respectively--are now given a collectdir parameter so exporting can work for collections in non-standard collect directories.

Location:
main/trunk/gli/src/org/greenstone/gatherer/gui
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

    r20924 r22848  
    451451    command_parts_list.add("-saveas"); 
    452452    command_parts_list.add(export_type); 
     453    // we want to be able to export items from other collect directories too 
     454    String collectDir = Gatherer.getCollectDirectoryPath(); 
     455    if(collectDir != Gatherer.getDefaultGSCollectDirectoryPath(true)) { 
     456        command_parts_list.add("-collectdir"); 
     457        command_parts_list.add(collectDir); 
     458    }    
    453459    command_parts_list.add("-exportdir"); 
    454460    String export_dir = LocalGreenstone.getTmpDirectoryPath(); 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

    r22410 r22848  
    375375    } 
    376376 
     377    // we want to be able to export collections in other collect directories too 
     378    String collectDir = Gatherer.getCollectDirectoryPath(); 
     379    if(collectDir != Gatherer.getDefaultGSCollectDirectoryPath(true)) { 
     380        command_parts_list.add("-collectdir"); 
     381        command_parts_list.add(collectDir); 
     382    } 
     383     
    377384    for (int i = 0; i < num_collections; i++) { 
    378385        command_parts_list.add(((BasicCollectionConfiguration) selected_collections.get(i)).getShortName());