From: <boo...@us...> - 2006-09-21 02:19:48
|
Revision: 1408 http://svn.sourceforge.net/pcgen/?rev=1408&view=rev Author: boomer70 Date: 2006-09-20 19:19:42 -0700 (Wed, 20 Sep 2006) Log Message: ----------- Fix for [ 1481697 ] Ampersand in Description Fields Causes Export Failure. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java Trunk/pcgen/code/src/java/plugin/exporttokens/NoteToken.java Modified: Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java 2006-09-21 01:27:22 UTC (rev 1407) +++ Trunk/pcgen/code/src/java/pcgen/core/NoteItem.java 2006-09-21 02:19:42 UTC (rev 1408) @@ -22,7 +22,9 @@ */ package pcgen.core; +import pcgen.io.FileAccess; + /** * <code>NoteItem</code>. * @@ -59,7 +61,7 @@ */ public String getExportString(final String beforeName, final String afterName, final String beforeValue, final String afterValue) { - return beforeName + name + afterName + beforeValue + value + afterValue; + return beforeName + FileAccess.filterString(name) + afterName + beforeValue + FileAccess.filterString(value) + afterValue; } public int getId() Modified: Trunk/pcgen/code/src/java/plugin/exporttokens/NoteToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/NoteToken.java 2006-09-21 01:27:22 UTC (rev 1407) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/NoteToken.java 2006-09-21 02:19:42 UTC (rev 1408) @@ -28,6 +28,7 @@ import pcgen.core.NoteItem; import pcgen.core.PlayerCharacter; import pcgen.io.ExportHandler; +import pcgen.io.FileAccess; import pcgen.io.exporttoken.Token; import java.util.ArrayList; @@ -120,11 +121,12 @@ { if ("ALL".equals(token)) { + // TODO - Why doesn't this handle value the same as the VALUE token sb.append(ni.getExportString(beforeHeader, afterHeader, beforeValue, afterValue)); } else if ("NAME".equals(token)) { - sb.append(ni.getName()); + sb.append(FileAccess.filterString(ni.getName())); } else if ("VALUE".equals(token)) { @@ -133,7 +135,7 @@ while (cTok.hasMoreTokens()) { sb.append(beforeValue); - sb.append(cTok.nextToken()); + sb.append(FileAccess.filterString(cTok.nextToken())); sb.append(afterValue); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |