Remove index display + change index method

app.py

@@ -4,6 +4,8 @@ import json
 import os
 import time
 import traceback
+import psycopg2
+from dotenv import load_dotenv
 import warnings
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
@@ -11,7 +13,8 @@ from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 from typing import Dict, List, Optional
-import uvicorn
+
+load_dotenv()
 
 warnings.filterwarnings("ignore")
 
@@ -53,21 +56,47 @@ class BatchDocResponse(BaseModel):
 class TsgDocFinder:
     def __init__(self):
         self.main_ftp_url = "https://www.3gpp.org/ftp"
-        self.indexer_file = "indexed_docs.json"
+        self.host = os.environ.get("PGSQL_HOST")
+        self.port = os.environ.get("PGSQL_PORT")
+        self.user = os.environ.get("PGSQL_USER")
+        self.password = os.environ.get("PGSQL_PASSWORD")
+        self.database = os.environ.get("PGSQL_DATABASE")
+        self.conn = self.connect()
         self.indexer = self.load_indexer()
+
+    def connect(self):
+        """Établit une connexion à la base de données PostgreSQL"""
+        try:
+            self.conn = psycopg2.connect(
+                host=self.host,
+                port=self.port,
+                user=self.user,
+                password=self.password,
+                dbname=self.database
+            )
+            return self.conn
+        except Exception as e:
+            print(f"Erreur de connexion à la base de données: {e}")
+            return None
         
     def load_indexer(self):
         """Load existing index if available"""
-        if os.path.exists(self.indexer_file):
-            with open(self.indexer_file, "r", encoding="utf-8") as f:
-                return json.load(f)
-        return {}
-    
-    def save_indexer(self):
-        """Save the updated index"""
-        with open(self.indexer_file, "w", encoding="utf-8") as f:
-            json.dump(self.indexer, f, indent=4, ensure_ascii=False)
+        if not self.conn:
+            self.conn = self.connect()
+            if self.conn is None:
+                raise HTTPException(status_code=500, detail="Connexion à la base de donnée impossible")
 
+        cursor = self.conn.cursor()
+        try:
+            cursor.execute("SELECT doc_id, url FROM document_position")
+            rows = cursor.fetchall()
+            doc = {doc_id: url for doc_id, url in rows}
+        except:
+            raise HTTPException(status_code=500, detail="Erreur lors de la récupération")
+        finally:
+            cursor.close()
+        return doc
+    
     def get_workgroup(self, doc):
         main_tsg = "tsg_ct" if doc[0] == "C" else "tsg_sa" if doc[0] == "S" else None
         if main_tsg is None:
@@ -97,7 +126,7 @@ class TsgDocFinder:
             print(f"Error accessing {url}: {e}")
             return []
     
-    def search_document(self, doc_id, release = None):
+    def search_document(self, doc_id: str, release = None):
         """Search for a specific document by its ID"""
         original_id = doc_id
         
@@ -105,6 +134,10 @@ class TsgDocFinder:
         if original_id in self.indexer:
             return self.indexer[original_id]
         
+        for doc in self.indexer:
+            if original_id.startswith(doc):
+                return self.indexer[doc]
+        
         # Parse the document ID
         main_tsg, workgroup, doc = self.get_workgroup(doc_id)
         if not main_tsg:
@@ -134,7 +167,6 @@ class TsgDocFinder:
                     if doc in file.lower() or original_id in file:
                         doc_url = f"{docs_url}/{file}"
                         self.indexer[original_id] = doc_url
-                        self.save_indexer()
                         return doc_url
                 
                 # Check in ZIP subfolder if it exists
@@ -147,7 +179,6 @@ class TsgDocFinder:
                         if doc in file.lower() or original_id in file:
                             doc_url = f"{zip_url}/{file}"
                             self.indexer[original_id] = doc_url
-                            self.save_indexer()
                             return doc_url
         
         return f"Document {doc_id} not found"
@@ -231,9 +262,4 @@ def find_documents_batch(request: BatchDocRequest):
         results=results,
         missing=missing,
         search_time=time.time() - start_time
-    )
-
-@app.get("/indexed", response_model=List[str])
-def get_indexed_documents():
-    finder = TsgDocFinder()
-    return list(finder.indexer.keys())
+    )

static/script.js

@@ -12,9 +12,6 @@ const resultsContainer = document.getElementById('results-container');
 const resultsList = document.getElementById('results-list');
 const resultsStats = document.getElementById('results-stats');
 const errorMessage = document.getElementById('error-message');
-const indexedDocs = document.getElementById('indexed-docs');
-const indexedCount = document.getElementById('indexed-count');
-const indexedList = document.getElementById('indexed-list');
 
 // Search mode toggle
 singleModeBtn.addEventListener('click', () => {
@@ -55,7 +52,6 @@ searchBtn.addEventListener('click', async () => {
         
         if (response.ok) {
             displaySingleResult(data);
-            loadIndexedDocuments(); // Refresh indexed docs
         } else {
             displaySingleNotFound(docId, data.detail);
         }
@@ -100,7 +96,6 @@ batchSearchBtn.addEventListener('click', async () => {
         
         if (response.ok) {
             displayBatchResults(data);
-            loadIndexedDocuments(); // Refresh indexed docs
         } else {
             showError('Error processing batch request');
         }
@@ -192,44 +187,6 @@ function displayBatchResults(data) {
     resultsContainer.style.display = 'block';
 }
 
-// Load indexed documents
-async function loadIndexedDocuments() {
-    try {
-        const response = await fetch(`/indexed`);
-        if (response.ok) {
-            const data = await response.json();
-            displayIndexedDocuments(data);
-        }
-    } catch (error) {
-        console.error('Error loading indexed documents:', error);
-    }
-}
-
-// Display indexed documents
-function displayIndexedDocuments(docIds) {
-    indexedList.innerHTML = '';
-    indexedCount.textContent = `${docIds.length} documents`;
-    
-    if (docIds.length === 0) {
-        const emptyMessage = document.createElement('p');
-        emptyMessage.textContent = 'No documents have been indexed yet.';
-        indexedList.appendChild(emptyMessage);
-        return;
-    }
-    
-    docIds.forEach(docId => {
-        const docItem = document.createElement('div');
-        docItem.className = 'indexed-item';
-        docItem.textContent = docId;
-        docItem.addEventListener('click', () => {
-            docIdInput.value = docId;
-            singleModeBtn.click();
-            searchBtn.click();
-        });
-        indexedList.appendChild(docItem);
-    });
-}
-
 // Show loader
 function showLoader() {
     loader.style.display = 'block';
@@ -256,7 +213,4 @@ docIdInput.addEventListener('keypress', (e) => {
     if (e.key === 'Enter') {
         searchBtn.click();
     }
-});
-
-// Load indexed documents on page load
-document.addEventListener('DOMContentLoaded', loadIndexedDocuments);
+});

templates/index.html

@@ -21,7 +21,7 @@
         <div class="search-container">
             <div class="search-header">
                 <h2>Find 3GPP Documents</h2>
-                <p>Enter a TSG document ID (e.g., S1-123456, C2-987654) to locate the document in the 3GPP FTP server.</p>
+                <p>Enter a TSG document ID / specification ID (e.g., S1-123456, C2-987654 or 31.102) to locate the document in the 3GPP FTP server.</p>
             </div>
 
             <div class="search-mode">
@@ -33,14 +33,14 @@
                 <div class="input-group single-input">
                     <label for="doc-id">Document ID</label>
                     <div class="input-field">
-                        <input type="text" id="doc-id" placeholder="Enter document ID (e.g., S1-123456)">
+                        <input type="text" id="doc-id" placeholder="Enter document ID or specification ID (e.g., S1-123456, 12.345)">
                         <button id="search-btn" class="btn">Search</button>
                     </div>
                 </div>
 
                 <div class="input-group batch-input">
-                    <label for="batch-ids">Document IDs (one per line)</label>
-                    <textarea id="batch-ids" placeholder="Enter document IDs, one per line (e.g., S1-123456, C2-987654)"></textarea>
+                    <label for="batch-ids">Document IDs or Specification IDs (one per line)</label>
+                    <textarea id="batch-ids" placeholder="Enter document IDs or specification IDs, one per line (e.g., S1-123456, C2-987654, 31.102)"></textarea>
                     <div class="hint">Enter one document ID per line</div>
                     <button id="batch-search-btn" class="btn" style="margin-top: 10px;">Search All</button>
                 </div>
@@ -61,14 +61,6 @@
             </div>
             <div class="results-list" id="results-list"></div>
         </div>
-
-        <div class="indexed-docs" id="indexed-docs">
-            <div class="indexed-header">
-                <h2>Indexed Documents</h2>
-                <div class="indexed-count" id="indexed-count">0 documents</div>
-            </div>
-            <div class="indexed-list" id="indexed-list"></div>
-        </div>
     </div>
 
     <footer>