From eb111dd6db0e02f80fe7f62e7d6aa24eee59c937 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 16 Dec 2009 08:38:57 +0000
Subject: [PATCH] Integrated r2043: By default, Oracle Intermedia search and
 Oracle INSO filter are now disabled.  Lucene is the default (and single
 activated) search engine.

git-svn-id: https://svn.libreccm.org/ccm/trunk@314 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/sql/ccm-core/oracle-se-create.sql    | 26 +++++++++----------
 .../src/com/arsdigita/core/enterprise.init    | 20 +++++++-------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ccm-core/sql/ccm-core/oracle-se-create.sql b/ccm-core/sql/ccm-core/oracle-se-create.sql
index d0cf97c6e..2160ddbbe 100755
--- a/ccm-core/sql/ccm-core/oracle-se-create.sql
+++ b/ccm-core/sql/ccm-core/oracle-se-create.sql
@@ -14,9 +14,6 @@
 -- You should have received a copy of the GNU Lesser General Public
 -- License along with this library; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---
--- $Id: oracle-se-create.sql 1704 2008-06-08 14:45:43Z pboy $
--- $DateTime: 2004/08/16 18:10:38 $
 
 @@ oracle-se/function-currentDate.sql
 
@@ -176,14 +173,15 @@
 @@ default/notification/index-nt_requests.sql
 @@ default/notification/table-nt_queue.sql
 
-@@ default/search/table-search_content.sql
-@@ default/search/block-autogroup.sql
-@@ default/search/index-xml_content_index.sql
-@@ default/search/index-raw_content_index.sql
-@@ default/search/table-content_change_time.sql
-@@ default/search/table-search_indexing_jobs.sql
-@@ default/search/insert-dummy.sql
-@@ default/search/package-search_indexing.sql
+-- Oracle Intermedia
+-- @@ default/search/table-search_content.sql
+-- @@ default/search/block-autogroup.sql
+-- @@ default/search/index-xml_content_index.sql
+-- @@ default/search/index-raw_content_index.sql
+-- @@ default/search/table-content_change_time.sql
+-- @@ default/search/table-search_indexing_jobs.sql
+-- @@ default/search/insert-dummy.sql
+-- @@ default/search/package-search_indexing.sql
 
 @@ default/versioning/table-vc_objects.sql
 @@ default/versioning/comment-vc_objects.sql
@@ -284,8 +282,10 @@
 
 @@ default/kernel/index-foreign_keys.sql
 
-@@ oracle-se/mimetypes/index-convert_to_html_index.sql
-@@ oracle-se/mimetypes/function-convert_to_html.sql
+-- Oracle INSO filtering
+-- @@ oracle-se/mimetypes/index-convert_to_html_index.sql
+-- @@ oracle-se/mimetypes/function-convert_to_html.sql
+
 @@ default/mimetypes/insert-cms_mime_status.sql
 
 @@ ddl/oracle-se/deferred.sql
diff --git a/ccm-core/src/com/arsdigita/core/enterprise.init b/ccm-core/src/com/arsdigita/core/enterprise.init
index ad03c084c..afcb5a3da 100755
--- a/ccm-core/src/com/arsdigita/core/enterprise.init
+++ b/ccm-core/src/com/arsdigita/core/enterprise.init
@@ -43,16 +43,17 @@ init com.arsdigita.kernel.security.Initializer {
 //  As of version 6.5.x still in use!
 //  May be ommitted if ccm-ldn-search is used which sets the search engine
 //  by its own (Lucene)
-//init com.arsdigita.search.Initializer {}
+init com.arsdigita.search.Initializer {}
 
 // As of version 6.5.x still in use!
-init com.arsdigita.search.intermedia.Initializer {
-    timerDelay         = 60;    // Parameters for search timer/indexing
-    syncDelay          = 60;    // All units are time in seconds
-    maxSyncDelay       = 7200;  // see com.arsdigita.search.BuildIndex.java
-    maxIndexingTime    = 7200;  // for definitions
-    indexingRetryDelay = 60;
-}
+// Comment in to use intermedia search
+//init com.arsdigita.search.intermedia.Initializer {
+//    timerDelay         = 60;    // Parameters for search timer/indexing
+//    syncDelay          = 60;    // All units are time in seconds
+//    maxSyncDelay       = 7200;  // see com.arsdigita.search.BuildIndex.java
+//    maxIndexingTime    = 7200;  // for definitions
+//    indexingRetryDelay = 60;
+//}
 
 //  As of version 6.5.x still in use!
 init com.arsdigita.search.lucene.Initializer {}
@@ -149,8 +150,9 @@ init com.arsdigita.portal.Initializer { }
 // init com.arsdigita.localization.demo.Initializer { }
 // init com.arsdigita.bebop.jsp.Initializer { }
 
+// Set to true when using intermedia search
 init com.arsdigita.mimetypes.MimeTypeInitializer {
-    INSOFilterEnabled = true;
+    INSOFilterEnabled = false;
 }
 
 // init com.arsdigita.populate.apps.Initializer {