Changeset 29764 for main/trunk/gli

Show
Ignore:
Timestamp:
03.03.2015 15:01:31 (5 years ago)
Author:
ak19
Message:

Added handling of GS2 in what was GS3-specific in the recently-added GLIEntityResolver class

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/util/GLIEntityResolver.java

    r29753 r29764  
    9191    // add the file's directory to list of search paths, 
    9292    // if it is within the greenstone installation and not already in the list 
    93     if(file.getAbsolutePath().startsWith(Configuration.gsdl3_src_path)) { 
     93    if((!Gatherer.GS3 && file.getAbsolutePath().startsWith(Configuration.gsdl_path)) 
     94       || (Gatherer.GS3 && file.getAbsolutePath().startsWith(Configuration.gsdl3_src_path))) { 
     95 
    9496        File path = file.getParentFile(); 
    9597        if(!list_of_local_search_paths.contains(path)) {