From 18b3020c96bc43fb2b1691cb07cc6e51b2110201 Mon Sep 17 00:00:00 2001
From: Scott Berg <saberg3@wisc.edu>
Date: Wed, 21 Aug 2019 12:55:32 -0500
Subject: [PATCH] Update regex used for parsing sub requirement symbols.
---
src/app/dars/pipes/requirement-line.pipe.ts | 2 +-
src/app/dars/pipes/requirement-symbols.pipe.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/dars/pipes/requirement-line.pipe.ts b/src/app/dars/pipes/requirement-line.pipe.ts
index 03adb9b..918c295 100644
--- a/src/app/dars/pipes/requirement-line.pipe.ts
+++ b/src/app/dars/pipes/requirement-line.pipe.ts
@@ -8,7 +8,7 @@ export class RequirementLinePipe implements PipeTransform {
case 'okSubrequirementTLine':
case 'noSubrequirementTLine': {
const singleLine = lines.join(' ').trim();
- const matches = singleLine.match(/^((IP)|(IN-P)|(PL)|(R)|(<>)|\+|\-|\*)+/g);
+ const matches = singleLine.match(/^((IP)|(IN-P)|(PL)|(R)|(<>)|\+|\-|\*)+(?![a-zA-Z])/g);
if (matches && matches.length > 0) {
lines = [singleLine.substr(matches[0].length)];
diff --git a/src/app/dars/pipes/requirement-symbols.pipe.ts b/src/app/dars/pipes/requirement-symbols.pipe.ts
index d565dcb..53bbd4f 100644
--- a/src/app/dars/pipes/requirement-symbols.pipe.ts
+++ b/src/app/dars/pipes/requirement-symbols.pipe.ts
@@ -8,7 +8,7 @@ export class RequirementSymbolsPipe implements PipeTransform {
public transform(lines: string[]): AuditSymbol[] {
const singleLine = lines.join(' ').trim();
- const matches = singleLine.match(/^((IP)|(IN-P)|(PL)|(R)|(<>)|\+|\-|\*)+/g);
+ const matches = singleLine.match(/^((IP)|(IN-P)|(PL)|(R)|(<>)|\+|\-|\*)+(?![a-zA-Z])/g);
const symbols: AuditSymbol[] = this.symbols.getByTaxonomy('requirement');
if (matches && matches.length > 0) {
--
GitLab