Skip to content

Commit c8dce18

Browse files
committed
[Import] Improve automatic parser selection
1 parent 59d7fbd commit c8dce18

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

src/ts/dataImport/importers/annotations/normalIDs.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,8 @@ export const normalAnnotationImporter: ImportConfig<ImportPreAnnotationDto[]> =
4040
} );
4141

4242
return store;
43+
},
44+
'canParse': ( header: string[] ) => {
45+
return !header.includes( 'text_uid' );
4346
}
4447
};

src/ts/dataImport/importers/annotations/uidBasedAssignment.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,9 @@ export const uidBasedTextAnnotationImporter: ImportConfig<ImportPreAnnotationDto
6868
} );
6969

7070
return store;
71+
},
72+
'canParse': ( header: string[] ) => {
73+
// TODO: Update the canParse functions of most parsers
74+
return header.includes( 'text_uid' );
7175
}
7276
};

src/ts/dataImport/importers/fixations/multiplePerFile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const fixationsMultiplePerFileImporter: ImportConfig<ImportReadingSession
3535

3636
// used for parser selection
3737
'canParse': ( header: string[] ) => {
38-
return header.includes( 'algorithm_id' ) || header.includes( 'text_id' );
38+
return header.includes( 'reader' );
3939
}
4040
};
4141

src/ts/dataImport/importers/fixations/singlePerFile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const fixationsSingleReaderPerFileImporter: ImportConfig<ImportReadingSes
2424

2525
// used for parser selection
2626
'canParse': ( header: string[] ) => {
27-
return !header.includes( 'algorithm_id' );
27+
return !header.includes( 'reader' );
2828
},
2929
'parse': async ( inputElement: HTMLInputElement, textId: string ): Promise<ImportReadingSessionDto[]> => {
3030
if ( !inputElement.files || !inputElement.files[0] ) throw new MissingFilesError();
@@ -46,7 +46,7 @@ export const fixationsSingleReaderPerFileImporter: ImportConfig<ImportReadingSes
4646

4747
const runParse = async ( data: string, textId: string, reader: string ): Promise<ImportReadingSessionDto[]> => {
4848
const conf = preprocessor( data, fixationsSingleReaderPerFileImporter.options );
49-
const lang = fixationsSingleReaderPerFileImporter.options.language!.value;
49+
const lang = fixationsSingleReaderPerFileImporter.options.lang!.value;
5050
const points: {
5151
[reader: string]: ImportReadingSessionDto
5252
} = {};

0 commit comments

Comments
 (0)