wip #3639 @4

diff --git a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml
index 408ea811e1ce77cdc65e6568971d61718eeb5aa7..30eb180483a0b87b2544fa927fddd20f7a7f4ca0 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml
+++ b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml
@@ -10,8 +10,9 @@
       </element>\r
       <element id="library" level="project" name="avalon-framework-4.1.4" />\r
       <element id="library" level="project" name="commons-io-2.6" />\r
-      <element id="library" level="project" name="commons-text-1.6" />\r
       <element id="library" level="project" name="commons-logging-1.2" />\r
+      <element id="library" level="project" name="commons-text-1.8" />\r
+      <element id="library" level="project" name="commons-lang3-3.10" />\r
       <element id="library" level="project" name="jempbox-1.8.16" />\r
       <element id="library" level="project" name="pdfbox-1.8.16" />\r
       <element id="library" level="project" name="fontbox-1.8.16" />\r

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_10.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_10.xml
new file mode 100644 (file)
index 0000000..69ff8a4
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_10.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="commons-lang3-3.10">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/commons-lang3-3.10.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml
deleted file mode 100644 (file)
index 3ccf211..0000000
--- a/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">\r
-  <library name="commons-text-1.6">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/lib/commons-text-1.6.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES />\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_8.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_8.xml
new file mode 100644 (file)
index 0000000..5901c87
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_8.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="commons-text-1.8">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/commons-text-1.8.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index d105e9ceff24599288dd4dafe6247a5c532d0d98..01c13350ecbe572ac88d89c6bcf38fe3315cef78 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -7,7 +7,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #3135">
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_lang3_3_10.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_text_1_8.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/commons-lang3-3.10.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/commons-text-1.8.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-io-2.6.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-lang3-3.10.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-logging-1.2.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-text-1.8.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/commons_text_1_6.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/MANIFEST.MF" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fwstk.iml" beforeDir="false" afterPath="$PROJECT_DIR$/fwstk.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/commons-lang3-3.8.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/commons-text-1.6.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-io-2.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fontbox-1.8.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/jempbox-1.8.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/pdfbox-1.8.13.jar" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -15,16 +35,11 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="ComposerSettings">
-    <execution>
-      <executable />
-    </execution>
+    <execution />
   </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="fwstk" />
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -78,7 +93,6 @@
   </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
@@ -93,20 +107,22 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542740619620" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
     <property name="js.eslint.eslintPackage" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/commons-logging-1.2.jar!/" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/commons-text-1.8.jar!/" />
     <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
-    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15193799" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="configurable.group.language" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk\out\artifacts\fwstk_jar" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk\out\artifacts\fwstk_jar" />
       <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk\lib" />
+      <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk\out\artifacts\fwstk_jar" />
+    </key>
   </component>
   <component name="RunManager" selected="Application.extract texts">
     <configuration default="true" type="Applet">
@@ -245,8 +261,6 @@
       <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
       <option name="FORCE_STOP_RUNNING_APP" value="true" />
       <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
       <option name="DEBUGGER_TYPE" value="Java" />
       <Java />
       <Profilers>
@@ -262,18 +276,17 @@
     </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
       <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
       <option name="METHOD_NAME" value="" />
       <option name="CLASS_NAME" value="" />
       <option name="PACKAGE_NAME" value="" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
       <option name="EXTRA_OPTIONS" value="" />
+      <option name="INCLUDE_GRADLE_EXTRA_OPTIONS" value="true" />
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
       <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
       <option name="FORCE_STOP_RUNNING_APP" value="true" />
       <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
       <option name="DEBUGGER_TYPE" value="Java" />
       <Java />
       <Profilers>
@@ -387,18 +400,6 @@
       <item itemvalue="Application.extract layout" />
     </list>
   </component>
-  <component name="ServiceViewManager">
-    <option name="viewStates">
-      <list>
-        <serviceView>
-          <treeState>
-            <expand />
-            <select />
-          </treeState>
-        </serviceView>
-      </list>
-    </option>
-  </component>
   <component name="SvnConfiguration" cleanupOnStartRun="true">
     <configuration>C:\Users\Vincent\AppData\Roaming\Subversion</configuration>
     <supportedVersion>125</supportedVersion>
@@ -469,6 +470,7 @@
       <workItem from="1542711819188" duration="1661000" />
       <workItem from="1570806151720" duration="850000" />
       <workItem from="1575379759151" duration="1198000" />
+      <workItem from="1589879021642" duration="2421000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -553,7 +555,7 @@
     </todo-panel>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="2" />
   </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -578,6 +580,16 @@
     <MESSAGE value="wip #3135" />
     <option name="LAST_COMMIT_MESSAGE" value="wip #3135" />
   </component>
+  <component name="WindowStateProjectService">
+    <state x="666" y="321" key="FileChooserDialogImpl" timestamp="1589879749332">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state x="666" y="321" key="FileChooserDialogImpl/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@0.0.1920.1160" timestamp="1589879749332" />
+    <state x="440" y="154" key="SettingsEditor" timestamp="1589880115786">
+      <screen x="0" y="0" width="1920" height="1160" />
+    </state>
+    <state x="440" y="154" key="SettingsEditor/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@0.0.1920.1160" timestamp="1589880115786" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -593,102 +605,4 @@
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor>
-            <show-content>
-              <type id="jpa-descriptors" />
-              <type id="javaee-facet-resources" />
-              <type id="library" />
-              <type id="artifact" />
-            </show-content>
-          </artifact-editor>
-          <last-edited>fwstk:jar</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>No facets are configured</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>downloader_library</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>fwstk</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>avalon-framework-4.1.4</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/MANIFEST.MF b/fluidbook/tools/fwstk/MANIFEST.MF
index d6072f5181a9a7d6422ed0195abfcf5c14c85a95..cb74f5dcb67a0c3c2be39d225c87d57b43fb9611 100644 (file)
--- a/fluidbook/tools/fwstk/MANIFEST.MF
+++ b/fluidbook/tools/fwstk/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0\r
 Class-Path: pdfbox-1.8.16.jar fontbox-1.8.16.jar jempbox-1.8.16.jar av\r
  alon-framework-4.1.4.jar bcmail-jdk16-146.jar bcprov-jdk16-146.jar co\r
- mmons-io-2.6.jar commons-logging-1.2.jar commons-lang3-3.8.1.jar comm\r
- ons-text-1.6.jar\r
+ mmons-io-2.6.jar commons-logging-1.2.jar commons-lang3-3.10.jar commo\r
+ ns-text-1.8.jar\r
 Main-Class: com.fluidbook.fwstk.Main\r
 \r

diff --git a/fluidbook/tools/fwstk/fwstk.iml b/fluidbook/tools/fwstk/fwstk.iml
index 2792d5048af67898173054eea2a93854a306c099..b3a49f9f2fbc81671f759472e77cf55435b64abf 100644 (file)
--- a/fluidbook/tools/fwstk/fwstk.iml
+++ b/fluidbook/tools/fwstk/fwstk.iml
@@ -23,8 +23,9 @@
     <orderEntry type="library" name="fontbox-1.8.16" level="project" />
     <orderEntry type="library" name="jempbox-1.8.16" level="project" />
     <orderEntry type="library" name="pdfbox-1.8.16" level="project" />
-    <orderEntry type="library" name="commons-text-1.6" level="project" />
     <orderEntry type="library" name="commons-io-2.6" level="project" />
     <orderEntry type="library" name="commons-logging-1.2" level="project" />
+    <orderEntry type="library" name="commons-lang3-3.10" level="project" />
+    <orderEntry type="library" name="commons-text-1.8" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/lib/commons-lang3-3.10.jar b/fluidbook/tools/fwstk/lib/commons-lang3-3.10.jar
new file mode 100644 (file)
index 0000000..e51c729
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-lang3-3.10.jar differ

diff --git a/fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar b/fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar
deleted file mode 100644 (file)
index 2c65ce6..0000000
Binary files a/fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/lib/commons-text-1.6.jar b/fluidbook/tools/fwstk/lib/commons-text-1.6.jar
deleted file mode 100644 (file)
index 63e4730..0000000
Binary files a/fluidbook/tools/fwstk/lib/commons-text-1.6.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/lib/commons-text-1.8.jar b/fluidbook/tools/fwstk/lib/commons-text-1.8.jar
new file mode 100644 (file)
index 0000000..f53b392
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-text-1.8.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.4.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.4.jar
deleted file mode 100644 (file)
index 90035a4..0000000
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.4.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.6.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.6.jar
new file mode 100644 (file)
index 0000000..00556b1
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-io-2.6.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.10.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.10.jar
new file mode 100644 (file)
index 0000000..e51c729
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.10.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar
deleted file mode 100644 (file)
index 8758a96..0000000
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.1.1.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.2.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.2.jar
new file mode 100644 (file)
index 0000000..93a3b9f
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-logging-1.2.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-text-1.8.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-text-1.8.jar
new file mode 100644 (file)
index 0000000..f53b392
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-text-1.8.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.13.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.13.jar
deleted file mode 100644 (file)
index 1e8f2ac..0000000
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.13.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 80a1336b2852844307544943ce7745057f70ac85..9111447a07c5e579bda2c8c3a3d9bb91211168f2 100644 (file)
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.13.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.13.jar
deleted file mode 100644 (file)
index f88a5ab..0000000
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.13.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.13.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.13.jar
deleted file mode 100644 (file)
index 8102edb..0000000
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.13.jar and /dev/null differ

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index b3ce5600531b22fd919fc431eb90df10ba38dad8..21763d4774d77080121fe713b1f50a52c4568104 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -992,7 +992,7 @@ class wsDAOBook extends commonDAO
                 $daoDoc = new wsDAODocument($core->con);
                 $out = wsDocument::getDir($infos['document_id']);
 
-                $fwstk = new cubeCommandLine('fwstk.sh');
+                $fwstk = new CubeIT_CommandLine('fwstk.sh');
                 $fwstk->setPath(CONVERTER_PATH);
                 $fwstk->setArg('--input ' . $out . '/crop.pdf');
                 $fwstk->setArg('--extractTexts ' . $out . '%s%d.txt');
@@ -1002,6 +1002,7 @@ class wsDAOBook extends commonDAO
                 }
                 $fwstk->setArg('--threads 1');
                 $fwstk->execute();
+                $fwstk->debug();
             }
 
             CubeIT_Util_Gzip::compressIfNotCompressed($tfile);

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index ecad1145967da4e4060284682abc21625b14f311..f52fb80330df8ce1099d8a5c556673eebcb9ff51 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -222,7 +222,6 @@ class wsBookParametres extends wsParametres
         $this->forms['fs'] = array('label' => __('Plein écran'),
             'fieldsnames' => array('fullscreen', 'fullscreenAuto'));
 
-
         $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
         $this->fields['bookmarkDisablePages'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Désactiver les marques-pages sur ces pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1];
         $this->fields['bookmarkSendEnable'] = array('type' => 'boolean', 'default' => 'true', 'editable' => true, 'label' => __("Activer l'envoi des marques-pages par e-mail"));