diff --git a/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java index cad6ce48..ce51c858 100644 --- a/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java +++ b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java @@ -54,6 +54,7 @@ public class PlanosActuacaoImporter private static void readProperties( String[] args ) throws Exception { + args = new String[]{ "/home/fpalma/workspace/PlanosActuacao/properties/0-Importer/app.properties" }; if ( args != null && args.length > 0 ) { String filepath = args[ 0 ]; diff --git a/trunk/PlanosActuacao/src/java/utils/Utils.java b/trunk/PlanosActuacao/src/java/utils/Utils.java index 25baf5b3..604984c4 100644 --- a/trunk/PlanosActuacao/src/java/utils/Utils.java +++ b/trunk/PlanosActuacao/src/java/utils/Utils.java @@ -26,10 +26,10 @@ public class Utils public static String parseToInsert( String str ) { String result = str; - if ( result != null ) - { - result = UnicodeChecker.parseToUnicode( result, true, true ); - } +// if ( result != null ) +// { +// result = UnicodeChecker.parseToUnicode( result, true, true ); +// } return result; } @@ -40,64 +40,70 @@ public class Utils return text; } +// text = UnicodeChecker.convertUnicode0100ToHTMLFromUser( text ); +// text = UnicodeChecker.convertUnicode0200ToHTMLFromUser( text ); +// text = UnicodeChecker.convertUnicode2000ToHTMLFromUser( text ); +// text = UnicodeChecker.convertUnicodeLatin1ExtendedToHTMLFromUser( text ); +// text = UnicodeChecker.convertUnicodeSpecialsToHTMLFromUser( text ); + String output = text; - output = output.replaceAll( "\\\\u0009", " " ); - output = output.replaceAll( "\\\\u000a", "
" ); - - output = output.replaceAll( "\\\\u00a0", " " ); - output = output.replaceAll( "\\\\u00aa", "ª" ); - output = output.replaceAll( "\\\\u00ba", "º" ); - - output = output.replaceAll( "\\\\u00c0", "À" ); - output = output.replaceAll( "\\\\u00c1", "Á" ); - output = output.replaceAll( "\\\\u00c2", "Â" ); - output = output.replaceAll( "\\\\u00c3", "Ã" ); - output = output.replaceAll( "\\\\u00c7", "Ç" ); - output = output.replaceAll( "\\\\u00c8", "È" ); - output = output.replaceAll( "\\\\u00c9", "É" ); - output = output.replaceAll( "\\\\u00d3", "Ó" ); - output = output.replaceAll( "\\\\u00d2", "Ò" ); - - output = output.replaceAll( "\\\\u00ca", "Ê" ); - output = output.replaceAll( "\\\\u00cc", "Ì" ); - output = output.replaceAll( "\\\\u00cd", "Í" ); - output = output.replaceAll( "\\\\u00ce", "Î" ); - output = output.replaceAll( "\\\\u00d2", "ò" ); - output = output.replaceAll( "\\\\u00d3", "ó" ); - output = output.replaceAll( "\\\\u00d4", "ô" ); - output = output.replaceAll( "\\\\u00d5", "õ" ); - output = output.replaceAll( "\\\\u00d9", "Ù" ); - output = output.replaceAll( "\\\\u00da", "Ú" ); - output = output.replaceAll( "\\\\u00db", "Û" ); - - output = output.replaceAll( "\\\\u00e0", "à" ); - output = output.replaceAll( "\\\\u00e1", "á" ); - output = output.replaceAll( "\\\\u00e2", "â" ); - output = output.replaceAll( "\\\\u00e3", "ã" ); - output = output.replaceAll( "\\\\u00e7", "ç" ); - output = output.replaceAll( "\\\\u00e8", "è" ); - output = output.replaceAll( "\\\\u00e9", "é" ); - output = output.replaceAll( "\\\\u00ea", "ê" ); - output = output.replaceAll( "\\\\u00ec", "ì" ); - output = output.replaceAll( "\\\\u00ed", "í" ); - output = output.replaceAll( "\\\\u00ee", "î" ); - output = output.replaceAll( "\\\\u00f2", "ò" ); - output = output.replaceAll( "\\\\u00f3", "ó" ); - output = output.replaceAll( "\\\\u00f4", "ô" ); - output = output.replaceAll( "\\\\u00f5", "õ" ); - output = output.replaceAll( "\\\\u00f9", "ù" ); - output = output.replaceAll( "\\\\u00fa", "ú" ); - output = output.replaceAll( "\\\\u00fb", "û" ); - - output = output.replaceAll( "\\\\u0153", "œ" ); - - output = output.replaceAll( "\\\\u2013", "-" ); - output = output.replaceAll( "\\\\u2014", "-" ); - output = output.replaceAll( "\\\\u2018|\\\\u2019", "'" ); - output = output.replaceAll( "\\\\u201c|\\\\u201d", "\"" ); - - output = output.replaceAll( "\\\\u2022", "*" ); - output = output.replaceAll( "\\\\u2026", "..." ); +// output = output.replaceAll( "\\\\u0009", " " ); +// output = output.replaceAll( "\\\\u000a", "
" ); +// +// output = output.replaceAll( "\\\\u00a0", " " ); +// output = output.replaceAll( "\\\\u00aa", "ª" ); +// output = output.replaceAll( "\\\\u00ba", "º" ); +// +// output = output.replaceAll( "\\\\u00c0", "�" ); +// output = output.replaceAll( "\\\\u00c1", "�" ); +// output = output.replaceAll( "\\\\u00c2", "�" ); +// output = output.replaceAll( "\\\\u00c3", "�" ); +// output = output.replaceAll( "\\\\u00c7", "�" ); +// output = output.replaceAll( "\\\\u00c8", "�" ); +// output = output.replaceAll( "\\\\u00c9", "�" ); +// output = output.replaceAll( "\\\\u00d3", "�" ); +// output = output.replaceAll( "\\\\u00d2", "�" ); +// +// output = output.replaceAll( "\\\\u00ca", "�" ); +// output = output.replaceAll( "\\\\u00cc", "�" ); +// output = output.replaceAll( "\\\\u00cd", "�" ); +// output = output.replaceAll( "\\\\u00ce", "�" ); +// output = output.replaceAll( "\\\\u00d2", "�" ); +// output = output.replaceAll( "\\\\u00d3", "�" ); +// output = output.replaceAll( "\\\\u00d4", "�" ); +// output = output.replaceAll( "\\\\u00d5", "�" ); +// output = output.replaceAll( "\\\\u00d9", "�" ); +// output = output.replaceAll( "\\\\u00da", "�" ); +// output = output.replaceAll( "\\\\u00db", "�" ); +// +// output = output.replaceAll( "\\\\u00e0", "�" ); +// output = output.replaceAll( "\\\\u00e1", "�" ); +// output = output.replaceAll( "\\\\u00e2", "�" ); +// output = output.replaceAll( "\\\\u00e3", "�" ); +// output = output.replaceAll( "\\\\u00e7", "�" ); +// output = output.replaceAll( "\\\\u00e8", "�" ); +// output = output.replaceAll( "\\\\u00e9", "�" ); +// output = output.replaceAll( "\\\\u00ea", "�" ); +// output = output.replaceAll( "\\\\u00ec", "�" ); +// output = output.replaceAll( "\\\\u00ed", "�" ); +// output = output.replaceAll( "\\\\u00ee", "�" ); +// output = output.replaceAll( "\\\\u00f2", "�" ); +// output = output.replaceAll( "\\\\u00f3", "�" ); +// output = output.replaceAll( "\\\\u00f4", "�" ); +// output = output.replaceAll( "\\\\u00f5", "�" ); +// output = output.replaceAll( "\\\\u00f9", "�" ); +// output = output.replaceAll( "\\\\u00fa", "�" ); +// output = output.replaceAll( "\\\\u00fb", "�" ); +// +// output = output.replaceAll( "\\\\u0153", "œ" ); +// +// output = output.replaceAll( "\\\\u2013", "-" ); +// output = output.replaceAll( "\\\\u2014", "-" ); +// output = output.replaceAll( "\\\\u2018|\\\\u2019", "'" ); +// output = output.replaceAll( "\\\\u201c|\\\\u201d", "\"" ); +// +// output = output.replaceAll( "\\\\u2022", "*" ); +// output = output.replaceAll( "\\\\u2026", "..." ); return output; }