Changeset 17553 for other-projects/trunk/anttasks/src

Timestamp:

2008-10-17T14:24:07+13:00 (16 years ago)

Author:

oranfry

Message:

changes to make rsr properly handle UTF-8

Location:

other-projects/trunk/anttasks/src

Files:

• org/greenstone/anttasks/RegexSearchReplace.java (modified) (7 diffs)
• test (added)
• test/rsr.txt (added)

other-projects/trunk/anttasks/src/org/greenstone/anttasks/RegexSearchReplace.java

@@ -53 +53 @@
         }
 
+        if ( !file.exists() ) {
+            throw new BuildException( "Error - File not found !!" );
+        }
+
         if ( jobs == null && pattern == null ) {
             throw new BuildException( "Error - No pattern attribute and no nested jobs !!" );
@@ -98 +102 @@
 
             //writer to temp file
-            out = new BufferedWriter(new FileWriter(temp));
+            out = new BufferedWriter( new OutputStreamWriter(new FileOutputStream(temp), "UTF8") );
 
         } catch (IOException e) {
@@ -108 +112 @@
         BufferedReader in = null;
         try {
-            in = new BufferedReader( new FileReader( file ) );
+            in = new BufferedReader( new InputStreamReader(new FileInputStream(file), "UTF8") );
         } catch ( Exception e ) {
             throw new BuildException( "Error - Couldn't open the specified file" );
@@ -114 +118 @@
 
         //pass the file through, searching and replacing
-        String line;
+        String line = null;
         boolean hasMoreLines = true;
         while ( hasMoreLines ) {
@@ -121 +125 @@
                 line = in.readLine();
             } catch ( Exception e ) {
+                System.err.println( e.getMessage() );
                 throw new BuildException( "Error - Couldn't read from the specified file" );
             }
@@ -150 +155 @@
 
                 try {
-                    out.write(line);
+                    out.write( line );
                     out.newLine();
                 } catch ( Exception e ) {
@@ -157 +162 @@
             }
         }
-            
-
+        
         try {
             //close them both up