moveEntryOverwriteTarget debugged

SourcePot · Nov 4, 2024 · 08db4c5 · 08db4c5
1 parent a757387
commit 08db4c5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 69 deletions.
diff --git a/src/php/AdminApps/Settings.php b/src/php/AdminApps/Settings.php
@@ -90,10 +90,12 @@ public function run(array|bool $arr=TRUE):array{
     private function settingsOverviewHtml():string
     {
         $template=array();
-        $template['Logger']=array('selector'=>array('app'=>__CLASS__,'Source'=>'logger'),'description'=>'Here you find all the logs.');
+        $template['Logger']=array('selector'=>array('app'=>__CLASS__,'Source'=>'logger'),'description'=>'Here you will find all the logs.');
         $template['Logger errors']=array('selector'=>array('app'=>__CLASS__,'Source'=>'logger','Group'=>'error'),'description'=>'Error logs can be found here.');
         $template['Job processing timimg']=array('selector'=>array('app'=>__CLASS__,'Source'=>'settings','Group'=>'Job processing','Folder'=>'All jobs','Name'=>'Timing'),'description'=>'Here you can access the timing of the job processing. Use "&#9998;" (Edit) &rarr; Content to change the timing of a specific job');
         $template['Entry presentation']=array('selector'=>array('app'=>__CLASS__,'Source'=>'settings','Group'=>'Presentation'),'description'=>'Here you can adjust the entry presentation which is based on the Class and Method used to present the entry. The method presemnting an entry is typically run() or for javascript calls presentEntry().');
+        $template['Definitions']=array('selector'=>array('app'=>__CLASS__,'Source'=>'definitions','Group'=>'Templates'),'description'=>'Here you can adjust the entry definitions.');
+        $template['Remote client definitions']=array('selector'=>array('app'=>__CLASS__,'Source'=>'remoteclient','EntryId'=>'%_definition'),'description'=>'Here you can delete the remote client definitions. It will be renewed when the client is connected');
         // create html
         $matrix=array();
         foreach($template as $key=>$def){

diff --git a/src/php/Foundation/DataExplorer.php b/src/php/Foundation/DataExplorer.php
@@ -41,50 +41,18 @@ class DataExplorer{
                                               ),
                             );
 
-    private $tags=array('run'=>array('tag'=>'button','element-content'=>'&#10006;','keep-element-content'=>TRUE,'style'=>array('font-size'=>'24px','color'=>'#fff;','background-color'=>'#0a0'),'showEditMode'=>TRUE,'type'=>'Cntr','Read'=>'ALL_CONTENTADMIN_R','title'=>'Close canvas editor'),
-                        'edit'=>array('tag'=>'button','element-content'=>'&#9998;','keep-element-content'=>TRUE,'style'=>array('font-size'=>'24px','color'=>'#fff','background-color'=>'#a00'),'showEditMode'=>FALSE,'type'=>'Cntr','Read'=>'ALL_CONTENTADMIN_R','title'=>'Edit canvas'),
+    private $tags=array('run'=>array('tag'=>'button','element-content'=>'&#10006;','keep-element-content'=>TRUE,'style'=>array('font-size'=>'24px','color'=>'#fff;','background-color'=>'#0a0'),'showEditMode'=>TRUE,'type'=>'Control','Read'=>'ALL_CONTENTADMIN_R','title'=>'Close canvas editor'),
+                        'edit'=>array('tag'=>'button','element-content'=>'&#9998;','keep-element-content'=>TRUE,'style'=>array('font-size'=>'24px','color'=>'#fff','background-color'=>'#a00'),'showEditMode'=>FALSE,'type'=>'Control','Read'=>'ALL_CONTENTADMIN_R','title'=>'Edit canvas'),
                         '&#9881;'=>array('tag'=>'button','element-content'=>'&#9881;','keep-element-content'=>TRUE,'class'=>'canvas-processor','showEditMode'=>TRUE,'type'=>'Elements','Read'=>'ALL_CONTENTADMIN_R','title'=>'Step processing'),
                         'Select'=>array('tag'=>'button','element-content'=>'Select','keep-element-content'=>TRUE,'class'=>'canvas-std','showEditMode'=>TRUE,'type'=>'Elements','Read'=>'ALL_CONTENTADMIN_R','title'=>'Database view'),
                         'Text'=>array('tag'=>'div','element-content'=>'Text','keep-element-content'=>TRUE,'class'=>'canvas-text','showEditMode'=>TRUE,'type'=>'Elements','Read'=>'ALL_CONTENTADMIN_R','title'=>'Text box'),
-                        //
-                        '&#11104;'=>array('tag'=>'div','element-content'=>'&#11104;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11105;'=>array('tag'=>'div','element-content'=>'&#11105;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11106;'=>array('tag'=>'div','element-content'=>'&#11106;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11107;'=>array('tag'=>'div','element-content'=>'&#11107;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11108;'=>array('tag'=>'div','element-content'=>'&#11108;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11109;'=>array('tag'=>'div','element-content'=>'&#11109;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11110;'=>array('tag'=>'div','element-content'=>'&#11110;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11111;'=>array('tag'=>'div','element-content'=>'&#11111;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11112;'=>array('tag'=>'div','element-content'=>'&#11112;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11113;'=>array('tag'=>'div','element-content'=>'&#11113;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11114;'=>array('tag'=>'div','element-content'=>'&#11114;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11115;'=>array('tag'=>'div','element-content'=>'&#11115;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11116;'=>array('tag'=>'div','element-content'=>'&#11116;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11117;'=>array('tag'=>'div','element-content'=>'&#11117;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#10137'=>array('tag'=>'div','element-content'=>'&#10137','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#10154'=>array('tag'=>'div','element-content'=>'&#10154','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#10140'=>array('tag'=>'div','element-content'=>'&#10140','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Connectors','Read'=>'ALL_CONTENTADMIN_R'),
-                        //
-                        '&#11168;'=>array('tag'=>'div','element-content'=>'&#11168;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11169;'=>array('tag'=>'div','element-content'=>'&#11169;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11170;'=>array('tag'=>'div','element-content'=>'&#11170;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11171;'=>array('tag'=>'div','element-content'=>'&#11171;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11172;'=>array('tag'=>'div','element-content'=>'&#11172;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11173;'=>array('tag'=>'div','element-content'=>'&#11173;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11174;'=>array('tag'=>'div','element-content'=>'&#11174;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11175;'=>array('tag'=>'div','element-content'=>'&#11175;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '|'=>array('tag'=>'div','element-content'=>'|','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9601'=>array('tag'=>'div','element-content'=>'&#9601','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9675'=>array('tag'=>'div','element-content'=>'&#9675','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9679'=>array('tag'=>'div','element-content'=>'&#9679','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9711'=>array('tag'=>'div','element-content'=>'&#9711','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9476'=>array('tag'=>'div','element-content'=>'&#9476','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9482'=>array('tag'=>'div','element-content'=>'&#9482','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9552'=>array('tag'=>'div','element-content'=>'&#9552','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#9553'=>array('tag'=>'div','element-content'=>'&#9553','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
-                        '&#11197;'=>array('tag'=>'div','element-content'=>'&#11197;','keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>'Misc','Read'=>'ALL_CONTENTADMIN_R'),
                         );
 
+    private $graphicElemnts=array('Connectors'=>array('&VerticalSeparator;','&xlarr;','&xrarr;','&xharr;','&larr;','&uarr;','&rarr;','&darr;','&harr;','&varr;','&nwarr;','&nearr;','&searr;','&swarr;','&larrhk;','&rarrhk;','&#8634;','&#8635;','&duarr;','&#10140;'),
+                                  'Symbols'=>array('&sung;','&hearts;','&diams;','&clubs;','&sharp;','&#9850;','&#9873;','&#9888;','&#9885;','&#9986;','&#9992;','&#9993;','&#9998;','&#10004;','&#x2718;','&#10010;','&#10065;','&#10070;'),
+                                  'Math'=>array('&empty;','&nabla;','&nexist;','&ni;','&isin;','&notin;','&sum;','&prod;','&coprod;','&compfn;','&radic;','&prop;','&infin;','&angrt;','&angmsd;','&cap;','&int;','&asymp;','&Lt;','&Gt;','&Ll;','&Gg;','&equiv;'),
+                                  );
+
     private $processorOptions=array();
 
     public function __construct(array $oc)
@@ -102,6 +70,11 @@ public function __construct(array $oc)
     public function init()
     {
         $this->entryTemplate=$this->oc['SourcePot\Datapool\Foundation\Database']->getEntryTemplateCreateTable($this->entryTable,__CLASS__);
+        foreach($this->graphicElemnts as $category=>$htmlEntities){
+            foreach($htmlEntities as $htmlEntity){
+                $this->tags[$htmlEntity]=array('tag'=>'div','element-content'=>$htmlEntity,'keep-element-content'=>TRUE,'class'=>'canvas-symbol','showEditMode'=>TRUE,'type'=>$category,'Read'=>'ALL_CONTENTADMIN_R');
+            }
+        }
         $this->completeDefintion();
     }
 
@@ -277,7 +250,9 @@ private function getCntrHtml(string $callingClass):array
             $matrix[$tag['type']]['Btn'].=$this->oc['SourcePot\Datapool\Foundation\Element']->element($btn);
         }
         $htmlArr=array('cntr'=>'','processor'=>'');
-        $htmlArr['cntr']=$this->oc['SourcePot\Datapool\Tools\HTMLbuilder']->table(array('matrix'=>$matrix,'keep-element-content'=>TRUE,'hideHeader'=>TRUE,'caption'=>'Canvas'));
+        $tableArr=array('matrix'=>$matrix,'keep-element-content'=>TRUE,'hideHeader'=>TRUE,'caption'=>'Canvas');
+        if ($isEditMode){$tableArr['style']=array('min-width'=>'550px');}
+        $htmlArr['cntr']=$this->oc['SourcePot\Datapool\Tools\HTMLbuilder']->table($tableArr);
         $selectedCanvasElement=$this->oc['SourcePot\Datapool\Tools\NetworkTools']->getPageStateByKey(__CLASS__,'selectedCanvasElement');
         $canvasElement=$this->oc['SourcePot\Datapool\Foundation\Database']->entryById($selectedCanvasElement);
         if ($isEditMode){

diff --git a/src/php/Foundation/Database.php b/src/php/Foundation/Database.php
@@ -942,43 +942,37 @@ public function moveEntryOverwriteTarget($sourceEntry,$targetSelector,$isSystemC
                 }
             } else {
                 // move or copy attached file to target
-                $fileRenameSuccess=TRUE;
+                $context['fileError']=FALSE;
                 $sourceFile=$this->oc['SourcePot\Datapool\Foundation\Filespace']->selector2file($sourceEntry);
                 $targetFile=$this->oc['SourcePot\Datapool\Foundation\Filespace']->selector2file($targetEntry);
                 if (is_file($sourceFile) && !$isTestRun){
-                    if ($keepSource){
-                        $fileRenameSuccess=@copy($sourceFile,$targetFile);
-                        $context['copyAttachedFile']=TRUE;
-                    } else {
-                        $fileRenameSuccess=@rename($sourceFile,$targetFile);
-                        $context['movedAttachedFile']=TRUE;
+                    try{
+                        $this->oc['SourcePot\Datapool\Foundation\Filespace']->addStatistic('inserted files',intval(copy($sourceFile,$targetFile)));
+                    } catch(\Exception $e){
+                        $context['fileError']=$e->getMessage();
                     }
                 }
-                // create target entry
-                if ($fileRenameSuccess){
-                    if (!$isTestRun){
-                        if (!$keepSource){
-                            $this->deleteEntries(array('Source'=>$sourceEntry['Source'],'EntryId'=>$sourceEntry['EntryId']),$isSystemCall);
-                        }
-                        $targetEntry=$this->updateEntry($targetEntry,$isSystemCall,FALSE,FALSE,$targetFile);
-                        $context['attachedFileProcessed']=TRUE;
-                    }            
+                // update entry and delete source file if source is not kept
+                if ($isTestRun){
+                    $targetEntry=$sourceEntry;
+                } else if ($context['fileError']){
+                    $context['Name']=$targetEntry['Name'];
+                    $context['sourceFile']=$sourceFile;
+                    $context['action']=($keepSource)?'to copy':'to move';
+                    $this->oc['logger']->log('notice','Failed {action} file "{sourceFile}" with "{fileError}". The entry "{Name}" was not updated.',$context);     
                 } else {
-                    // copying or renaming of attached file failed
-                    if ($isTestRun){
-                        $targetEntry=$sourceEntry;
+                    $targetEntry=$this->updateEntry($targetEntry,$isSystemCall);
+                    if ($keepSource){
+                        $context['copyAttachedFile']=TRUE;
                     } else {
-                        $targetEntry=$this->updateEntry($sourceEntry,$isSystemCall);
+                        $context['movedAttachedFile']=TRUE;
+                        $this->deleteEntries(array('Source'=>$sourceEntry['Source'],'EntryId'=>$sourceEntry['EntryId']),$isSystemCall);
                     }
                 }
             }
         } else {
             // no write access
-            if ($isTestRun){
-                $targetEntry=$sourceEntry;
-            } else {
-                $targetEntry=$this->updateEntry($sourceEntry,TRUE);
-            }
+            $targetEntry=$sourceEntry;
             $context['noWriteAccess']=TRUE;
         }
         $targetEntry[__FUNCTION__]=$context;

diff --git a/src/php/Tools/FileContent.php b/src/php/Tools/FileContent.php
@@ -39,8 +39,10 @@ public function enrichEntry(array $entry):array
         if (isset($entry['Date'])){
             $pageTimeZone=$this->oc['SourcePot\Datapool\Foundation\Backbone']->getSettings('pageTimeZone');
             $dateWebPageTimeZone=\DateTime::createFromFormat('Y-m-d H:i:s',$entry['Date'],new \DateTimeZone(\SourcePot\Datapool\Root::DB_TIMEZONE));
-            $dateWebPageTimeZone->setTimeZone(new \DateTimeZone($pageTimeZone));
-            $entry['Date ('.$pageTimeZone.')']=$dateWebPageTimeZone->format('Y-m-d H:i:s');
+            if ($dateWebPageTimeZone){
+                $dateWebPageTimeZone->setTimeZone(new \DateTimeZone($pageTimeZone));
+                $entry['Date ('.$pageTimeZone.')']=$dateWebPageTimeZone->format('Y-m-d H:i:s');
+            }
         }
         $entry['currentUserId']=$currentUser['EntryId'];
         $entry['currentUser']=$currentUser['Content']['Contact details']['First name'].' '.$currentUser['Content']['Contact details']['Family name'];

diff --git a/src/php/Tools/PdfTools.php b/src/php/Tools/PdfTools.php
@@ -152,9 +152,9 @@ public function attachments2arrSmalot($file,array $entry=array()):array
 
         $pdfParser= new \Smalot\PdfParser\Parser();
         $pdfContent=$pdfContent = file_get_contents($file);
-        $pdfParsed = $pdfParser->parseContent($pdfContent);
         try {
             $context['attachmentsFailed']=array();
+            $pdfParsed = $pdfParser->parseContent($pdfContent);
             $filespecIndex=0;
             $filespecs = $pdfParsed->getObjectsByType('Filespec');
             foreach ($filespecs as $filespec){