Changeset 14974 for gli/trunk/src/org/greenstone/gatherer/Configuration.java

Timestamp:

2008-02-12T16:13:13+13:00 (16 years ago)

Author:

davidb

Message:

Changes to GLI to support export into Fedora. New utility called flisvn diff gems/MetadataSetManager.java

File:

• gli/trunk/src/org/greenstone/gatherer/Configuration.java (modified) (8 diffs)

gli/trunk/src/org/greenstone/gatherer/Configuration.java

@@ -69 +69 @@
     /** The name of the general Gatherer configuration file for running with GS3. */
     static public String GS3_CONFIG_XML = "config3.xml";
+    static public String FEDORA_CONFIG_PREFIX = "fedora-";
 
     /** The name of the root element of the subtree containing gatherer configuration options. This is required as the document itself may contain several other subtrees of settings (such as in the case of a '.col' file). */
@@ -101 +102 @@
     /** If we are using GLI in Greenstone 3, the path to gsdl3 src directory (== gsdl3 dir)*/
     static public String gsdl3_src_path = "";
+
+    static public FedoraInfo fedora_info = null;
+    
     /** The path to the PERL executable, up to and including Perl.exe. */
     static public String perl_path = "";
@@ -134 +138 @@
      * @param site_name The name of the Greenstone 3 site currently in use.
      */
-    public Configuration(String gli_user_directory_path, String gsdl_path, String gsdl3_path, String gsdl3_src_path, String site_name)
+    public Configuration(String gli_user_directory_path, String gsdl_path, String gsdl3_path, String gsdl3_src_path, String site_name,
+             FedoraInfo fedora_info)
     {
     super();
@@ -145 +150 @@
     this.site_name = site_name;
 
+    this.fedora_info = fedora_info;
+
     // Try to load the configuration file from the user specific location
     String config_xml_file_name = CONFIG_XML;
@@ -151 +158 @@
     }
 
+    if (fedora_info.isActive()) {
+        config_xml_file_name = FEDORA_CONFIG_PREFIX + config_xml_file_name;
+    }
+
     // If the existing user config.xml file isn't recent enough, backup the old version and update it
     File config_xml_file = new File(gli_user_directory_path + config_xml_file_name);
+
     if (config_xml_file != null && config_xml_file.exists()) {
         just_updated_config_xml_file = updateUserConfigXMLFileIfNecessary(config_xml_file);
@@ -597 +609 @@
     }
 
+    static public String getApplicationTitle() {
+    String gli_title = getString("GLI.Title", GENERAL_SETTING);
+    String title = (gli_title=="") ? Gatherer.PROGRAM_NAME : gli_title;
+
+    return title;
+    }
+
+
     static public String getServletPath() {
     return servlet_path;
@@ -688 +708 @@
     File user_config_xml = null;
     String config_xml_name = CONFIG_XML;
+
     if (gsdl3_path!=null) {
         config_xml_name = GS3_CONFIG_XML;
     }
-
+        
     if (Gatherer.isGsdlRemote) {
         if (Gatherer.GS3){
@@ -699 +720 @@
         }
     }
+
+    if (fedora_info.isActive()) {
+        config_xml_name = FEDORA_CONFIG_PREFIX + config_xml_name;
+    }
+
     try {
         user_config_xml = new File(gli_user_directory_path + config_xml_name);