Changeset 17295 for other-projects/trunk

Timestamp:

2008-09-17T09:23:43+12:00 (16 years ago)

Author:

oranfry

Message:

added a delete chunk from file task and made rsr nicer with nested elements

Location:

other-projects/trunk/anttasks

Files:

• build.xml (modified) (2 diffs)
• src/org/greenstone/anttasks/DeleteChunkFromFile.java (added)
• src/org/greenstone/anttasks/RegexSearchReplace.java (modified) (7 diffs)
• src/org/greenstone/anttasks/RegexSearchReplaceJob.java (added)
• test.xml (added)

other-projects/trunk/anttasks/build.xml

@@ -22 +22 @@
     </target>
 
+    <target name="clean">
+        <delete dir="classes"/>
+        <delete dir="lib"/>
+    </target>
+
     <target name="check-libs" unless="libs.set">
         <echo>Please set crypt.jar property to the path of the crypt.jar file</echo>
@@ -28 +33 @@
     </target>
 
+
+
 </project>

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

@@ -21 +21 @@
 package org.greenstone.anttasks;
 
+import java.util.ArrayList;
 import org.apache.tools.ant.*;
 import org.apache.tools.ant.taskdefs.*;
@@ -27 +28 @@
 import java.util.regex.*;
 
-
 public class RegexSearchReplace extends Task {
+
     private File file = null;
+    private ArrayList jobs = null;
     private String pattern = null;
     private String replacement = null;
     private boolean winPath = false;
-    
-
-    /**
-     * for testing
-     */
+
     public static void main( String[] args ) {
 
@@ -55 +53 @@
         }
 
-        if ( pattern == null ) {
-            throw new BuildException( "Error - No pattern specified !!" );
-        }
-
-        if ( replacement == null ) {
-            throw new BuildException( "Error - No replacement specified !!" );
-        }
-
-        if ( winPath ) {
-            replacement = replacement.replaceAll("\\\\","\\\\\\\\");
-        }
-        
-        System.out.println( "File: " + file );
-        System.out.println( "Pattern: " + pattern );
-        System.out.println( "Replacement: " + replacement );
+        if ( jobs == null && pattern == null ) {
+            throw new BuildException( "Error - No pattern attribute and no nested jobs !!" );
+        }
+
+        if ( jobs != null && pattern != null ) {
+            throw new BuildException( "Error - Both pattern attribute and nested jobs given !!" );
+        }
+
+        if ( pattern != null && replacement == null ) {
+            throw new BuildException( "Error - pattern attribute given but no replacement attribute given !!" );
+        }
+
+        if ( jobs != null ) {
+            for ( int i=0; i<jobs.size(); i++ ) {
+                if ( ((RegexSearchReplaceJob)(jobs.get(i))).getPattern() == null ) {
+                    throw new BuildException( "Error - One of the jobs lacks a pattern!!" );
+                }
+                if ( ((RegexSearchReplaceJob)(jobs.get(i))).getReplacement() == null ) {
+                    throw new BuildException( "Error - One of the jobs lacks a replacement!!" );
+                }
+            }
+        }
+
+        System.out.println( "Replace in file: " + file );
+        if ( pattern != null ) {
+            System.out.println( " " + pattern + " -> " + replacement );
+        } else {
+            for ( int i=0; i<jobs.size(); i++ ) {
+                System.out.println( " " + ((RegexSearchReplaceJob)(jobs.get(i))).getPattern() + " -> " + ((RegexSearchReplaceJob)(jobs.get(i))).getReplacement() );
+            }
+        }
 
         int noReplaces = 0;
@@ -115 +129 @@
 
                 String oldLine = line;
-                line = line.replaceAll(pattern, replacement);
+                if ( pattern != null ) {
+                    line = line.replaceAll((String)pattern, (String)replacement);
+                } else {
+                    for ( int i=0; i<jobs.size(); i++ ) {
+                        String rp = ((RegexSearchReplaceJob)(jobs.get(i))).getReplacement();
+                        if ( winPath ) {
+                            rp = rp.replaceAll("\\\\","\\\\\\\\");
+                        }
+                        line = line.replaceAll( ((RegexSearchReplaceJob)(jobs.get(i))).getPattern(), rp );
+                    }
+                }
+
                 if ( !oldLine.equals( line ) ) {
                     noReplaces++;
@@ -166 +191 @@
         }
 
-        String linesWord = "lines";     
-        if ( noReplaces == 1 ) {
-            linesWord = "line";
-        }
-        System.out.println( "Successfully changed " + noReplaces + " " + linesWord );
-    }
-
-   
+        if ( noReplaces == 0 ) {
+            System.out.println( "No Changes Made" );
+        } if ( noReplaces == 1 ) {
+            System.out.println( "Successfully changed 1 line" );
+        } else {
+            System.out.println( "Successfully changed " + noReplaces + " lines" );
+        }
+
+    }
+
     public void setFile(File file) {
         this.file = file;
@@ -183 +210 @@
 
     public void setReplacement(String replacement) {
-        this.replacement = replacement.replaceAll( "\\\\", "\\\\\\\\" );
+        replacement = replacement.replaceAll( "\\\\", "\\\\\\\\" );
+        if ( winPath ) {
+            replacement = replacement.replaceAll("\\\\","\\\\\\\\");
+        }
+        this.replacement = replacement;
     }
 
@@ -190 +221 @@
     }
 
+    public RegexSearchReplaceJob createJob() {
+        RegexSearchReplaceJob job = new RegexSearchReplaceJob();
+        if ( jobs == null ) {
+            jobs = new ArrayList();
+        }
+        jobs.add( job );
+        return job;
+
+    }
 
 }