Changeset 14974 for gli/trunk/src/org/greenstone/gatherer/Gatherer.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/Gatherer.java (modified) (11 diffs)

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

@@ -36 +36 @@
 import javax.swing.plaf.*;
 import javax.swing.text.*;
+
+
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.GAuthenticator;
+import org.greenstone.gatherer.FedoraInfo;
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.feedback.ActionRecorderDialog;
@@ -51 +54 @@
 import org.greenstone.gatherer.gui.URLField;
 import org.greenstone.gatherer.gui.WarningDialog;
+import org.greenstone.gatherer.gui.FedoraLogin;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
@@ -77 +81 @@
         * change the regex in the gs3-release-maker code and in this message
         */
-    static final public String PROGRAM_VERSION = "trunk";
+    static final public String PROGRAM_VERSION = "1.0";
 
     static private Dimension size = new Dimension(800, 540);
@@ -186 +190 @@
     // More special code for running with a remote Greenstone
     if (isGsdlRemote) {
-        Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
+        if (go.fedora_info.isActive()) {
+        Configuration.TEMPLATE_CONFIG_XML = "xml/" + Configuration.FEDORA_CONFIG_PREFIX + "configRemote.xml";
+        }
+        else {
+        Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
+        }
+
         if (!go.run_gsdl3){  
         Configuration.CONFIG_XML = "configRemote.xml";
@@ -198 +208 @@
         }
     }
-
-    init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, go.local_library_path, go.library_url_string, 
+    else {      
+        if (go.fedora_info.isActive()) {
+        Configuration.TEMPLATE_CONFIG_XML = "xml/" + Configuration.FEDORA_CONFIG_PREFIX + Configuration.CONFIG_XML;
+
+        }
+    }
+
+    init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, 
+         go.fedora_info,
+         go.local_library_path, go.library_url_string, 
          go.gliserver_url_string, go.debug, go.perl_path, go.no_load, go.filename, go.site_name,
          go.servlet_path);
@@ -205 +223 @@
 
 
-    public void init(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String local_library_path,
+    public void init(String gsdl_path, String gsdl3_path, String gsdl3_src_path, 
+             FedoraInfo fedora_info,
+             String local_library_path,
              String library_url_string, String gliserver_url_string, boolean debug_enabled,
              String perl_path, boolean no_load, String open_collection, 
@@ -245 +265 @@
     try {
         // Load GLI config file
-        new Configuration(getGLIUserDirectoryPath(), gsdl_path, gsdl3_path, gsdl3_src_path, site_name);
+        new Configuration(getGLIUserDirectoryPath(), gsdl_path, gsdl3_path, gsdl3_src_path, site_name,
+                  fedora_info);
 
         // Check we know where Perl is
@@ -278 +299 @@
         }
 
+        if (fedora_info.isActive()) {
+        popupFedoraInfo();
+        }
+
+
         // Start up the local library server, if that's what we want
         if (Utility.isWindows() && local_library_path != null && !isGsdlRemote && !GS3) {
@@ -298 +324 @@
         if (Configuration.library_url == null) {
         missingEXEC(); 
+
         if ((Configuration.library_url!=null) && isGsdlRemote && (gliserver_url_string==null)){
             if (GS3){
             default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl");
             }else{
-            default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl");
+            String default_gliserver_str = "";
+            String library_url_str = Configuration.library_url.toString();          
+            int cut_pos = library_url_str.lastIndexOf("/library");
+
+            if (cut_pos>0) {
+                default_gliserver_str = library_url_str.substring(0,cut_pos) + "/gliserver.pl";
+            }
+            else {
+                cut_pos = library_url_str.lastIndexOf("/");
+                if (cut_pos>0) {
+                default_gliserver_str = library_url_str.substring(0,cut_pos) + "/gliserver.pl";
+                }
+                else {
+                default_gliserver_str = library_url_str + "/gliserver.pl";
+                }
+            }
+
+            default_gliserver_url = new URL(default_gliserver_str);
             }
             missingGLIServer();
@@ -327 +371 @@
                 default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl");
             }else{
-                default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl");
+                String library_url = Configuration.library_url.toString();
+                default_gliserver_url = new URL(library_url.substring(0,library_url.lastIndexOf("/library")) + "/gliserver.pl");
             }
             }
@@ -787 +832 @@
     }
     }
+
+
+
+    /** Prints a warning message about a missing library path, which means the final collection cannot be previewed in the Gatherer.
+     */
+    static private void popupFedoraInfo() {
+
+    FedoraLogin dialog = new FedoraLogin("Fedora Login", false);
+
+    if (Configuration.library_url == null) {
+        
+        String library_url_string = dialog.getLibraryURL();
+        if (!library_url_string.equals("")) {
+        try {
+            Configuration.library_url = new URL(library_url_string);
+        }
+        catch (MalformedURLException exception) {
+            DebugStream.printStackTrace(exception);
+        }
+        }
+    }
+        
+    if (dialog.loginRequested()) {
+
+        String hostname = dialog.getHostname();
+        String port     = dialog.getPort();
+        String username = dialog.getUsername();
+        String password = dialog.getPassword();
+        String protocol = dialog.getProtocol();
+
+        Configuration.fedora_info.setHostname(hostname);
+        Configuration.fedora_info.setPort(port);
+        Configuration.fedora_info.setUsername(username);
+        Configuration.fedora_info.setPassword(password);
+        Configuration.fedora_info.setProtocol(protocol);
+
+        String ping_url_str = protocol + "://" + hostname + ":" + port + "/fedora";
+        String login_str = username + ":" + password;
+        
+        String login_encoding = new sun.misc.BASE64Encoder().encode(login_str.getBytes());
+
+
+        try {
+        URL ping_url = new URL(ping_url_str);
+        URLConnection uc = ping_url.openConnection();
+        uc.setRequestProperty  ("Authorization", "Basic " + login_encoding);
+        // Attempt to access some content ...
+        InputStream content = (InputStream)uc.getInputStream();
+
+        }
+        catch (Exception exception) {
+        System.err.println("****");
+        System.err.println("* Failed to connect to Fedora server.");
+        System.err.println("* Server might not be running, or incorrect username and/or password.");
+        System.err.println("***");
+        DebugStream.printStackTrace(exception);
+        System.exit(1);
+        }
+    }
+    else {
+        System.exit(0);
+    }
+
+
+    dialog.dispose();
+    dialog = null;
+
+
+    }
+