[okapi] push by fli...@enlaso.com - DrupalFilter use the safe field values to preserve formatting..basic.. on 2012-03-03 00:25 GMT

[ok...@googlecode.com]

Revision: a863b07beeb5
Author: Fredrik Liden <fli...@enlaso.com>
Date: Fri Mar 2 16:24:42 2012
Log: DrupalFilter use the safe field values to preserve
formatting..basic..

http://code.google.com/p/okapi/source/detail?r=a863b07beeb5

Modified:

/okapi/filters/drupal/src/main/java/net/sf/okapi/filters/drupal/DrupalFilterWriter.java
/okapi/filters/drupal/src/main/java/net/sf/okapi/filters/drupal/Node.java

=======================================
---
/okapi/filters/drupal/src/main/java/net/sf/okapi/filters/drupal/DrupalFilterWriter.java
Fri Mar 2 13:37:56 2012
+++
/okapi/filters/drupal/src/main/java/net/sf/okapi/filters/drupal/DrupalFilterWriter.java
Fri Mar 2 16:24:42 2012
@@ -213,12 +213,12 @@
boolean neutralLikeSource = ann.getProject().getNeutralLikeSource();

// Update the fields
- node.setTitle(trgLoc.getLanguage(), outFields.get("title"),
neutralLikeSource);
- node.setBody(trgLoc.getLanguage(), outFields.get("body"),
outFields.get("summary"), neutralLikeSource);
+ node.setTitle(trgLoc.getLanguage(), (outFields.get("title") == null) ?
null :
outFields.get("title").replaceAll("<p[^>]*>", "").replace("</p>", "\r\n"),
neutralLikeSource);
+ node.setBody(trgLoc.getLanguage(), (outFields.get("body") == null) ?
null :
outFields.get("body").replaceAll("<p[^>]*>", "").replace("</p>", "\r\n"),
(outFields.get("summary") == null) ? null :
outFields.get("summary").replaceAll("<p[^>]*>", "").replace("</p>", "\r\n"),
neutralLikeSource);

// Push the updated field
cli.updateNode(node);
-
+
return event;
}

=======================================
---
/okapi/filters/drupal/src/main/java/net/sf/okapi/filters/drupal/Node.java
Fri Mar 2 13:37:56 2012
+++
/okapi/filters/drupal/src/main/java/net/sf/okapi/filters/drupal/Node.java
Fri Mar 2 16:24:42 2012
@@ -88,7 +88,7 @@
}
}
JSONObject cnt = (JSONObject)data.get(0);
- String value = (String)cnt.get("value");
+ String value = (String)cnt.get("safe_value");
return value;
}

@@ -108,7 +108,7 @@
}
}
JSONObject cnt = (JSONObject)data.get(0);
- String value = (String)cnt.get("value");
+ String value = (String)cnt.get("safe_value");
return value;
}

@@ -128,7 +128,7 @@
}
}
JSONObject cnt = (JSONObject)data.get(0);
- String value = (String)cnt.get("summary");
+ String value = (String)cnt.get("safe_summary");
return value;
}