cmailleux 2005/09/16 12:03:09 CEST
Modified files:
core/src/java/org/jahia/services/search
JahiaSearchBaseService.java
Log:
use getLanguageSettingsAsLocales(true) instaed of a local loop doing the same
thing
Revision Changes Path
1.19 +6 -23
jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java.diff?r1=1.18&r2=1.19&f=h
Index: JahiaSearchBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JahiaSearchBaseService.java 30 Aug 2005 09:49:05 -0000 1.18
+++ JahiaSearchBaseService.java 16 Sep 2005 10:03:08 -0000 1.19
@@ -17,9 +17,6 @@
package org.jahia.services.search;
-import java.io.File;
-import java.util.*;
-
import org.jahia.content.ContentObject;
import org.jahia.data.fields.JahiaContentFieldFacade;
import org.jahia.data.fields.JahiaField;
@@ -30,14 +27,15 @@
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.fields.ContentField;
+import org.jahia.services.scheduler.SchedulerService;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.version.EntryLoadRequest;
-import org.jahia.services.scheduler.SchedulerService;
-import org.jahia.settings.SettingsBean;
import org.jahia.utils.JahiaChrono;
import org.jahia.utils.LanguageCodeConverters;
-import org.jahia.bin.Jahia;
+
+import java.io.File;
+import java.util.*;
/**
* Search Service based on Lucene engine.
@@ -257,25 +255,10 @@
// remove the field in staging and active in all language
first
this.removeFieldFromSearchEngine(contentField);
}
-
- ArrayList localeList = new ArrayList ();
- Vector siteLanguageSettings = jParams.getSite
().getLanguageSettings ();
- if (siteLanguageSettings != null) {
- for (int i = 0; i < siteLanguageSettings.size (); i++) {
- SiteLanguageSettings curSetting = (SiteLanguageSettings)
- siteLanguageSettings.elementAt (i);
- if (curSetting.isActivated ()) {
- Locale tempLocale = LanguageCodeConverters.
- languageCodeToLocale (curSetting.
- getCode ());
- localeList.add (tempLocale);
- }
- }
- }
-
+ ArrayList siteLanguageSettings = jParams.getSite
().getLanguageSettingsAsLocales (true);
JahiaContentFieldFacade jahiaContentFieldFacade =
new JahiaContentFieldFacade (fieldID, LoadFlags.TEXTS,
jParams,
- localeList, false);
+ siteLanguageSettings, false);
Enumeration fieldEnum = jahiaContentFieldFacade.getFields ();
JahiaField aField = null;
while (fieldEnum.hasMoreElements ()) {
