Author: dpillot
Date: Wed Sep 19 18:16:18 2007
New Revision: 18566
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18566&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2214
cosmetic fixes
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ManageContentPicker.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/impo=
rtexport/ManageContentPicker.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/importexport/ManageContentPicker.ja=
va&rev=3D18566&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ManageContentPicker.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/importexpo=
rt/ManageContentPicker.java Wed Sep 19 18:16:18 2007
@@ -42,8 +42,8 @@
import org.jahia.services.lock.LockRegistry;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.pages.JahiaPage;
-import org.jahia.services.pages.PageProperty;
import org.jahia.services.pages.JahiaPageService;
+import org.jahia.services.pages.PageProperty;
import org.jahia.services.scheduler.BackgroundJob;
import org.jahia.services.scheduler.SchedulerService;
import org.jahia.services.search.*;
@@ -51,8 +51,9 @@
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.sites.JahiaSitesService;
import org.jahia.services.sites.SiteLanguageSettings;
-import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.utils.TextHtml;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
=
@@ -835,7 +836,7 @@
if (contentField instanceof ContentSmallTe=
xtField) {
String value =3D contentField.getValue=
(processingContext, lr);
if (value !=3D null && !value.trim().e=
quals("") && !value.equals("<empty>")) {
- t =3D value;
+ t =3D TextHtml.html2text(value);
pageID =3D contentField.getPageID(=
);
siteID =3D contentField.getSiteID(=
);
type =3D JahiaSearchHitInterface.F=
IELD_TYPE;
@@ -852,8 +853,9 @@
ContentField contentField =3D (ContentFiel=
d) iterator1.next();
String value =3D contentField.getValue(pro=
cessingContext, lr);
if (value !=3D null && !value.trim().equal=
s("") && !value.equals("<empty>")) {
- t =3D value;
- if (value.length() > 12) t =3D value.s=
ubstring(0, 12) + " (...)";
+ t =3D TextHtml.html2text(value);
+
+ //if (value.length() > 12) t =3D value=
.substring(0, 12) + " (...)";
logger.debug("tkey=3D" + t);
break;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
