Changeset 17554

Timestamp:

2008-10-17T14:58:46+13:00 (16 years ago)

Author:

oranfry

Message:

changes to make the dcff task UTF-8 compatible

Location:

other-projects/trunk/anttasks

Files:

• build.xml (modified) (3 diffs)
• src/org/greenstone/anttasks/DeleteChunkFromFile.java (modified) (2 diffs)
• src/test/dcff.txt (added)

other-projects/trunk/anttasks/build.xml

@@ -45 +45 @@
     <target name="test" depends="test-setup">
         <antcall target="test-rsr"/>
+        <antcall target="test-dcff"/>
     </target>
 
     <target name="test-rsr" depends="test-setup">
 
+        <!-- test 1 -->
         <copy file="src/test/rsr.txt" tofile="test/rsr1.txt"/>
-        <copy file="src/test/rsr.txt" tofile="test/rsr2.txt"/>
-        <copy file="src/test/rsr.txt" tofile="test/rsr3.txt"/>
-        <copy file="src/test/rsr.txt" tofile="test/rsr4.txt"/>
-
         <rsr file="test/rsr1.txt" pattern="things" replacement="strings"/>
 
+        <!-- test 2 -->
+        <copy file="src/test/rsr.txt" tofile="test/rsr2.txt"/>
         <rsr file="test/rsr2.txt">
             <job pattern="things" replacement="objects"/>
@@ -61 +61 @@
         </rsr>
 
+        <!-- test 3 -->
+        <copy file="src/test/rsr.txt" tofile="test/rsr3.txt"/>
         <rsr file="test/rsr3.txt" pattern="@path@" replacement="C:\Program Files\Greenstone 2.80"/>
         <rsr file="test/rsr3.txt" pattern="@path-with-winpath@" replacement="C:\Program Files\Greenstone 2.80" winPath="true"/>
 
+        <!-- test 4 -->
+        <copy file="src/test/rsr.txt" tofile="test/rsr4.txt"/>
         <rsr file="test/rsr4.txt">
             <job pattern="@path@" replacement="C:\Program Files\Greenstone 2.80"/>
@@ -71 +75 @@
     </target>
 
+    <target name="test-dcff" depends="test-setup">
+
+        <!-- test 1 -->
+        <copy file="src/test/dcff.txt" tofile="test/dcff1.txt"/>
+        <dcff file="test/dcff1.txt" startTag="The" endTag="brown" leaveTags="true"/>
+
+        <!-- test 2 -->
+        <copy file="src/test/dcff.txt" tofile="test/dcff2.txt"/>
+        <dcff file="test/dcff2.txt" startTag="quick" endTag="brown"/>
+
+        <!-- test 3 -->
+        <copy file="src/test/dcff.txt" tofile="test/dcff3.txt"/>
+        <dcff file="test/dcff3.txt" startTag="fox" leaveTags="true"/>
+
+    </target>
+
+
     <target name="test-clean">
         <delete dir="test"/>

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

@@ -74 +74 @@
 
             //writer to temp file
-            out = new BufferedWriter(new FileWriter(temp));
+            out = new BufferedWriter( new OutputStreamWriter(new FileOutputStream(temp), "UTF8") );
 
         } catch (IOException e) {
@@ -84 +84 @@
         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" );