From 97513244c4ed421700aa11abfb03490b92dca00d Mon Sep 17 00:00:00 2001
From: Chris Morgan <cmorgan@alum.wpi.edu>
Date: Wed, 8 Jun 2005 00:35:30 +0000
Subject: [PATCH] Admin app queue page was only displaying like matches for a
 submitted app. Factor like and fuzzy searches out in to a function and call
 that function from normal search and from the app queue page so admins see
 fuzzy matches for submitted apps.

---
 admin/adminAppQueue.php |  3 +--
 include/util.php        | 12 ++++++++++++
 search.php              | 11 +----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index d0b6b97..9f33a92 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -99,8 +99,7 @@ if ($_REQUEST['sub'])
         } else // application
         { 
             echo html_frame_start("Potential duplicate applications in the database","90%","",0);
-            $hResult = searchForApplication($oApp->sName);
-            outputSearchTableForhResult($oApp->sName, $hResult);
+            perform_search_and_output_results($oApp->sName);
             echo html_frame_end("&nbsp;");
 
             //help
diff --git a/include/util.php b/include/util.php
index 8d31794..a26231e 100644
--- a/include/util.php
+++ b/include/util.php
@@ -585,4 +585,16 @@ function process_app_version_changes($isVersion)
     }
 }
 
+function perform_search_and_output_results($search_words)
+{
+    echo "<center><b>Like matches</b></center>";
+    $hResult = searchForApplication($search_words);
+    outputSearchTableForhResult($search_words, $hResult);
+
+    $minMatchingPercent = 60;
+    echo "<center><b>Fuzzy matches - minimum ".$minMatchingPercent."% match</b></center>";
+    $hResult = searchForApplicationFuzzy($search_words, $minMatchingPercent);
+    outputSearchTableForhResult($search_words, $hResult);
+}
+
 ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index 7546cd1..4031aee 100644
--- a/search.php
+++ b/search.php
@@ -12,15 +12,6 @@ require(BASE."include/application.php");
 
 
 apidb_header("Search Results");
-
-echo "<center><b>Like matches</b></center>";
-$hResult = searchForApplication($_REQUEST['q']);
-outputSearchTableForhResult($_REQUEST['q'], $hResult);
-
-$minMatchingPercent = 60;
-echo "<center><b>Fuzzy matches - minimum ".$minMatchingPercent."% match</b></center>";
-$hResult = searchForApplicationFuzzy($_REQUEST['q'], $minMatchingPercent);
-outputSearchTableForhResult($_REQUEST['q'], $hResult);
-
+perform_search_and_output_results($_REQUEST['q']);
 apidb_footer();
 ?>