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
master
pb 2009-12-16 08:38:57 +00:00
parent ef82d124b4
commit eb111dd6db
2 changed files with 24 additions and 22 deletions

View File

@ -14,9 +14,6 @@
-- You should have received a copy of the GNU Lesser General Public -- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software -- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- 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 @@ oracle-se/function-currentDate.sql
@ -176,14 +173,15 @@
@@ default/notification/index-nt_requests.sql @@ default/notification/index-nt_requests.sql
@@ default/notification/table-nt_queue.sql @@ default/notification/table-nt_queue.sql
@@ default/search/table-search_content.sql -- Oracle Intermedia
@@ default/search/block-autogroup.sql -- @@ default/search/table-search_content.sql
@@ default/search/index-xml_content_index.sql -- @@ default/search/block-autogroup.sql
@@ default/search/index-raw_content_index.sql -- @@ default/search/index-xml_content_index.sql
@@ default/search/table-content_change_time.sql -- @@ default/search/index-raw_content_index.sql
@@ default/search/table-search_indexing_jobs.sql -- @@ default/search/table-content_change_time.sql
@@ default/search/insert-dummy.sql -- @@ default/search/table-search_indexing_jobs.sql
@@ default/search/package-search_indexing.sql -- @@ default/search/insert-dummy.sql
-- @@ default/search/package-search_indexing.sql
@@ default/versioning/table-vc_objects.sql @@ default/versioning/table-vc_objects.sql
@@ default/versioning/comment-vc_objects.sql @@ default/versioning/comment-vc_objects.sql
@ -284,8 +282,10 @@
@@ default/kernel/index-foreign_keys.sql @@ default/kernel/index-foreign_keys.sql
@@ oracle-se/mimetypes/index-convert_to_html_index.sql -- Oracle INSO filtering
@@ oracle-se/mimetypes/function-convert_to_html.sql -- @@ oracle-se/mimetypes/index-convert_to_html_index.sql
-- @@ oracle-se/mimetypes/function-convert_to_html.sql
@@ default/mimetypes/insert-cms_mime_status.sql @@ default/mimetypes/insert-cms_mime_status.sql
@@ ddl/oracle-se/deferred.sql @@ ddl/oracle-se/deferred.sql

View File

@ -43,16 +43,17 @@ init com.arsdigita.kernel.security.Initializer {
// As of version 6.5.x still in use! // As of version 6.5.x still in use!
// May be ommitted if ccm-ldn-search is used which sets the search engine // May be ommitted if ccm-ldn-search is used which sets the search engine
// by its own (Lucene) // by its own (Lucene)
//init com.arsdigita.search.Initializer {} init com.arsdigita.search.Initializer {}
// As of version 6.5.x still in use! // As of version 6.5.x still in use!
init com.arsdigita.search.intermedia.Initializer { // Comment in to use intermedia search
timerDelay = 60; // Parameters for search timer/indexing //init com.arsdigita.search.intermedia.Initializer {
syncDelay = 60; // All units are time in seconds // timerDelay = 60; // Parameters for search timer/indexing
maxSyncDelay = 7200; // see com.arsdigita.search.BuildIndex.java // syncDelay = 60; // All units are time in seconds
maxIndexingTime = 7200; // for definitions // maxSyncDelay = 7200; // see com.arsdigita.search.BuildIndex.java
indexingRetryDelay = 60; // maxIndexingTime = 7200; // for definitions
} // indexingRetryDelay = 60;
//}
// As of version 6.5.x still in use! // As of version 6.5.x still in use!
init com.arsdigita.search.lucene.Initializer {} init com.arsdigita.search.lucene.Initializer {}
@ -149,8 +150,9 @@ init com.arsdigita.portal.Initializer { }
// init com.arsdigita.localization.demo.Initializer { } // init com.arsdigita.localization.demo.Initializer { }
// init com.arsdigita.bebop.jsp.Initializer { } // init com.arsdigita.bebop.jsp.Initializer { }
// Set to true when using intermedia search
init com.arsdigita.mimetypes.MimeTypeInitializer { init com.arsdigita.mimetypes.MimeTypeInitializer {
INSOFilterEnabled = true; INSOFilterEnabled = false;
} }
// init com.arsdigita.populate.apps.Initializer { // init com.arsdigita.populate.apps.Initializer {