xlawrence 2005/07/19 11:21:00 CEST
Modified files:
core/src/java/org/jahia/engines/shared BigText_Field.java
Log:
Use the siteSetting properties to know if we have to check URL integrity and
WAI compliance
Revision Changes Path
1.19 +7 -5
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.18&r2=1.19&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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BigText_Field.java 15 Jul 2005 15:24:25 -0000 1.18
+++ BigText_Field.java 19 Jul 2005 09:21:00 -0000 1.19
@@ -172,6 +172,9 @@
buff.append("_").append(theField.getID()).toString());
buff.delete(0, buff.length());
+ final JahiaSite site = ServicesRegistry.getInstance().
+ getJahiaSitesService().getSite(theField.getJahiaID());
+
if (fieldValue != null) {
fieldValue = JahiaTools.replacePattern(fieldValue, "|",
"|");
@@ -189,9 +192,6 @@
}
final String oriFieldValue = fieldValue;
- final JahiaSite site = ServicesRegistry.getInstance().
- getJahiaSitesService().getSite(theField.getJahiaID());
-
if ( site.getHtmlCleanup() == 1 ){
Vector DOMVisitors = ServicesRegistry.getInstance().
getHtmlParserService().
@@ -246,7 +246,8 @@
if (! ignoreAllWarnings) {
// Display or ignore URL integrity checks (warnings)
- if (jParams.getParameter("ignoreWarnings") == null) {
+ if (jParams.getParameter("ignoreWarnings") == null &&
+ site.getURLIntegrityCheck() == 1) {
final EngineMessages warningMessages =
composeWarningMessages(jParams,
engineMap, theField, false);
@@ -262,7 +263,8 @@
}
// Display or ignore WAI enforcment warnings
- if (jParams.getParameter("ignoreWAIWarnings") == null) {
+ if (jParams.getParameter("ignoreWAIWarnings") == null &&
+ site.getWAIComplianceCheck() == 1) {
final EngineValidationHelper evh =
WAIValidator.getInstance().
validate(theField.getValue());
