Revize ce045025

Re #7510 kompletní import, bugfixy v parseru+preview, js na anti-spam uploadu

app/utils/TextParser.php

@@ -5 +5 @@
 
 class TextParser
 {
-    public $textFile;
+    private $textFile;
     private $objectTypes;
     private $surfaceTypes;
 
@@ -14 +14 @@
         $this->textFile = $file;
     }
 
+    /** Rozparsuje importovaný text */
     public function parseText()
     {
         $array = explode("\n", file_get_contents($this->textFile));
         $array = array_map('trim', $array);
 
+        $nextBook = true;
         $output = array();
         $currentBook = "";
         $currentChapter = "";
@@ -26 +28 @@
 
         //TODO kontrola a parsovani object types (tablet, envelope)
         foreach ($array as $value) {
-            if ($value[0] == '|' && !is_numeric($value[1])) {
+            Debugger::barDump($value);
+            if (strlen($value)==0){
+                $nextBook = true;
+            }
+            elseif ($value[0] == '|' && $nextBook) {
                 $currentBook = substr($value, 1);
                 $currentChapter = "";
                 $currentSurface = $this->transformAbbrev("obverse");
+                $nextBook = false;
             }
-            elseif ($value[0] == '|' && is_numeric($value[1])){
-                $currentChapter = substr($value, 1);
-                $currentSurface = $this->transformAbbrev("obverse");
-            }else{
+            elseif ($value[0] == '|'){
+                // TYPÍIIIIIČO ono to může být i tady... k posrání. Odděleno '-', jakože pro jistotu demence (OBTR => "15 (T.R.4020) - le.e.")
+                $withRef = explode(" - ", substr($value, 1));
+                if(isset($withRef[1])){
+                    $currentChapter = trim(substr($value, 1, strripos($value, "-")-1));
+                    $currentSurface = $this->transformAbbrev(trim($withRef[1]));
+                }else{
+                    $currentChapter = substr($value, 1);
+                    $currentSurface = $this->transformAbbrev("obverse");
+                }
+            }
+            else{
                 if (strchr($value, '$')) {
                     $output[$currentBook][$currentChapter][$currentSurface][] = trim(substr($value,0,stripos($value,"&")));
                     $currentSurface = $this->transformAbbrev(substr(strchr($value, "&"),1, -1));
@@ -47 +62 @@
         return $output;
     }
 
-    /** Nejvíc kontrola souboru*/
+    /** Nejvíc kontrola souboru, kontroluje zda soubor existuje a zda aspoň začátek souboru vyhovuje formátu */
     public function isFileParsable()
     {
         if (file_exists($this->textFile)) {
@@ -68 +83 @@
         $this->surfaceTypes = $surfaces;
     }
 
+    /** Funkce pro transformaci zkratek surfaceType na jejich příslušná idčka v db */
     private function transformAbbrev($abbrev){
         switch ($abbrev){
             case "rev.":
@@ -101 +117 @@
                 return array_search("obverse", $this->surfaceTypes);
         }
     }
+
+    public function getTextFile(){
+        return $this->textFile;
+    }
 }