Managing space for openoffice

git-svn-id: https://www.silverpeas.org/svn/silverpeas/services/office-online/trunk@224 a8e77078-a1c7-4fa5-b8fc-53c5178a176c

Author: Emmanuel Hugonnet

src/main/java/com/silverpeas/openoffice/Launcher.java

@@ -21,10 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.silverpeas.openoffice;
 
 import com.silverpeas.openoffice.util.MessageDisplayer;
@@ -41,7 +37,6 @@
 import com.silverpeas.openoffice.util.PasswordManager;
 import com.silverpeas.openoffice.util.UrlExtractor;
 import com.silverpeas.openoffice.windows.MsOfficePathFinder;
-import java.io.File;
 
 /**
  * 

src/main/java/com/silverpeas/openoffice/OfficeLauncher.java

@@ -21,10 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.silverpeas.openoffice;
 
 import com.silverpeas.openoffice.windows.FileWebDavAccessManager;
@@ -36,6 +32,7 @@
 import com.silverpeas.openoffice.util.FinderFactory;
 import com.silverpeas.openoffice.util.MsOfficeType;
 import com.silverpeas.openoffice.util.OsEnum;
+import com.silverpeas.openoffice.util.UrlExtractor;
 import org.apache.commons.httpclient.HttpException;
 
 /**
@@ -59,7 +56,7 @@ public class OfficeLauncher {
   public static int launch(MsOfficeType type, String url,
       AuthenticationInfo authInfo) throws IOException,
       InterruptedException, OfficeNotFoundException {
-    OfficeFinder finder = FinderFactory.getFinder(type);
+    OfficeFinder finder = FinderFactory.getFinder(type); 
     boolean modeDisconnected = (OsEnum.getOS() ==
         OsEnum.WINDOWS_VISTA || OsEnum.getOS() ==
         OsEnum.MAC_OSX) && (finder.isMicrosoftOffice2007());
@@ -115,6 +112,7 @@ public static int launch(String path, String url, boolean modeDisconnected,
       }
     } else {
       //Standard mode : just open it
+      logger.log(Level.INFO, "The exact exec line: " + path + ' ' + url);
       Process process = Runtime.getRuntime().exec(path + ' ' + url);
       return process.waitFor();
     }

src/main/java/com/silverpeas/openoffice/OpenOfficeFinder.java

@@ -57,6 +57,6 @@ public String findOther() throws OfficeNotFoundException {
   public boolean isMicrosoftOffice2007() {
     return false;
   }
-
+  
   public abstract String findOpenOffice() throws OfficeNotFoundException;
 }

src/main/java/com/silverpeas/openoffice/OpenOfficeLauncher.java

@@ -28,15 +28,20 @@
 package com.silverpeas.openoffice;
 
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
  * @author Emmanuel Hugonnet
  */
 public class OpenOfficeLauncher {
 
+  static Logger logger = Logger.getLogger(OfficeLauncher.class.getName());
+
   public static int launch(String path, String url)
       throws IOException, InterruptedException {
+    logger.log(Level.INFO, "The exact exec line: " + '"' + path + "\" " + url);
     Process process = Runtime.getRuntime().exec('"' + path + "\" " + url);
     return process.waitFor();
   }

src/main/java/com/silverpeas/openoffice/macosx/MacOsOfficeFinder.java

@@ -86,4 +86,5 @@ protected boolean isMsOfficePresent() {
     File officeDir = new File(OFFICE_PATH);
     return officeDir.exists();
   }
+
 }

src/main/java/com/silverpeas/openoffice/util/UrlExtractor.java

@@ -59,7 +59,7 @@ public static String decodeUrl(String encodedUrl) {
   }
 
   /**
-   * Escape the rl to manage whitespaces.
+   * Escape the url to manage whitespaces.
    * If we are on Windows the url is surrounded with quotes.
    * If we are on Unix the whitespaces are escaped with %20.
    * @param url the url with whitespaces.
@@ -70,15 +70,26 @@ public static String escapeUrl(String url) {
     switch (os) {
       case WINDOWS_XP:
       case WINDOWS_VISTA:
-        return '"' + url + '"';
+        return '"' + escapeWhiteSpaces(url) + '"';
       case LINUX:
       case MAC_OSX:
-        return url.replaceAll(" ", "%20");
+        return escapeWhiteSpaces(url);
       default:
-        return url.replaceAll(" ", "%20");
+        return escapeWhiteSpaces(url);
     }
   }
 
+  /**
+   * Escape the url to manage whitespaces.
+   * If we are on Windows the url is surrounded with quotes.
+   * If we are on Unix the whitespaces are escaped with %20.
+   * @param url the url with whitespaces.
+   * @return the url with whitespaces escaped.
+   */
+   public static String escapeWhiteSpaces(String url) {
+     return url.replaceAll(" ", "%20");
+   }
+
   /**
    * Decode and espace whitespaces from the url.
    * @param encodedUrl the genuine encoded url.

src/main/java/com/silverpeas/openoffice/windows/MsOfficePathFinder.java

@@ -38,6 +38,7 @@
  */
 public class MsOfficePathFinder implements OfficeFinder {
 
+  private boolean isOpenOffice = true;
   static final OpenOfficeFinder openOffice = new WindowsOpenOfficeFinder();
   public static String basePath = "C:\\Program Files\\Microsoft Office\\OFFICE11";
   private static final String EXCEL = "EXCEL.EXE";
@@ -50,29 +51,36 @@ public MsOfficePathFinder() {
   @Override
   public String findSpreadsheet() throws OfficeNotFoundException {
     if (exists(EXCEL)) {
+      isOpenOffice = false;
       return basePath + File.separator + EXCEL;
     }
+    isOpenOffice = true;
     return openOffice.findSpreadsheet();
   }
 
   @Override
   public String findPresentation() throws OfficeNotFoundException {
     if (exists(POWERPOINT)) {
+      isOpenOffice = false;
       return basePath + File.separator + POWERPOINT;
     }
+    isOpenOffice = true;
     return openOffice.findPresentation();
   }
 
   @Override
   public String findWordEditor() throws OfficeNotFoundException {
     if (exists(WORDS)) {
+      isOpenOffice = false;
       return basePath + File.separator + WORDS + " /m";
     }
+    isOpenOffice = true;
     return openOffice.findWordEditor();
   }
 
   @Override
   public String findOther() throws OfficeNotFoundException {
+    isOpenOffice = true;
     return openOffice.findOther();
   }
 
@@ -85,4 +93,5 @@ protected boolean exists(String exe) {
     File executable = new File(basePath, exe);
     return executable.exists() && executable.isFile();
   }
+
 }

src/main/java/com/silverpeas/openoffice/windows/MsOfficeRegistryHelper.java

@@ -29,7 +29,6 @@
 
 import com.silverpeas.openoffice.OfficeFinder;
 import com.silverpeas.openoffice.OfficeNotFoundException;
-import com.silverpeas.openoffice.OpenOfficeFinder;
 import com.silverpeas.openoffice.util.RegistryKeyReader;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -120,4 +119,5 @@ public String findOther() throws OfficeNotFoundException {
   public boolean isMicrosoftOffice2007() {
     return (RegistryKeyReader.readKey(BASE_MSOFFICE_2007_KEY) != null);
   }
+
 }

src/test/java/com/silverpeas/openoffice/util/UrlExtractorTest.java

@@ -64,7 +64,7 @@ public void testDecodeUrl() {
    */
   public void testEscapeUrl() {
     String url = "http://dsr-preprod-3/silverpeas/repository/jackrabbit/attachments/kmelia34/Attachment/Images/44733/Atelier en classe.doc";
-    String expResult = "\"http://dsr-preprod-3/silverpeas/repository/jackrabbit/attachments/kmelia34/Attachment/Images/44733/Atelier en classe.doc\"";
+    String expResult = "\"http://dsr-preprod-3/silverpeas/repository/jackrabbit/attachments/kmelia34/Attachment/Images/44733/Atelier%20en%20classe.doc\"";
     String expResultUnix = "http://dsr-preprod-3/silverpeas/repository/jackrabbit/attachments/kmelia34/Attachment/Images/44733/Atelier%20en%20classe.doc";
     System.setProperty("os.name", "Windows XP");
     String result = UrlExtractor.escapeUrl(url);
@@ -80,7 +80,7 @@ public void testEscapeUrl() {
   public void testExtractUrl() {
     System.setProperty("os.name", "Windows XP");
     String encodedUrl = "http%3A%2F%2Fdsr-preprod-3%2Fsilverpeas%2Frepository%2Fjackrabbit%2Fattachments%2Fkmelia34%2FAttachment%2FImages%2F44733%2FAtelier+en+classe.doc";
-    String expResult = "\"http://dsr-preprod-3/silverpeas/repository/jackrabbit/attachments/kmelia34/Attachment/Images/44733/Atelier en classe.doc\"";
+    String expResult = "\"http://dsr-preprod-3/silverpeas/repository/jackrabbit/attachments/kmelia34/Attachment/Images/44733/Atelier%20en%20classe.doc\"";
     String result = UrlExtractor.extractUrl(encodedUrl);
     assertEquals(expResult, result);
   }