Changeset 7740

Timestamp:

2004-07-16T13:53:15+12:00 (20 years ago)

Author:

davidb

Message:

General changes made to support GLI as an applet.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/DeleteCollectionPrompt.java (modified) (3 diffs)
• gui/MirrorPane.java (modified) (1 diff)
• gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• help/HelpFrame.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java

@@ -40 +40 @@
 import java.awt.event.*;
 import java.io.*;
+import java.net.*;
 import javax.swing.*;
 import javax.swing.event.*;
@@ -315 +316 @@
         }
 
+        if (Gatherer.isGsdlRemote) {
+                
+        String launch_cgi  = Gatherer.cgiBase + "launch?cmd=deldir";
+
+        String col_name = collection.getShortName();
+        String dir = ".";
+
+        try {
+
+            String col_name_encoded = URLEncoder.encode(col_name,"UTF-8");
+            String dir_encoded = URLEncoder.encode(dir,"UTF-8");
+
+            launch_cgi += "&c=" + col_name_encoded;
+            launch_cgi += "&dir=" + dir_encoded;
+        
+            URL launch_url = new URL(launch_cgi);
+            URLConnection launch_connection = launch_url.openConnection();
+            InputStream stdis = launch_connection.getInputStream();
+            InputStreamReader stdisr = new InputStreamReader(stdis, "UTF-8"  );
+            
+            BufferedReader stdbr = new BufferedReader(stdisr);
+            
+            while(true) {
+            String line = stdbr.readLine();
+            // ignore output of running lauch command
+            
+            if (line == null) { break; }
+            }       
+            
+            stdbr.close();
+        }
+        // Exception
+        catch (Exception exception) {
+            Gatherer.println("Exception in GShell.runRemove() - unexpected");
+            Gatherer.printStackTrace(exception);
+        }
+        }
+
         File delete_me;
         if (Gatherer.GS3) {
@@ -321 +360 @@
         delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getShortName()));
         }
-        if(Utility.delete(delete_me)) {
+        if (Utility.delete(delete_me)) {
         if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(Gatherer.c_man.getCollection().getName())) {
             current_coll_deleted = true;

trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java

@@ -91 +91 @@
 
     current_mode = Gatherer.config.getMode();
-    String user_dir = System.getProperty("user.dir");
-    System.err.println("user dir = "+user_dir);
+    // String user_dir = System.getProperty("user.dir"); // ****
+    // System.err.println("**** user dir = "+user_dir);
     // Create
     JPanel edit_pane = new JPanel();

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -228 +228 @@
     // Retrieve the first 8 non-whitespace characters of title_final.
     StringBuffer name_buffer = new StringBuffer("");
+
+    if (Gatherer.isGsdlRemote) {
+        String username = System.getProperty("user.name");
+        if ((username != null) && (username != "")) {
+        name_buffer.append(username + "-");
+        }
+    }
+
     int i = 0;
-    while(i < title_final.length() && name_buffer.length() < 8) {
+    int u = 0;
+    while(i < title_final.length() && u < 8) {
         char c = title_final.charAt(i);
         // Arg. We need a few more tests than just whitespace
         if(Character.isLetterOrDigit(c)) {
         name_buffer.append(Character.toLowerCase(c));
+        u++;
         }
         i++;

trunk/gli/src/org/greenstone/gatherer/help/HelpFrame.java

@@ -167 +167 @@
         // Load the XML help file and build the contents structure from it
         try {
-        DOMParser parser = new DOMParser();
-        parser.parse(Utility.getHelpFolder() + StaticStrings.HELP_INDEX_FILENAME);
-        Document document = parser.getDocument();
+        // DOMParser parser = new DOMParser();
+        // parser.parse(Utility.getHelpFolder() + StaticStrings.HELP_INDEX_FILENAME);
+        // Document document = parser.getDocument();
+
+        String help_index = Utility.getHelpFolder() + StaticStrings.HELP_INDEX_FILENAME;
+        Document document = Utility.parse(help_index,true);
 
         // Traverse the document hierarchy, building a tree representing its structure
@@ -295 +298 @@
     public URL getURL()
     {
+        URL url = null;
+
+        String help_file = Utility.getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION;
+
         if (name != null && !name.equals(NULL_STRING)) {
         try {
-            File file = new File(Utility.getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION);
-            return file.toURL();
-        }
-        catch (Exception e) {
-        }
-        }
-
-        return null;
+            url = Utility.base.getResource("/"+help_file);
+        }
+        catch (Exception error) {
+            // Most likely file name.
+            try {
+            File file = new File(Utility.BASE_DIR + help_file);
+            url = file.toURL();
+
+            }
+            catch (Exception e) {
+            Gatherer.printStackTrace(e);
+            }
+        }
+        }
+        return url;
     }