Merge pull request #40 from abes-esr/develop

merge develop dans main
abes-esr · May 7, 2024 · e9ac981 · e9ac981
2 parents ab6f206 + 60be05a
commit e9ac981
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/fr/abes/cbs/commandes/Commandes.java b/src/main/java/fr/abes/cbs/commandes/Commandes.java
@@ -191,9 +191,10 @@ public String translitererSansPPN(final String notice) throws CBSException, IOEx
     public String rel(String lotEncours) throws CBSException, IOException {
         String query = new StringBuilder().append(Constants.VTI1).append(Constants.STR_1D).append(Constants.VSE).append(lotEncours)
                 .append(Constants.STR_1D).append(Constants.VPRUNM).append(Constants.STR_1D).append(Constants.VT1).append(Constants.STR_1D)
-                .append(Constants.VTAFR).append(Constants.STR_1D).append(Constants.VCUTF8).append(Constants.STR_1D).append("CUSrel").toString();
+                .append(Constants.VTAFR).append(Constants.STR_1D).append(Constants.VCUTF8).append(Constants.STR_1D).append("CUSrel ; aff k").toString();
         return connector.tcpReq(query);
     }
+
     /**
      * Suppression d'une notice
      *

diff --git a/src/test/java/fr/abes/cbs/CommandesTest.java b/src/test/java/fr/abes/cbs/CommandesTest.java
@@ -12,13 +12,12 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.io.BufferedWriter;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Scanner;
+import java.util.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -409,5 +408,6 @@ String noticeTestEnEdition() throws CBSException, IOException {
         cmd.affUnma();
         return cmd.editer("1");
     }
+
 }
 
diff --git a/src/test/java/fr/abes/cbs/notices/BiblioTest.java b/src/test/java/fr/abes/cbs/notices/BiblioTest.java
@@ -643,6 +643,7 @@ void testZones6XXet7XX() throws Exception {
                         "604 ##$3269292918$x604x$2rameau\r" +
                         "605 ##$3269292683$m605m$x605x$2rameau\r" +
                         "605 ##$a@605a$h605h$h605h-2$i605i-2$k605k$m605m$x605x$2rameau\r" +
+                        "606 ##$1FRBNF029949904$aPersonnel de la petite enfance$1FRBNF027792110$xPratique$2rameau\r" +
                         "607 ##$3277194156$z607z$2rameau\r" +
                         "607 ##$3277194156$3269292721$x607x$y607y$z607z$2rameau\r" +
                         "607 ##$a607a$x607x$z607z$2rameau\r" +
@@ -679,6 +680,7 @@ void testZones6XXet7XX() throws Exception {
                 "604 ##$3269292918$x604x$2rameau\r" +
                 "605 ##$3269292683$m605m$x605x$2rameau\r" +
                 "605 ##$a@605a$h605h$h605h-2$i605i-2$k605k$m605m$x605x$2rameau\r" +
+                "606 ##$1FRBNF029949904$aPersonnel de la petite enfance$1FRBNF027792110$xPratique$2rameau\r" +
                 "607 ##$3277194156$z607z$2rameau\r" +
                 "607 ##$3277194156$3269292721$x607x$y607y$z607z$2rameau\r" +
                 "607 ##$a607a$x607x$z607z$2rameau\r" +