From 03fc43f80ba90a8fea2df1c4033604cd260712e2 Mon Sep 17 00:00:00 2001
From: conradverm <conradverm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 27 Sep 2007 14:41:01 +0000
Subject: [PATCH] KTS-673 "The search algorithm needs some work" Updated. Made some scripts more user friendly.

---
 search2/indexing/bin/cronIndexer.php   |  1 +
 search2/indexing/bin/diagnose.php      | 20 +++++++++++++++++++-
 search2/indexing/bin/optimise.php      |  4 ++++
 search2/indexing/bin/recreateIndex.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 search2/indexing/bin/registerTypes.php | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 120 insertions(+), 7 deletions(-)

diff --git a/search2/indexing/bin/cronIndexer.php b/search2/indexing/bin/cronIndexer.php
index e0a0351..fd6eb2d 100755
--- a/search2/indexing/bin/cronIndexer.php
+++ b/search2/indexing/bin/cronIndexer.php
@@ -12,4 +12,5 @@ require_once('indexing/indexerCore.inc.php');
 $indexer = Indexer::get();
 $indexer->indexDocuments();
 
+exit;
 ?>
\ No newline at end of file
diff --git a/search2/indexing/bin/diagnose.php b/search2/indexing/bin/diagnose.php
index 1c961a2..fd004f2 100755
--- a/search2/indexing/bin/diagnose.php
+++ b/search2/indexing/bin/diagnose.php
@@ -9,9 +9,27 @@
 require_once(realpath('../../../config/dmsDefaults.php'));
 require_once('indexing/indexerCore.inc.php');
 
+print "Diagnosing the text extractors...\n";
+
 $indexer = Indexer::get();
 $diagnoses = $indexer->diagnose();
 
-var_dump($diagnoses);
+if (count($diagnoses) == 0)
+{
+	print "There don't appear to be any problems.\n";
+}
+else
+{
+	foreach($diagnoses as $key=>$value)
+	{
+		$name = $value['name'];
+		$diagnosis = $value['diagnosis'];
+
+		print "\nExtractor: $name ($key)\n";
+		print "* $diagnosis\n";
+	}
+}
+
+print "\nDone.\n";
 
 ?>
\ No newline at end of file
diff --git a/search2/indexing/bin/optimise.php b/search2/indexing/bin/optimise.php
index f4513fa..baee75e 100755
--- a/search2/indexing/bin/optimise.php
+++ b/search2/indexing/bin/optimise.php
@@ -9,7 +9,11 @@
 require_once(realpath('../../../config/dmsDefaults.php'));
 require_once('indexing/indexerCore.inc.php');
 
+print "Optimising Lucene index...\n";
+
 $indexer = Indexer::get();
 $indexer->optimise();
 
+print "Done.\n";
+
 ?>
\ No newline at end of file
diff --git a/search2/indexing/bin/recreateIndex.php b/search2/indexing/bin/recreateIndex.php
index 93b8458..f792a62 100755
--- a/search2/indexing/bin/recreateIndex.php
+++ b/search2/indexing/bin/recreateIndex.php
@@ -9,19 +9,62 @@
  *
  */
 
-if (true)
+session_start();
+print "Recreate Lucene index...\n";
+
+$sure=false;
+$indexall = false;
+if ($argc > 0)
 {
-	die('are you sure?');
+	foreach($argv as $arg)
+	{
+		switch (strtolower($arg))
+		{
+			case 'positive':
+				$sure=true;
+				break;
+			case 'indexall':
+				$indexall=true;
+				break;
+			case 'help':
+				print "Usage: recreateIndex.php [positive] [indexall]\n";
+				exit;
+		}
+	}
+}
+if (!$sure)
+{
+	print "* Are you sure you want to do this? Add 'positive' as a parameter to continue.\n";
+	exit;
 }
 
-session_start();
+
 require_once(realpath('../../../config/dmsDefaults.php'));
+
+$config = KTConfig::getSingleton();
+$indexer = $config->get('indexer/coreClass');
+
+if ($indexer != 'PHPLuceneIndexer')
+{
+	print "This script only works with the PHPLuceneIndexer.\n";
+	exit;
+}
+
 require_once('indexing/indexerCore.inc.php');
 require_once('indexing/indexers/PHPLuceneIndexer.inc.php');
 
+
+
 PHPLuceneIndexer::createIndex();
-PHPLuceneIndexer::indexAll();
+print "\n* The lucene index has been recreated.\n";
+
+if ($indexall)
+{
+	PHPLuceneIndexer::indexAll();
+	print "\n* All documents are scheduled for indexing.\n";
+}
+
+print "Done.\n";
 
-print "The lucene index has been deleted. All documents are now in the queue.\n";
 
 ?>
\ No newline at end of file
diff --git a/search2/indexing/bin/registerTypes.php b/search2/indexing/bin/registerTypes.php
index fda3fe6..98e6958 100755
--- a/search2/indexing/bin/registerTypes.php
+++ b/search2/indexing/bin/registerTypes.php
@@ -1,9 +1,56 @@
 <?php
 
+/**
+ * PURPOSE:
+ *
+ * The purpose of this script is to register types.
+ *
+ * Usage: registerTypes.php [clear]
+ *
+ * If 'clear' is specified, mime type mappings will be cleared.
+ *
+ */
+
+session_start();
+print "Registering Extractor mapping to Mime types...\n";
+
 require_once(realpath('../../../config/dmsDefaults.php'));
+
+$config = KTConfig::getSingleton();
+$indexer = $config->get('indexer/coreClass');
+
+if ($indexer != 'PHPLuceneIndexer')
+{
+	print "This script only works with the PHPLuceneIndexer.\n";
+	exit;
+}
+
 require_once('indexing/indexerCore.inc.php');
 
+$clear=false;
+if ($argc > 0)
+{
+	foreach($argv as $arg)
+	{
+		switch (strtolower($arg))
+		{
+			case 'clear':
+				$clear=true;
+				print "* Clearing mime type associations\n";
+				break;
+			case 'help':
+				print "Usage: registerTypes.php [clear]\n";
+				exit;
+		}
+		if (strtolower($arg) == 'clear')
+		{
+			$clear=true;
+		}
+	}
+}
+
 $indexer = Indexer::get();
-$indexer->registerTypes(true);
+$indexer->registerTypes($clear);
 
+print "Done.\n";
 ?>
\ No newline at end of file
--
libgit2 0.21.4