Changeset 20047

Timestamp:

2009-07-21T15:17:02+12:00 (14 years ago)

Author:

oranfry

Message:

the deletechunkfromfile task now supports start and end tags on the same line, with content in between

Location:

other-projects/trunk/anttasks

Files:

• build.xml (modified) (1 diff)
• src/org/greenstone/anttasks/DeleteChunkFromFile.java (modified) (4 diffs)
• src/test/dcff.txt (modified) (1 diff)

other-projects/trunk/anttasks/build.xml

@@ -110 +110 @@
         <dcff file="test/dcff3.txt" startTag="fox" leaveTags="true"/>
 
-    </target>
+        <!-- test 4 -->
+        <copy file="src/test/dcff.txt" tofile="test/dcff4.txt"/>
+        <dcff file="test/dcff4.txt" startTag="&lt;!--start--&gt;" endTag="&lt;!--end--&gt;"/>
+
+        </target>
 
     <target name="test-gpv" depends="test-setup">

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

@@ -31 +31 @@
 
     private File file = null;
-    private String startTag = null;
-    private String endTag = null;
+    private Pattern startTag = null;
+    private Pattern endTag = null;
     private boolean leaveTags = false;
 
@@ -93 +93 @@
         boolean hasMoreLines = true;
         boolean lookingForStartTag = true;
+        String toDefer = null;
+
         while ( hasMoreLines ) {
 
-            try {
-                line = in.readLine();
-            } catch ( Exception e ) {
-                throw new BuildException( "Error - Couldn't read from the specified file" );
+            //get the next line - either from the file of the leftovers from the last loop around
+            if ( toDefer != null ) {
+                line = toDefer;
+                toDefer = null;
+            } else {
+                try {
+                    line = in.readLine();
+                } catch ( Exception e ) {
+                    throw new BuildException( "Error - Couldn't read from the specified file" );
+                }
             }
 
@@ -105 +113 @@
             } else {
 
-                boolean writeLine = lookingForStartTag;
-
+                String toWrite = null;
+                boolean endLine = false;
+                System.out.print("line: " + line );
                 if ( lookingForStartTag ) {
-                    if ( line.matches( startTag ) ) {
+                    Matcher m = startTag.matcher(line);
+                    if ( m.find() ) {
                         lookingForStartTag = false;
-                        writeLine = leaveTags;
+                        toWrite = line.substring(0,leaveTags?m.end():m.start());
+                        toDefer = line.substring(m.end());
+                        System.out.println(" (a)");
+                    } else {
+                        toWrite = line;
+                        endLine = true;
+                        System.out.println(" (b)");
                     }
-                } else {
-                    if ( endTag != null && line.matches( endTag ) ) {
+                } else if ( endTag != null ) {
+                    Matcher m = endTag.matcher(line);
+                    if ( m.find() ) {
                         lookingForStartTag = true;
-                        writeLine = leaveTags;
+                        toDefer = line.substring(leaveTags?m.start():m.end());
+                        System.out.println(" (c)");
+                    } else {
+                        System.out.println(" (d)");
                     }
                 }
 
-                if ( writeLine ) {
+                if ( toWrite != null ) {
                     try {
-                        out.write(line);
-                        out.newLine();
+                        out.write(toWrite);
+                        if ( endLine ) {
+                            out.newLine();
+                        }
                     } catch ( Exception e ) {
                         throw new BuildException( "Error - Couldn't write to the temp file" );
@@ -176 +198 @@
 
     public void setStartTag(String st) {
-        this.startTag = st;
+        try {
+            this.startTag = Pattern.compile(st);
+        } catch ( PatternSyntaxException pse ) {
+            throw new BuildException( "Invalid start tag!!" );
+        }
     }
 
     public void setEndTag(String et) {
-        this.endTag = et;
+        try {
+            this.endTag = Pattern.compile(et);
+        } catch ( PatternSyntaxException pse ) {
+            throw new BuildException( "Invalid start tag!!" );
+        }
     }
 

other-projects/trunk/anttasks/src/test/dcff.txt

@@ -13 +13 @@
 русскОй язык
 äž­æ–‡
+
+more text
+b<!--start-->row<!--end-->n
+even more text