Changeset 31665 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java

Timestamp:

2017-05-08T21:18:21+12:00 (7 years ago)

Author:

ak19

Message:

GS3 source code now updated to use SafeProcess instead of Process (calling Runtime.exec() directly). The use of SafeProcess in RunTarget and BrowserLauncher has been tested on Linux. GDBMWrapper, MapRetrieve and admin/guiext's Command.java are not tested. For GDBMWrapper, because it's in a bit of code that works with txtgz databases. MapRetrive.java and Command.java are untested because I don't know how to test them.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java

@@ -23 +23 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.XMLConverter;
+import org.greenstone.util.SafeProcess;
 
 import org.w3c.dom.Document;
@@ -459 +460 @@
                     // get the map size
                     String get_size[] = { "identify", "-size", "10000", temp_image_file };
+                    /*
                     Process proc;
                     proc = Runtime.getRuntime().exec(get_size);
@@ -464 +466 @@
                     img_size = br.readLine();
                     proc.waitFor();
+                    */
+                    SafeProcess proc = new SafeProcess(get_size);
+                    proc.runProcess();
+                    img_size = proc.getStdOutput();
+                    proc = null;
+
                     img_size = img_size.substring(img_size.indexOf("JPEG") + 5, img_size.indexOf(" ", img_size.indexOf("JPEG") + 5));
                     width = Integer.parseInt(img_size.substring(0, img_size.indexOf("x")));
@@ -541 +549 @@
                     BufferedWriter bw = new BufferedWriter(new FileWriter(this.temp_files_dir + "add_x_" + uid));
                     ;
-                    Process proc;
+                    SafeProcess proc;
 
                     // if a new search
@@ -547 +555 @@
                     {
                         // copy requested map to temp.jpg
-                        proc = Runtime.getRuntime().exec("cp " + this.files_home_dir + "maps" + File.separator + img_num + ".jpg " + temp_image_file);
-                        proc.waitFor();
+                        /*proc = Runtime.getRuntime().exec("cp " + this.files_home_dir + "maps" + File.separator + img_num + ".jpg " + temp_image_file);
+                          proc.waitFor();*/
+                        proc = new SafeProcess("cp " + this.files_home_dir + "maps" + File.separator + img_num + ".jpg " + temp_image_file);
+                        proc.runProcess();
+                        proc = null;                        
                     }
 
                     //get the image size
                     String get_size[] = { "identify", "-size", "10000", temp_image_file };
-                    proc = Runtime.getRuntime().exec(get_size);
+                    /*proc = Runtime.getRuntime().exec(get_size);               
                     BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
                     img_size = br.readLine();
                     proc.waitFor();
+                    */
+                    proc = new SafeProcess(get_size);
+                    proc.runProcess();
+                    img_size = proc.getStdOutput();
+                    proc = null;
+
                     img_size = img_size.substring(img_size.indexOf("JPEG") + 5, img_size.indexOf(" ", img_size.indexOf("JPEG") + 5));
                     if (img_size.indexOf("+") != -1)
@@ -754 +771 @@
                             buf.close();
                             // execute the command for the legend image
-                            proc = Runtime.getRuntime().exec("sh " + this.temp_files_dir + "add_l_" + uid);
-                            proc.waitFor();
+                            /*proc = Runtime.getRuntime().exec("sh " + this.temp_files_dir + "add_l_" + uid);
+                              proc.waitFor();*/
+                            proc = new SafeProcess("sh " + this.temp_files_dir + "add_l_" + uid);
+                            proc.runProcess();
+                            proc = null;
                         }
                         inType.close();
@@ -763 +783 @@
 
                     // execute the convert commands etc.
-                    proc = Runtime.getRuntime().exec("sh " + this.temp_files_dir + "add_x_" + uid);
+                    /*proc = Runtime.getRuntime().exec("sh " + this.temp_files_dir + "add_x_" + uid);
                     proc.waitFor();
+                    */
+                    proc = new SafeProcess("sh " + this.temp_files_dir + "add_x_" + uid);
+                    proc.runProcess();
+                    proc = null;
 
                 }