[Import] Fix

Author: janishutz

src/ts/dataImport/importers/characterBoxes/index.ts

@@ -31,9 +31,16 @@ export const characterBoxParsers: Ref<ImportConfig<ImportCharacterBoundingBoxDto
 // TODO: Set to -1 as soon as best parser selection is implemented
 export const selectedCharacterBoxParserIndex = ref( 1 );
 
+export const currentTextLang: {
+    'lang': string
+} = {
+    'lang': 'undefined'
+};
+
 export const importBoundingBoxes = async ( boundingBoxesCSVElement: HTMLInputElement, textId: string ): Promise<{
     'characters': ImportCharacterBoundingBoxDto[],
-    'words': ImportWordBoundingBoxDto[]
+    'words': ImportWordBoundingBoxDto[],
+    'lang': string
 }> => {
     let cbb: ImportCharacterBoundingBoxDto[] = [];
 
@@ -45,6 +52,7 @@ export const importBoundingBoxes = async ( boundingBoxesCSVElement: HTMLInputEle
 
     return {
         'characters': cbb,
-        'words': generateWordBoxesFromCharacterBoxes( cbb )
+        'words': generateWordBoxesFromCharacterBoxes( cbb ),
+        'lang': currentTextLang.lang
     };
 };

src/ts/dataImport/importers/characterBoxes/multipleTextsPerFile.ts

@@ -12,6 +12,9 @@ import type {
 import type {
     ImportConfig
 } from '@/types/import';
+import {
+    currentTextLang
+} from '.';
 import {
     fileLoaderString
 } from '../../util/fileLoader';
@@ -44,6 +47,7 @@ const runParse = async ( data: string, textId: string ): Promise<ImportCharacter
         const cols = conf.lines[i]!.split( ',' );
 
         if ( cols[conf.textIndex] === textId ) {
+            currentTextLang.lang = conf.langIndex > -1 ? cols[conf.langIndex]! : 'undefined';
             const x1 = Number( cols[conf.xMinIndex] );
             const x2 = Number( cols[conf.xMaxIndex] );
             const y1 = Number( cols[conf.yMinIndex] );

src/ts/dataImport/importers/characterBoxes/preprocessor.ts

@@ -12,6 +12,11 @@ export const boundingBoxesOpts: ParserOptsList<unknown> = {
         'value': 'character',
         'input': 'string'
     },
+    'lang': {
+        'display': 'Language',
+        'value': 'lang',
+        'input': 'string'
+    },
     'xMin': {
         'display': 'Lower X Coordiante',
         'value': 'bbox_x1',
@@ -43,6 +48,7 @@ export const preprocessor = (
         .map( h => h.trim() );
     const charIndex = header.indexOf( opts.char!.value as string );
     const textIndex = opts.textID ? header.indexOf( opts.textID.value as string ) : -1;
+    const langIndex = header.indexOf( opts.lang!.value as string );
     const xMinIndex = header.indexOf( opts.xMin!.value as string );
     const xMaxIndex = header.indexOf( opts.xMax!.value as string );
     const yMinIndex = header.indexOf( opts.yMin!.value as string );
@@ -63,6 +69,7 @@ export const preprocessor = (
         lines,
         charIndex,
         textIndex,
+        langIndex,
         xMinIndex,
         xMaxIndex,
         yMinIndex,

src/ts/dataImport/importers/fixations/util.ts

@@ -116,7 +116,8 @@ export const usePointAdder = (
                 'textForeignId': Number( textId ),
                 'readerForeignId': Number( reader ),
                 'fixations': [],
-                'preAnnotations': []
+                'preAnnotations': [],
+                'language': indices.langIndex > -1 ? cols[ indices.langIndex ]! : 'undefined'
             };
         }
 

src/ts/dataImport/importers/text.ts

@@ -22,7 +22,7 @@ export const importText = async (
     return {
         'title': textName,
         'backgroundImage': uint8ArrayToBase64( await ( await loadFileFromDisk( image ) ).bytes() ),
-        'language': 'undefined', // TODO: language selection
+        'language': boundingBoxes.lang,
         'characterBoundingBoxes': boundingBoxes.characters,
         'wordBoundingBoxes': boundingBoxes.words,
         'foreignId': Number( textId )