Fix filter
Browse files- app.py +7 -4
- static/script.js +8 -2
app.py
CHANGED
@@ -226,7 +226,7 @@ class KeywordRequest(BaseModel):
|
|
226 |
search_mode: Literal["quick", "deep"]
|
227 |
case_sensitive: Optional[bool] = False
|
228 |
release: Optional[str] = None
|
229 |
-
|
230 |
spec_type: Optional[Literal["TS", "TR"]] = None
|
231 |
mode: Optional[Literal["and", "or"]] = "and"
|
232 |
|
@@ -460,16 +460,19 @@ def search_spec(request: KeywordRequest):
|
|
460 |
continue
|
461 |
|
462 |
release = request.release
|
463 |
-
working_group = request.
|
464 |
spec_type = request.spec_type
|
465 |
search_mode = request.search_mode
|
466 |
|
467 |
if spec.get('version', None) is None or (release is not None and spec["version"].split(".")[0] != str(release)):
|
468 |
continue
|
469 |
-
if spec.get('
|
470 |
continue
|
471 |
-
if
|
472 |
continue
|
|
|
|
|
|
|
473 |
|
474 |
contents = []
|
475 |
version = finder_spec.search_document(spec['id'], spec['release']).split("/")[-1].replace(".zip", "").split("-")[-1]
|
|
|
226 |
search_mode: Literal["quick", "deep"]
|
227 |
case_sensitive: Optional[bool] = False
|
228 |
release: Optional[str] = None
|
229 |
+
working_group: Optional[str] = None
|
230 |
spec_type: Optional[Literal["TS", "TR"]] = None
|
231 |
mode: Optional[Literal["and", "or"]] = "and"
|
232 |
|
|
|
460 |
continue
|
461 |
|
462 |
release = request.release
|
463 |
+
working_group = request.working_group
|
464 |
spec_type = request.spec_type
|
465 |
search_mode = request.search_mode
|
466 |
|
467 |
if spec.get('version', None) is None or (release is not None and spec["version"].split(".")[0] != str(release)):
|
468 |
continue
|
469 |
+
if spec.get('type', None) is None or (spec_type is not None and spec["type"] != spec_type):
|
470 |
continue
|
471 |
+
if spec.get('working_group', None) is None or (working_group is not None and spec["working_group"] != working_group):
|
472 |
continue
|
473 |
+
|
474 |
+
if not spec["working_group"] != working_group:
|
475 |
+
print(spec["working_group"], working_group, spec["working_group"] != working_group)
|
476 |
|
477 |
contents = []
|
478 |
version = finder_spec.search_document(spec['id'], spec['release']).split("/")[-1].replace(".zip", "").split("-")[-1]
|
static/script.js
CHANGED
@@ -120,8 +120,10 @@ keywordSearchBtn.addEventListener("click", async ()=>{
|
|
120 |
const data = await response.json();
|
121 |
if (response.ok){
|
122 |
displayKeywordResults(data, search);
|
|
|
|
|
123 |
} else {
|
124 |
-
showError('Error processing batch request')
|
125 |
}
|
126 |
} catch (error) {
|
127 |
showError('Error connecting to the server. Please check if the API is running.');
|
@@ -200,8 +202,10 @@ batchSearchBtn.addEventListener('click', async () => {
|
|
200 |
|
201 |
if (response.ok) {
|
202 |
displayBatchResults(data);
|
|
|
|
|
203 |
} else {
|
204 |
-
showError('Error processing batch request')
|
205 |
}
|
206 |
} catch (error) {
|
207 |
showError('Error connecting to the server. Please check if the API is running.');
|
@@ -447,6 +451,8 @@ function hideLoader() {
|
|
447 |
|
448 |
// Show error message
|
449 |
function showError(message) {
|
|
|
|
|
450 |
errorMessage.textContent = message;
|
451 |
errorMessage.style.display = 'block';
|
452 |
}
|
|
|
120 |
const data = await response.json();
|
121 |
if (response.ok){
|
122 |
displayKeywordResults(data, search);
|
123 |
+
} else if (response.status == 404) {
|
124 |
+
showError('No specification has been found');
|
125 |
} else {
|
126 |
+
showError('Error processing batch request')
|
127 |
}
|
128 |
} catch (error) {
|
129 |
showError('Error connecting to the server. Please check if the API is running.');
|
|
|
202 |
|
203 |
if (response.ok) {
|
204 |
displayBatchResults(data);
|
205 |
+
} else if (response.status == 404) {
|
206 |
+
showError('No document has been found');
|
207 |
} else {
|
208 |
+
showError('Error processing batch request')
|
209 |
}
|
210 |
} catch (error) {
|
211 |
showError('Error connecting to the server. Please check if the API is running.');
|
|
|
451 |
|
452 |
// Show error message
|
453 |
function showError(message) {
|
454 |
+
resultsList.innerHTML = "";
|
455 |
+
resultsStats.textContent = `Found 0 documents`;
|
456 |
errorMessage.textContent = message;
|
457 |
errorMessage.style.display = 'block';
|
458 |
}
|