xlawrence 2005/08/05 15:59:57 CEST
Modified files:
core/src/java/org/jahia/engines/shared BigText_Field.java
Log:
CleanUp
Revision Changes Path
1.24 +4 -20
jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java.diff?r1=1.23&r2=1.24&f=h
Index: BigText_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/BigText_Field.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- BigText_Field.java 2 Aug 2005 13:31:57 -0000 1.23
+++ BigText_Field.java 5 Aug 2005 13:59:56 -0000 1.24
@@ -122,8 +122,6 @@
initHtmlEditorsHelpers(engineMap, jParams);
String value = theField.getValue();
-// value = cleanEditorShit(value);
-// logger.debug("cleanEditorShit: " + value);
value = JahiaBigTextField.rewriteURLs(value, jParams);
theField.setValue(value);
@@ -202,25 +200,11 @@
Vector DOMVisitors = ServicesRegistry.getInstance().
getHtmlParserService().
getHtmlDOMVisitors(theField.getJahiaID());
-
-// ExtractLinksDOMVisitor linkExtractionVisitor = null;
-// if (site.getHtmlMarkupFiltering() == 1) {
-// linkExtractionVisitor = new ExtractLinksDOMVisitor();
-// linkExtractionVisitor.init(site.getID());
-// DOMVisitors.add(linkExtractionVisitor);
-// }
-
+
fieldValue =
JahiaTextContentTidy.tidyPreProcessing(fieldValue);
- logger.debug("fieldValue1: " + fieldValue);
fieldValue =
ServicesRegistry.getInstance().getHtmlParserService().
parse(fieldValue, DOMVisitors, theField.getSiteID());
- logger.debug("fieldValue2: " + fieldValue);
fieldValue =
JahiaTextContentTidy.tidyPostProcessing(fieldValue);
- logger.debug("fieldValue3: " + fieldValue);
-
-// if (linkExtractionVisitor != null) {
-// findAndStoreCrossLinks(linkExtractionVisitor, jParams,
engineMap);
-// }
}
// Check for HTML parser errors
@@ -239,9 +223,9 @@
} else {
fieldValue = theField.getValue();
}
- fieldValue = JahiaString.getProperStr(fieldValue,
jParams.getLocale());
- logger.debug("fieldValue4: " + fieldValue);
-
+ fieldValue = JahiaTools.replacePatternIgnoreCase(fieldValue, "<br>",
"<br/>");
+ logger.debug("fieldValue: " + fieldValue);
+
final String values[] = ((JahiaBigTextField)theField).
cleanUpHardCodedLinks(fieldValue, jParams,
jParams.getLocale().toString());
