From 475a73d5c1ce5cbf173566065bf20f018c8905b4 Mon Sep 17 00:00:00 2001
From: Radu Liviu Carjan <radu.carjan@gmail.com>
Date: Fri, 28 Oct 2022 18:40:10 +0300
Subject: [PATCH] Minor updates

---
 .../4/user/pack/registrymodifications.pack    | Bin 772 -> 1564 bytes
 .../4/user/registrymodifications.xcu          |   2 +
 app/SearchDisplace/Convertor/Convertor.php    |  44 ++++++++++++------
 .../Ingest/HandleReceivedDocument.php         |   2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/.config/libreoffice/4/user/pack/registrymodifications.pack b/.config/libreoffice/4/user/pack/registrymodifications.pack
index 0db0d5d4a9229c01ec4f80f6d3ee1d1e8f3ecab1..1a24834921ad9fc431b9687a54c5991c4a9f1756 100644
GIT binary patch
literal 1564
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
OtUfce_I?3lzSL9lQWSvz

literal 772
zcmV+f1N;0?K|@Ob0003101m?>oVw)z00QuM+U-|cZ`v>ve($e9QKhyL#Nnd0qCm9`
zp&^B>YDzb0+JhSo!K!0Nw!`J$@0eti0a-7jswP!D7~99^eBXDDFKJ!QV_uqq(oBlB
zQ*}M31R|6pCZe`8yy;cWoy*QaOG?#b24Y=8d!d`yZ#xrXk|rTC0U^g@7J@5PL~5Q_
zB?=;@jaoRl{amliXS10*t3Q~2ANWByftWtnvd4`pOlU(z2o9pN$VwJsLd~S@5Hxq!
zP<_psPcn|BAOogDr_)N5OqOc|jiK%In9}At70z-@CT(Y&YINS3Ql3I*Ou2>@$vQ1!
z7h_}N?kD_EL$J{3r^h&S8Rar6Kw?z-k3f9PZHn1pAqhZDacDpVjX)8fYSWXc7zGJ%
z{%Hc?JyymxS`d|Cuz_#cGm8YL?LSODhN*Cjvx1KJIvbF<#o`VY%Yf@qEvL?F@mvq&
zX9)jKhBAuKJ<>A<Tbn5%N3g~t6*9SBD<uU9r*_k95=K`(Oo10vU9H+UYn<0l8)ut{
zH~e&AOjB+?Q!(P83cQ6fc6BOT+`-D_841@`e!gro#s;a}YK`^QX67)w_6wpP9%E0X
zil30fV;dcmU3OxTY~{m-E+W~JDyGIfkLDGpOx(cyVf7<yS9WWBb6CHdXBEvYgPA7Z
zm>9{~j*1Bq&P+DzJ)v%HnPzt!b}LZAqr52?Z#(wXa!3(HJpELc8oKjbRDGmXycOp<
z--#>PZ>!~6*?U?hGopc^=D8GJS^Mg{_HU+r?Oppf)4u+${l2uv`yx$<U-iChbClAT
zAuZCdvwZ%%@NJTX%@R*~G&E8%&^xV~+4SPa(H~c(!Q0WbS7cX)X$-;~{oKW1=_2=#
zY5KunR_;;*x`3Bg_R8m;S3dQ;i|U2#;qPJ(M0Y%>@GXr`eq74#7?$^9`Rwa=3y?Lu
z<Buuhqh|f&Rp4af*I)%UeQ~8^q(JNae`Nd}MxM34$i(4bVDthEWc5ATIrs&iy)Q_7
CLV2M8

diff --git a/.config/libreoffice/4/user/registrymodifications.xcu b/.config/libreoffice/4/user/registrymodifications.xcu
index 7603942..e75ca56 100644
--- a/.config/libreoffice/4/user/registrymodifications.xcu
+++ b/.config/libreoffice/4/user/registrymodifications.xcu
@@ -10,7 +10,9 @@
 <item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="SplitWindow2" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="UserItem" oor:op="fuse" oor:type="xs:string"><value>V1,2,0</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
 <item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="SplitWindow3" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="UserItem" oor:op="fuse" oor:type="xs:string"><value>V1,2,0</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
 <item oor:path="/org.openoffice.Setup/L10N"><prop oor:name="ooLocale" oor:op="fuse"><value>en-US</value></prop></item>
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.drawing.DrawingDocument']"><prop oor:name="ooSetupFactoryWindowAttributes" oor:op="fuse"><value>0,0,800,600;1;0,0,0,0;</value></prop></item>
 <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryWindowAttributes" oor:op="fuse"><value>0,0,800,600;1;0,0,0,0;</value></prop></item>
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.WebDocument']"><prop oor:name="ooSetupFactoryWindowAttributes" oor:op="fuse"><value>0,0,800,600;1;0,0,0,0;</value></prop></item>
 <item oor:path="/org.openoffice.Setup/Office"><prop oor:name="LastCompatibilityCheckID" oor:op="fuse"><value>40(Build:3)</value></prop></item>
 <item oor:path="/org.openoffice.Setup/Office"><prop oor:name="OfficeRestartInProgress" oor:op="fuse"><value>true</value></prop></item>
 <item oor:path="/org.openoffice.Setup/Office"><prop oor:name="ooSetupInstCompleted" oor:op="fuse"><value>true</value></prop></item>
diff --git a/app/SearchDisplace/Convertor/Convertor.php b/app/SearchDisplace/Convertor/Convertor.php
index b59688a..763a46a 100644
--- a/app/SearchDisplace/Convertor/Convertor.php
+++ b/app/SearchDisplace/Convertor/Convertor.php
@@ -21,6 +21,7 @@ class Convertor {
     public static function convert($to, $document, $tmp = false)
     {
         $path = pathinfo($document);
+        $extension = $path['extension'];
         $dir = $path['dirname'];
         $original = $dir . '/' . $path['basename'];
         if(!$tmp) {
@@ -29,6 +30,15 @@ class Convertor {
             $folder = storage_path('app/tmp/');
         }
 
+        $env = [
+            'HOME' => base_path()
+        ];
+
+        if ($extension == 'odt') {
+            $to = $to . ':"$FILTER"';
+            $env['FILTER'] = 'OpenDocument Text Flat XML';
+        }
+
         Log::info('Running `soffice` to convert "' . $original . '" to "' . $to . '". Output folder: "' . $folder . '"');
         Log::info(
             'COMMAND: ' .
@@ -41,20 +51,28 @@ class Convertor {
         );
 
 
-        $process = new Process(
-            [
-                'soffice',
-                '--convert-to',
-                $to,
-                $original,
-                '--outdir',
-                $folder
-            ], base_path(),
-            [
-                'HOME' => base_path()
-            ]
+        // $process = new Process(
+        //     [
+        //         'soffice',
+        //         '--convert-to',
+        //         $to,
+        //         $original,
+        //         '--outdir',
+        //         $folder
+        //     ], base_path(),
+        //     [
+        //         'HOME' => base_path(),
+        //         'FILTER' => 'OpenDocument Text Flat XML'
+        //     ]
+        // );
+        $process = Process::fromShellCommandline(
+            "soffice --convert-to $to $original --outdir $folder",
+            base_path(),
+            $env
         );
-        $process->run();
+        $process->run(null, $env);
+
+        Log::info("OUTPUT: " . $process->getOutput());
 
         if (!$process->isSuccessful()) {
             throw new ProcessFailedException($process);
diff --git a/app/SearchDisplace/Ingest/HandleReceivedDocument.php b/app/SearchDisplace/Ingest/HandleReceivedDocument.php
index 3ce8630..5e0b977 100644
--- a/app/SearchDisplace/Ingest/HandleReceivedDocument.php
+++ b/app/SearchDisplace/Ingest/HandleReceivedDocument.php
@@ -77,7 +77,7 @@ class HandleReceivedDocument
             // HTML document cannot be converted directly to xml. So we convert to ODT first, then to XML
             Convertor::convert('odt', $this->storage->path("$dir/$fileName"));
             Convertor::convert('xml', $this->storage->path("$dir/$intermediateFileName"));
-            $this->storage->delete("$dir/$intermediateFileName");
+            // $this->storage->delete("$dir/$intermediateFileName");
 
             foreach ($this->content['images'] as $image) {
                 $name = $image['name'];