Merge pull request #101 from abes-esr/develop

Merge develop dans main
abes-esr · Oct 31, 2024 · 288a58f · 288a58f
2 parents 0b60d69 + 9ba8db7
commit 288a58f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <groupId>fr.abes</groupId>
     <artifactId>sudoc</artifactId>
-    <version>0.0.12</version>
+    <version>0.0.13-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/SudocWebservicesApplication.java b/src/main/java/fr/abes/sudoc/SudocWebservicesApplication.java
@@ -1,10 +1,8 @@
 package fr.abes.sudoc;
 
-import fr.abes.cbs.process.ProcessCBS;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 
 import java.util.TimeZone;
 
@@ -21,10 +19,4 @@ public static void main(String[] args) {
     @Override
     public void run(String... args) {
     }
-
-    @Bean
-    public ProcessCBS initCbs() {
-        return new ProcessCBS();
-    }
-
 }
diff --git a/src/main/java/fr/abes/sudoc/service/SudocService.java b/src/main/java/fr/abes/sudoc/service/SudocService.java
@@ -25,33 +25,35 @@ public class SudocService {
     @Value("${sudoc.passwd}")
     private String passCbs;
 
-    @Autowired
-    private ProcessCBS cbs;
-
     @Getter
     private String query;
 
     public List<String> getPpnFromDat(Integer annee, String auteur, String titre) throws CBSException {
-        log.debug("serveur : " + this.serveurCbs + " / port : " + this.port);
-        this.cbs.authenticate(this.serveurCbs, this.port, this.loginCbs, this.passCbs);
-        if (annee != null && auteur != null) {
-            this.query = "tno t ; apu " + annee + " ; che aut " + auteur + " et mti " + titre;
-        } else if (annee != null) {
-            this.query = "tno t ; apu " + annee + " ; che mti " + titre;
-        } else {
-            if (auteur != null) {
-                this.query = "tno t ; che aut " + auteur + " et mti " + titre;
+        ProcessCBS cbs = new ProcessCBS();
+        try {
+            log.debug("serveur : " + this.serveurCbs + " / port : " + this.port);
+            cbs.authenticate(this.serveurCbs, this.port, this.loginCbs, this.passCbs);
+            if (annee != null && auteur != null) {
+                this.query = "tno t ; apu " + annee + " ; che aut " + auteur + " et mti " + titre;
+            } else if (annee != null) {
+                this.query = "tno t ; apu " + annee + " ; che mti " + titre;
             } else {
-                this.query = "tno t ; che mti " + titre;
+                if (auteur != null) {
+                    this.query = "tno t ; che aut " + auteur + " et mti " + titre;
+                } else {
+                    this.query = "tno t ; che mti " + titre;
+                }
             }
-        }
 
-        log.debug("requête : " + this.query);
-        this.cbs.search(this.query);
-        return switch (this.cbs.getNbNotices()) {
-            case 0 -> new ArrayList<>();
-            case 1 -> Collections.singletonList(this.cbs.getPpnEncours());
-            default -> Arrays.asList(this.cbs.getListePpn().toString().split(";"));
-        };
+            log.debug("requête : " + this.query);
+            cbs.search(this.query);
+            return switch (cbs.getNbNotices()) {
+                case 0 -> new ArrayList<>();
+                case 1 -> Collections.singletonList(cbs.getPpnEncours());
+                default -> Arrays.asList(cbs.getListePpn().toString().split(";"));
+            };
+        } finally {
+            cbs.disconnect();
+        }
     }
 }