(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index 12af136ca9d232dca06b23dd706ff677ecb7ad1f..3f3409ab627ff4e6d46474da9376086bcfc3cc43 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -4,10 +4,10 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>\r
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">\r
         <group>\r
-            <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/StringUtil.java</file>\r
             <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>\r
-            <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/layout/Word.java</file>\r
             <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java</file>\r
+            <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/layout/Word.java</file>\r
+            <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/StringUtil.java</file>\r
         </group>\r
     </open-files>\r
 </project-private>\r

diff --git a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
index 081be331306fef9c221e88c69e35afc65f39ab7a..cbb00b848222d27db29bdf8e59c370c0270719d1 100644 (file)
--- a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
+++ b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
@@ -43,7 +43,7 @@ public class StringUtil {
                }
 
                String res = in.replaceAll(
-                               "[\\u2000-\\u20ff\\x21-\\x2f\\x3a-\\x3f\\x5b-\\x5f\\x7b-\\xa0\\xaa-\\xbf’" + ignore + "]",
+                               "[\\u2000-\\u20ff\\x21-\\x2f\\x3a-\\x3f\\x5b-\\x5f\\x7b-\\xa0\\xaa-\\xbf’\\ufffd" + ignore + "]",
                                " ");
 
                return res;

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 7f10c398598ced8a92e8179ad6eceab70f4e66d4..7d0bcceb75d5aac31cc5d85d2ee682f65c765b73 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -801,7 +801,6 @@ class wsMaintenance {
                $book_id = $args[0];
                wsLinks::getLinksAndRulers($book_id, $links, $rulers);
 
-
                $newlinks = array();
                foreach ($links as $link) {
                        $link['left']-=1;
@@ -889,6 +888,9 @@ class wsMaintenance {
                                }
                        }
                }
+
+               $i = WS_BOOKS . '/index/' . $book_id . '/*';
+               `rm -rf $i`;
        }
 
 }