xlawrence 2005/12/12 09:25:37 CET
Modified files:
core/src/java/org/jahia/services/fields
ContentBigTextField.java
Log:
Avoid JahiaException when checking content of field.
added missing type
Revision Changes Path
1.13 +3 -8
jahia/core/src/java/org/jahia/services/fields/ContentBigTextField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/ContentBigTextField.java.diff?r1=1.12&r2=1.13&f=h
Index: ContentBigTextField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/ContentBigTextField.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ContentBigTextField.java 15 Nov 2005 19:04:20 -0000 1.12
+++ ContentBigTextField.java 12 Dec 2005 08:25:36 -0000 1.13
@@ -180,7 +180,7 @@
*/
public String getValueForSearch(final ProcessingContext jParams,
final ContentObjectEntryState entryState) {
- return new String(); /** @todo fixme */
+ return new String(); /** todo fixme */
}
//--------------------------------------------------------------------------
@@ -339,7 +339,7 @@
final String lang = (String)ite.next();
final String state =
BigText_Field.getInstance().getPageState(pid, lang);
- if ("active".equals(state)) { continue; }
+ if ("active".equals(state) ||
"staging_OK".equals(state)) { continue; }
if ("staging".equals(state)) {
if (page.getActiveVersionID() <= 0) {
final EngineMessage msg = new EngineMessage(
@@ -351,8 +351,6 @@
msg);
results.appendError(activationResults);
- } else {
- continue;
}
} else if ("markForDeleted".equals(state)) {
@@ -376,8 +374,6 @@
msg);
results.appendError(activationResults);
- } else {
- continue;
}
} else {
@@ -564,7 +560,7 @@
entryState.getLanguageCode());
if (result == null || result.equals("<empty>")) {
- result = new String();
+ result = "";
} else {
//result = FormDataManager.getInstance().formDecode(result);
}
@@ -622,6 +618,5 @@
toEntryState.getLanguageCode()
);
}
- return;
}
}
