Changeset 13680

Timestamp:

2007-01-18T13:31:53+13:00 (16 years ago)

Author:

shaoqun

Message:

made it work in Greenstone3

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• GEMS.java (modified) (2 diffs)
• MetadataSetManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -131 +131 @@
 
     }
-        new GEMS(go.gsdl_path,go.metadata_path,true,go.new_set);
+
+      new GEMS(go.gsdl_path,go.gsdl3_path,go.metadata_path,true,go.new_set);
+       
     }
 
@@ -137 +139 @@
     /** Constructor.
      */
-    public GEMS(String gsdl_path, String metadata_path, boolean standalone, boolean new_set)
+    public GEMS(String gsdl_path, String gsdl3_path, String metadata_path, boolean standalone, boolean new_set)
     {
     self = this;
     JarTools.initialise(this);        
     screen_size = Configuration.screen_size;
-        msm = new MetadataSetManager(gsdl_path);       
+        msm = new MetadataSetManager(gsdl_path,gsdl3_path);       
         stand_alone = standalone;
     listeners = new ArrayList();

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java

@@ -71 +71 @@
 
     /** Constructor. */
-    public MetadataSetManager(String gsdl_path) {
+    public MetadataSetManager(String gsdl_path, String gsdl3_path) {
         // Determine the GLI user directory path
     String gli_user_directory_path = System.getProperty("user.home") + File.separator;
@@ -82 +82 @@
         }
 
-    new Configuration(gli_user_directory_path, gsdl_path, null, null, null);         
+    new Configuration(gli_user_directory_path, gsdl_path, gsdl3_path, null, null);         
     current_language = Configuration.getLanguage(); 
 
@@ -375 +375 @@
      static public String getCollectionPath()
     {
-    return Configuration.gsdl_path + File.separator + "collect";
+        if (Configuration.gsdl3_path != null){
+        return Configuration.gsdl3_path + File.separator + "sites"; 
+
+    }
+    else{
+        return Configuration.gsdl_path + File.separator + "collect";
+    }
     } 
 }