Revize 42c20ae6

Re #7575 , Re #7572 Refaktoring importu/exportu

app/model/facade/TransportFacade.php

@@ -64 +64 @@
                 {
                     $bookId = $this->bookRepository->insert([BookRepository::COLUMN_BOOK_ABREV => $book])->getPrimary();
                 }
-            }
-            catch (\Exception $exception)
-            {
-                \Tracy\Debugger::log('Nepodařila se uložit nová kniha. Chyba: ' . $exception->getMessage(), 'transport-facade');
-                return FALSE;
-            }
-            foreach ($chapters as $chapter => $surfaces)
-            {
-                try
+                foreach ($chapters as $chapter => $surfaces)
                 {
                     $transliterationId = $this->getTransliterationIdCurrentBookChapter($bookId, trim(explode(" ", $chapter)[0]));
                     if (!$transliterationId)
@@ -81 +73 @@
                         if (isset($chapterReg[1]))
                         {
                             $chapterReg[1] = str_replace(array('(', ')'), '', $chapterReg[1]);
-                            $this->transliterationRepository->insert([
+                            $transliteration = $this->transliterationRepository->insert([
                                 TransliterationRepository::COLUMN_BOOK_ID => $bookId,
                                 TransliterationRepository::COLUMN_CHAPTER => $chapterReg[0],
                                 TransliterationRepository::COLUMN_REG_NO => $chapterReg[1]
                             ]);
-                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
+                            if($transliteration)
+                            {
+                                $transliterationId = $transliteration->getPrimary();
+                            }
+                            else continue;
+//                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
                         } else
                         {
-                            $this->transliterationRepository->insert([
+                            $transliteration = $this->transliterationRepository->insert([
                                 TransliterationRepository::COLUMN_BOOK_ID => $bookId,
                                 TransliterationRepository::COLUMN_CHAPTER => $chapterReg[0]
                             ]);
-                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
+                            if($transliteration)
+                            {
+                                $transliterationId = $transliteration->getPrimary();
+                            }
+                            else continue;
+//                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
                         }
                     }
-                }
-                catch (\Exception $exception)
-                {
-                    \Tracy\Debugger::log('Nepodařila se uložit nová transliterace. Chyba: ' . $exception->getMessage(), 'transport-facade');
-                    return FALSE;
-                }
-                foreach ($surfaces as $surface => $values)
-                {
-                    try
+                    foreach ($surfaces as $surface => $values)
                     {
                         $surfaceId = $this->getSurfaceIdByCurrentTransSurfType($transliterationId, $surface);
                         if (!$surfaceId)
@@ -115 +109 @@
                                 SurfaceRepository::COLUMN_OBJECT_TYPE_ID => 1
                             ])->getPrimary();
                         }
-                    }
-                    catch (\Exception $exception)
-                    {
-                        \Tracy\Debugger::log('Nepodařil se uložit nový surface. Chyba: ' . $exception->getMessage(), 'transport-facade');
-                        return FALSE;
-                    }
 
-                    foreach ($values as $line)
-                    {
-                        try
+                        foreach ($values as $line)
                         {
                             $lineId = $this->getLineIdByCurrentSurfLineNum($surfaceId, (explode(' ', $line)[0]));
                             if (!$lineId)
@@ -141 +127 @@
                                 ]);
                             }
                         }
-                        catch (\Exception $exception)
-                        {
-                            \Tracy\Debugger::log('Nepodařil se uložit nová řádka (line) transliterace. Chyba: ' . $exception->getMessage(), 'transport-facade');
-                            return FALSE;
-                        }
                     }
                 }
+            } catch (\Exception $exception)
+            {
+                \Tracy\Debugger::log($exception, 'transport-facade');
+                return FALSE;
             }
         }
         return TRUE;