File tree Expand file tree Collapse file tree 2 files changed +4
-1
lines changed
main/java/ru/mystamps/web/feature/series/importing
test/groovy/ru/mystamps/web/feature/series/importing Expand file tree Collapse file tree 2 files changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ public class SeriesInfoExtractorServiceImpl implements SeriesInfoExtractorServic
56
56
57
57
// Regular expression matches number of the stamps in a series (from 1 to 99).
58
58
private static final Pattern NUMBER_OF_STAMPS_REGEXP = Pattern .compile (
59
- "(?<quantity>[1-9][0-9]?)( (беззубцовые|зубцовых)) ? (мар(ок|ки )|блок(а|ов))" ,
59
+ "(?<quantity>[1-9][0-9]?)( ((без)?зубцов(ая|ы[ех]))) ? (мар(ок|к[аи] )|блок(а|ов)? )" ,
60
60
Pattern .CASE_INSENSITIVE | Pattern .UNICODE_CASE
61
61
);
62
62
Original file line number Diff line number Diff line change @@ -388,12 +388,15 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
388
388
service. extractQuantity(fragment) == expectedQuantity
389
389
where :
390
390
fragment || expectedQuantity
391
+ ' 1 марка' || 1
391
392
' 5 марок' || 5
392
393
' 5 МАРОК' || 5
393
394
' 22 марки' || 22
394
395
' 13 беззубцовые марок' || 13
396
+ ' 1 беззубцовая марка' || 1
395
397
' 4 беззубцовые марки' || 4
396
398
' 32 БЕЗЗУБЦОВЫЕ МАРКИ' || 32
399
+ ' 1 блок' || 1
397
400
' 4 блока' || 4
398
401
' 6 блоков' || 6
399
402
' 6 зубцовых блоков' || 6
You can’t perform that action at this time.
0 commit comments