Merge pull request #102 from abes-esr/test

[bug] recherche avec ou sans accents
abes-esr · Jun 26, 2024 · 81598ed · 81598ed
2 parents a991185 + 2d16e94
commit 81598ed
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/build-test-pubtodockerhub.yml b/.github/workflows/build-test-pubtodockerhub.yml
@@ -35,11 +35,11 @@ jobs:
         with:
           images: ${{ env.DOCKERHUB_IMAGE_PREFIX }}
       - name: "Push: login to DockerHub"
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' ||  startsWith(github.ref, 'refs/tags/'))
+        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test' || github.ref == 'refs/heads/develop' ||  startsWith(github.ref, 'refs/tags/'))
         run: |
           echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
       - name: "Push: push docker image"
-        if: github.event_name != 'pull_request'  && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/'))
+        if: github.event_name != 'pull_request'  && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/'))
         run: |
           DOCKER_TAGS="${{ steps.docker_tag_meta.outputs.tags }}"
           for DOCKER_TAG in $DOCKER_TAGS

diff --git a/src/main/resources/indexs/theses.json b/src/main/resources/indexs/theses.json
@@ -236,7 +236,8 @@
         }
       },
       "auteursPN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "auteursPpn": {
         "type": "text"
@@ -256,10 +257,12 @@
         }
       },
       "directeursNP": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "directeursPN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "directeursPpn": {
         "type": "text"
@@ -279,10 +282,12 @@
         }
       },
       "presidentJuryNP": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "presidentJuryPN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "presidentJuryPpn": {
         "type": "text"
@@ -302,10 +307,12 @@
         }
       },
       "membresJuryNP": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "membresJuryPN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "membresJuryPpn": {
         "type": "text"
@@ -325,10 +332,12 @@
         }
       },
       "rapporteursNP": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "rapporteursPN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "rapporteursPpn": {
         "type": "text"
@@ -349,6 +358,7 @@
       },
       "etabSoutenanceN": {
         "type": "text",
+        "analyzer": "francais",
         "fields": {
           "exact": {
             "type": "keyword"
@@ -370,7 +380,8 @@
         "type": "text"
       },
       "etabsCotutelleN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "ecolesDoctorales": {
         "type": "nested",
@@ -388,6 +399,7 @@
       },
       "ecolesDoctoralesN": {
         "type": "text",
+        "analyzer": "francais",
         "fields": {
           "exact": {
             "type": "keyword"
@@ -412,7 +424,8 @@
         "type": "text"
       },
       "partenairesRechercheN": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "sujetsRameau" : {
         "type": "nested",
@@ -430,7 +443,8 @@
         "type": "text"
       },
       "sujetsRameauLibelle": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "sujets": {
         "type": "nested",
@@ -445,7 +459,8 @@
         }
       },
       "sujetsLibelle": {
-        "type": "text"
+        "type": "text",
+        "analyzer": "francais"
       },
       "oaiSetNames": {
         "type": "keyword"