Update index.html

index.html

@@ -289,9 +289,8 @@ function performSearch() {
     }
 
     const searchType = Array.from(searchTypeRadios).find(radio => radio.checked).value;
-    // const useWordBoundary = wordBoundaryCheckbox.checked; // Removed
 
-     let filteredData = [];
+    let filteredData = [];
 
     if (searchType === 'contains') {
       const exactMatches = [];
@@ -299,68 +298,55 @@ function performSearch() {
       const endsWithMatches = [];
       const otherContainsMatches = [];
 
-
          excelData.forEach(row => {
-            let rowMatches = false;
             row.forEach((cell, index) => {
-
               const columnIndex = String.fromCharCode('A'.charCodeAt(0) + index);
-              if(columnIndex === mainWordColumn || mapping[columnIndex]){ //Prioritize the main columns
-
+              if(columnIndex === mainWordColumn || mapping[columnIndex]){
                 const normalizedCell = normalizeText(cell);
-                // Removed word boundary logic
-
-                
-                    if (normalizedCell.includes(searchTerm)) {
-                        if (normalizedCell === searchTerm) {
-                          exactMatches.push(row);
-                         }
-                         else if(normalizedCell.startsWith(searchTerm)){
-                            startsWithMatches.push(row);
-                         }
-                          else if(normalizedCell.endsWith(searchTerm)){
-                            endsWithMatches.push(row)
-                         }
-                         else{
-                          otherContainsMatches.push(row)
-                         }
-                        rowMatches = true;
-                    }
+                if (normalizedCell.includes(searchTerm)) {
+                    if (normalizedCell === searchTerm) {
+                      exactMatches.push(row);
+                     }
+                     else if(normalizedCell.startsWith(searchTerm)){
+                        startsWithMatches.push(row);
+                     }
+                      else if(normalizedCell.endsWith(searchTerm)){
+                        endsWithMatches.push(row)
+                     }
+                     else{
+                      otherContainsMatches.push(row)
+                     }
+                }
              }
             });
-
-
         });
-        filteredData = [...new Set([...exactMatches, ...startsWithMatches,...endsWithMatches, ...otherContainsMatches])]; // Remove duplicates, and combine
+        filteredData = [...new Set([...exactMatches, ...startsWithMatches,...endsWithMatches, ...otherContainsMatches])];
 
     }
     else if (searchType === 'startsWith') {
       filteredData = excelData.filter(row =>
                 row.some((cell, index) => {
                     const columnIndex = String.fromCharCode('A'.charCodeAt(0) + index);
-                    if(columnIndex === mainWordColumn || mapping[columnIndex]){ //Prioritize the main columns
+                    if(columnIndex === mainWordColumn || mapping[columnIndex]){
                         const normalizedCell = normalizeText(cell);
-                        // Removed word boundary logic
-                           return normalizedCell.startsWith(searchTerm);
+                        return normalizedCell.startsWith(searchTerm);
                     }
                     return false;
                 }));
     } else if (searchType === 'exact') {
-
-          filteredData = excelData.filter(row =>
-                row.some((cell, index) => {
-                    const columnIndex = String.fromCharCode('A'.charCodeAt(0) + index);
-                    if(columnIndex === mainWordColumn || mapping[columnIndex]){ //Prioritize the main columns
-
-                        const normalizedCell = normalizeText(cell);
-                         // Removed word boundary logic
-                            return normalizedCell === searchTerm; // Strict equality
-
-                    }
-                    return false;
-                }));
-
-
+        // EXACT SEARCH (using word boundaries)
+        const regex = new RegExp(`\\b${searchTerm}\\b`, 'i'); // Case-insensitive
+
+        filteredData = excelData.filter(row =>
+            row.some((cell, index) => {
+                const columnIndex = String.fromCharCode('A'.charCodeAt(0) + index);
+                if (columnIndex === mainWordColumn || mapping[columnIndex]) {
+                     const normalizedCell = normalizeText(cell);
+                    return regex.test(normalizedCell);
+                }
+                return false;
+            })
+        );
     }
 
     displayData(filteredData);