Changeset 22357

Show
Ignore:
Timestamp:
06.07.2010 15:22:01 (9 years ago)
Author:
kjdon
Message:

.col file now called gli.col, not collname.col (to make it easy to renmae collections). Also, don't check for existence of metadata directory - we want to allow non-gli collections to be opened. so an etc/collect.cfg is enough

Files:
1 modified

Legend:

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

    r20924 r22357  
    298298             
    299299            File config_file = new File(collection_folder, file_name); 
    300             File collection_metadata_directory = new File(collection_folder, "metadata"); 
    301300            if (config_file.exists()) { 
    302301            BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file); 
     
    309308            } 
    310309            else { 
    311                 // if we have a metadata directory, then its a valid collection 
    312                 if (collection_metadata_directory.exists()) { 
    313                 data.add(collection_configuration); 
    314                 } 
     310              // add this collection. We want to allow non gli collections, so add anything that has a config file. 
     311              data.add(collection_configuration); 
    315312            } 
    316313            } 
     
    385382        File etc_folder = collect_cfg_file.getParentFile(); 
    386383        File collection_folder = etc_folder.getParentFile(); 
    387         filename = collection_folder.getAbsolutePath() + File.separator + collection_folder.getName() + ".col"; 
     384        filename = collection_folder.getAbsolutePath() + File.separator + "gli.col"; 
    388385        collection_folder = null; 
    389386        etc_folder = null;