Changeset 18947

Show
Ignore:
Timestamp:
14.04.2009 14:35:18 (10 years ago)
Author:
kjdon
Message:

don't use existence of metadata directory as not collect group, as there may be one there. Look at the collect.cfg first, then test metadata dir

Files:
1 modified

Legend:

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

    r18607 r18947  
    336336        File collect_cfg_file = new File(possible_collections[i], file_name); 
    337337        if (collect_cfg_file.exists()) { 
    338         // If the directory has a metadata/ then the collection can be used as a base 
    339         File metadata_directory = new File(possible_collections[i], "metadata"); 
    340         if (metadata_directory.exists()) { 
    341             // Add to model 
    342             BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file); 
    343             if (Gatherer.GS3 && site != null) { 
    344             collect_cfg.setSite(site); 
    345             } 
    346             Item item = new Item(possible_collections[i], collect_cfg); 
    347             if (!base_collection_model.contains(item)) { 
    348             base_collection_model.add(item); 
    349             } 
    350         } else { 
    351  
    352           // we may be a group coll. Check the collect.cfg for collectgroup=true 
    353           BasicCollectionConfiguration config = new BasicCollectionConfiguration(collect_cfg_file); 
    354           if (config.getCollectGroup().equals("true")) { 
     338        // Check for group coll: Check the collect.cfg for collectgroup=true 
     339        BasicCollectionConfiguration config = new BasicCollectionConfiguration(collect_cfg_file); 
     340        if (config.getCollectGroup().equals("true")) { 
    355341            // try subdirs in here 
    356342            addCollectionsToModel(base_collection_model, possible_collections[i], site); 
    357           } 
     343        }  
     344        else { 
     345             
     346            // If the directory has a metadata/ then the collection can be used as a base 
     347            File metadata_directory = new File(possible_collections[i], "metadata"); 
     348            if (metadata_directory.exists()) { 
     349            // Add to model 
     350            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file); 
     351            if (Gatherer.GS3 && site != null) { 
     352                collect_cfg.setSite(site); 
     353            } 
     354            Item item = new Item(possible_collections[i], collect_cfg); 
     355            if (!base_collection_model.contains(item)) { 
     356                base_collection_model.add(item); 
     357            } 
     358            } 
    358359        } 
    359360        }