@fix:;Incorrect installation path

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

Author: Emmanuel Hugonnet

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

@@ -26,7 +26,7 @@
  */
 public class Launcher {
 
-  static final String LAUNCHER_VERSION = "2.11";
+  static final String LAUNCHER_VERSION = "2.12";
   static final MimetypesFileTypeMap mimeTypes = new MimetypesFileTypeMap();
   static Logger logger = Logger.getLogger(Launcher.class.getName());
 
@@ -42,9 +42,9 @@ public static void main(String[] args) throws OfficeNotFoundException {
       String url = UrlExtractor.extractUrl(args[0]);
       logger.log(Level.INFO, MessageUtil.getMessage("info.url.decoded") + url);
       if (args[1] != null && !"".equals(args[1].trim())) {
-        logger.log(Level.INFO,
-            MessageUtil.getMessage("info.default.path") + ' ' + args[1]);
-        MsOfficePathFinder.basePath = args[1].replace('/', File.separatorChar);
+        logger.log(Level.INFO,MessageUtil.getMessage("info.default.path")
+            + ' ' + UrlExtractor.decodePath(args[1]));
+        MsOfficePathFinder.basePath = UrlExtractor.decodePath(args[1]);
       }
       AuthenticationInfo authInfo = null;
       if (args.length >= 4) {

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

@@ -4,7 +4,7 @@
  */
 package com.silverpeas.openoffice.util;
 
-import com.silverpeas.openoffice.Launcher;
+import java.io.File;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.logging.Level;
@@ -65,4 +65,14 @@ public static String extractUrl(String encodedUrl) {
     String decodedUrl = decodeUrl(encodedUrl);
     return escapeUrl(decodedUrl);
   }
+
+  /**
+   * Decode the encoded path
+   * @param encodedUrl the path encoded.
+   * @return the path decoded.
+   */
+  public static String decodePath(String encodedPath) {
+    String path = decodeUrl(encodedPath);
+    return path.replace('/', File.separatorChar);
+  }
 }

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

@@ -0,0 +1,74 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.silverpeas.openoffice.util;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author ehugonnet
+ */
+public class UrlExtractorTest extends TestCase {
+
+  public UrlExtractorTest(String testName) {
+    super(testName);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+  }
+
+  /**
+   * Test of decodeUrl method, of class UrlExtractor.
+   */
+  public void testDecodeUrl() {
+    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 result = UrlExtractor.decodeUrl(encodedUrl);
+    assertEquals(expResult, result);
+  }
+
+  /**
+   * Test of escapeUrl method, of class UrlExtractor.
+   */
+  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 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);
+    assertEquals(expResult, result);
+    System.setProperty("os.name", "Linux");
+    result = UrlExtractor.escapeUrl(url);
+    assertEquals(expResultUnix, result);
+  }
+
+  /**
+   * Test of extractUrl method, of class UrlExtractor.
+   */
+  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 result = UrlExtractor.extractUrl(encodedUrl);
+    assertEquals(expResult, result);
+  }
+
+  /**
+   * Test of decodePath method, of class UrlExtractor.
+   */
+  public void testDecodePath() {
+    String encodedPath = "C%3A%5C%5CProgram+Files%5C%5CMicrosoft+Office%5C%5COFFICE10";
+    String expResult = "C:\\\\Program Files\\\\Microsoft Office\\\\OFFICE10";
+    String result = UrlExtractor.decodePath(encodedPath);
+    assertEquals(expResult, result);
+  }
+}