Changeset 29764

Timestamp:

2015-03-03T15:01:31+13:00 (9 years ago)

Author:

ak19

Message:

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

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/GLIEntityResolver.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/util/GLIEntityResolver.java

@@ -91 +91 @@
     // add the file's directory to list of search paths,
     // if it is within the greenstone installation and not already in the list
-    if(file.getAbsolutePath().startsWith(Configuration.gsdl3_src_path)) {
+    if((!Gatherer.GS3 && file.getAbsolutePath().startsWith(Configuration.gsdl_path))
+       || (Gatherer.GS3 && file.getAbsolutePath().startsWith(Configuration.gsdl3_src_path))) {
+
         File path = file.getParentFile();
         if(!list_of_local_search_paths.contains(path)) {