Change keyword separator " " to "," + new tab

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.11.3
 
 RUN apt-get update && \
     apt-get install -y libreoffice libreoffice-writer libreoffice-calc libreoffice-impress && \

app.py

@@ -198,8 +198,8 @@ def get_spec_content(specification: str, version: str):
     document[toc[curr_index].replace("\t"," ")] = re.sub(r"\s+", " ", " ".join(text[index_toc[curr_index]+1:]))
     return document
 
-def willLower(string: str, lowered: bool):
-    return string.lower() if lowered else string
+def caseSensitive(string: str, sensitive: bool):
+    return string if sensitive else string.lower()
 
 class DocRequest(BaseModel):
     doc_id: str
@@ -454,11 +454,12 @@ def search_spec(request: KeywordRequest):
     release = request.release
     working_group = request.working_group
     spec_type = request.spec_type
-    kws = [willLower(_, booleanLowered) for _ in request.keywords.split(" ")] if request.keywords != " " else ""
+    kws = [caseSensitive(_, booleanLowered) for _ in request.keywords.split(",")]
+    print(kws)
     unique_specs = set()
     results = []
 
-    if kws == "" and search_mode == "deep":
+    if kws == [""] and search_mode == "deep":
         raise HTTPException(status_code=400, detail="You must enter keywords in deep search mode !")
 
     for string, spec in finder_spec.indexer_specs.items():
@@ -480,23 +481,23 @@ def search_spec(request: KeywordRequest):
                 docValid = not isinstance(doc, str)
 
             if request.mode == "and":
-                if all(kw in willLower(string, booleanLowered) for kw in kws):
+                if all(kw in caseSensitive(string, booleanLowered) for kw in kws):
                     put = True
                 if search_mode == "deep":
                     if docValid:
                         for chapter in list(doc.keys())[1:]:
                             if "references" not in chapter.lower() and "void" not in chapter.lower() and "annexe" not in doc[chapter].lower():
-                                if all(kw in willLower(doc[chapter], booleanLowered) for kw in kws):
+                                if all(kw in caseSensitive(doc[chapter], booleanLowered) for kw in kws):
                                     put = True
                                     contents.append(chapter)    
             elif request.mode == "or":
-                if any(kw in willLower(string, booleanLowered) for kw in kws):
+                if any(kw in caseSensitive(string, booleanLowered) for kw in kws):
                     put = True
                 if search_mode == "deep":
                     if docValid:
                         for chapter in list(doc.keys())[1:]:
-                            if "references" not in chapter.lower() or "void" not in chapter.lower() or "annexe" not in doc[chapter].lower():
-                                if any(kw in willLower(doc[chapter], booleanLowered) for kw in kws):
+                            if "references" not in chapter.lower() and "void" not in chapter.lower() and "annexe" not in doc[chapter].lower():
+                                if any(kw in caseSensitive(doc[chapter], booleanLowered) for kw in kws):
                                     put = True
                                     contents.append(chapter)  
         else:

static/script.js

@@ -123,7 +123,7 @@ keywordSearchBtn.addEventListener("click", async ()=>{
         } else if (response.status == 404) {
             showError('No specification has been found');
         } else {
-            showError('Error processing batch request')
+            showError(`Error processing keyword request: ${data.detail}`)
         }
     } catch (error) {
         showError('Error connecting to the server. Please check if the API is running.');
@@ -311,93 +311,68 @@ function displayKeywordResults(data, mode) {
 }
 
 function openSectionPopup(specId, sections) {
-  popupTitle.textContent = `Sections of specification ${specId}`;
-  
-  popupTextareas.innerHTML = '';
-  Object.entries(sections).forEach(([section, content], index) => {
-    const container = document.createElement("div");
-    container.className = "textarea-container";
-
-    const textarea = document.createElement("textarea");
-    textarea.id = `section-${index}`;
-    textarea.value = `${section}\n\n${content}`
-    textarea.readOnly = true;
-
-    const copyBtn = document.createElement('button');
-    copyBtn.className = 'copy-btn';
-    copyBtn.textContent = 'Copy';
-    copyBtn.onclick = () => copyTextarea(`section-${index}`);
-
-    container.appendChild(textarea);
-    container.appendChild(copyBtn);
-    popupTextareas.appendChild(container);
-  });
-  
-  sectionPopup.style.display = 'block';
-  document.body.style.overflow = 'hidden';
-}
+    const newTab = window.open('', '_blank');
+    let htmlContent = 
+    `
+        <!DOCTYPE html>
+        <html lang="fr">
+        <head>
+          <meta charset="UTF-8">
+          <title>Sections of specification number ${specId}</title>
+          <link rel="stylesheet" href="/static/style.css">
+          <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap">
+        </head>
+        <body>
+            <div class="popup-header">
+                <h2 id="popupTitle">Sections of specification number ${specId}</h2>
+            </div>
+            <div id="popupTextareas" class="popup-textareas">
+    `;
 
-function copyTextarea(id) {
-  const textarea = document.getElementById(id);
-  textarea.select();
-  document.execCommand("copy");
-  
-  // Effet visuel pour confirmer la copie
-  const btn = textarea.nextElementSibling;
-  const originalText = btn.textContent;
-  btn.textContent = 'Copied !';
-  btn.style.backgroundColor = '#34a853';
-  btn.style.color = 'white';
-  
-  setTimeout(() => {
-    btn.textContent = originalText;
-    btn.style.backgroundColor = '';
-    btn.style.color = '';
-  }, 1500);
-}
+    Object.entries(sections).forEach(([sectionTitle, content], index) => {
+        htmlContent += 
+        `
+            <div class="textarea-container">
+                <h2>${sectionTitle}</h2>
+                <p>${content.replace(/\n/g, '<br>')}</p>
+            </div>
+        `;
+    });
 
-// Fonction pour copier tout le contenu
-copyAllBtn.addEventListener('click', () => {
-  const textareas = popupTextareas.querySelectorAll('textarea');
-  let allContent = '';
-  
-  textareas.forEach((textarea, index) => {
-    allContent += textarea.value;
-    if (index < textareas.length - 1) {
-      allContent += '\n\n---\n\n';
-    }
-  });
-  
-  // Créer un textarea temporaire pour copier le contenu
-  const tempTextarea = document.createElement('textarea');
-  tempTextarea.value = allContent;
-  document.body.appendChild(tempTextarea);
-  tempTextarea.select();
-  document.execCommand('copy');
-  document.body.removeChild(tempTextarea);
+    htmlContent += `
+        </div>
+        </body>
+        </html>
+      `;
+
+    newTab.document.open();
+    newTab.document.write(htmlContent);
+    newTab.document.close()
+//   popupTitle.textContent = `Sections of specification ${specId}`;
   
-  // Effet visuel pour confirmer la copie
-  const originalText = copyAllBtn.textContent;
-  copyAllBtn.textContent = 'Copied all !';
+//   popupTextareas.innerHTML = '';
+//   Object.entries(sections).forEach(([section, content], index) => {
+//     const container = document.createElement("div");
+//     container.className = "textarea-container";
+
+//     const textarea = document.createElement("textarea");
+//     textarea.id = `section-${index}`;
+//     textarea.value = `${section}\n\n${content}`
+//     textarea.readOnly = true;
+
+//     const copyBtn = document.createElement('button');
+//     copyBtn.className = 'copy-btn';
+//     copyBtn.textContent = 'Copy';
+//     copyBtn.onclick = () => copyTextarea(`section-${index}`);
+
+//     container.appendChild(textarea);
+//     container.appendChild(copyBtn);
+//     popupTextareas.appendChild(container);
+//   });
   
-  setTimeout(() => {
-    copyAllBtn.textContent = originalText;
-  }, 1500);
-});
-
-// Fermer la popup
-closePopupBtn.addEventListener('click', () => {
-  sectionPopup.style.display = 'none';
-  document.body.style.overflow = ''; // Rétablir le défilement du body
-});
-
-// Fermer la popup en cliquant à l'extérieur
-window.addEventListener('click', (event) => {
-  if (event.target === sectionPopup) {
-    sectionPopup.style.display = 'none';
-    document.body.style.overflow = '';
-  }
-});
+//   sectionPopup.style.display = 'block';
+//   document.body.style.overflow = 'hidden';
+}
 
 // Display batch results
 function displayBatchResults(data) {

static/style.css

@@ -70,7 +70,6 @@
   display: flex;
   flex-direction: column;
   gap: 20px;
-  max-height: 60vh;
   overflow-y: auto;
   padding-right: 10px;
 }
@@ -81,11 +80,10 @@
   gap: 8px;
 }
 
-.textarea-container textarea {
+.textarea-container p {
   width: 100%;
-  height: 100px;
   padding: 12px 16px;
-  border: 1px solid var(--border-color);
+  border: 1px solid #ccc;
   border-radius: 4px;
   font-size: 16px;
   font-family: 'Roboto', sans-serif;
@@ -93,11 +91,6 @@
   outline: none;
 }
 
-.textarea-container textarea:focus {
-  border-color: var(--primary-color);
-  box-shadow: 0 0 0 2px rgba(26, 115, 232, 0.2);
-}
-
 .copy-btn {
   align-self: flex-end;
   background-color: var(--secondary-color);