Merge pull request #79 from abes-esr/develop

merge dev to test
abes-esr · Mar 22, 2024 · eb92357 · eb92357
2 parents 5554870 + 6bb076a
commit eb92357
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <groupId>fr.abes</groupId>
     <artifactId>sudoc</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>sudoc</name>
     <description>webservices de récupération de ppns dans le sudoc</description>

diff --git a/src/main/java/fr/abes/sudoc/service/IsbnService.java b/src/main/java/fr/abes/sudoc/service/IsbnService.java
@@ -21,7 +21,7 @@ public IsbnService(BaseXmlFunctionsCaller caller) {
 
     @Override
     public boolean checkFormat(String isbn) {
-        return isbn != null && isbn.matches("^[0-9]((?:-?[0-9]){9}|(?:-?[0-9]){12})$");
+        return isbn != null && isbn.matches("^[0-9]((?:-?[0-9]){9}|(?:-?[0-9]){8}X|(?:-?[0-9]){12})$");
     }
 
     @Override

diff --git a/src/test/java/fr/abes/sudoc/service/IsbnServiceTest.java b/src/test/java/fr/abes/sudoc/service/IsbnServiceTest.java
@@ -58,6 +58,9 @@ void checkFormatIsbn10Characters() {
 
         String isbn6 = "-22225-555---3--1";
         Assertions.assertFalse(isbnService.checkFormat(isbn6));
+
+        String isbn7 = "274758450X";
+        Assertions.assertTrue(isbnService.checkFormat(isbn7));
     }
 
     @Test