Changeset 176 for trunk/src/org/expeditee/actions/Simple.java

Timestamp:

07/30/08 14:53:21 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/actions/Simple.java (modified) (3 diffs)

trunk/src/org/expeditee/actions/Simple.java

@@ -21 +21 @@
 import org.expeditee.agents.SearchAgent;
 import org.expeditee.agents.SearchFrameset;
+import org.expeditee.agents.SearchFramesetFast;
 import org.expeditee.agents.SearchTree;
+import org.expeditee.agents.SearchTreeFast;
 import org.expeditee.agents.WriteTree;
 import org.expeditee.gui.AttributeUtils;
@@ -925 +927 @@
                                 long firstFrame = 1;
                                 long maxFrame = Long.MAX_VALUE;
-                                if(tokens.length > 7){
-                                        firstFrame = context.getPrimitives().getIntegerValue(tokens[7]);
-                                        if(tokens.length > 8){
-                                                maxFrame = context.getPrimitives().getIntegerValue(tokens[8]);
-                                        }
-                                }
-                                
-                                SearchAgent searchAgent = new SearchFrameset(firstFrame, maxFrame);
+                                if (tokens.length > 7) {
+                                        firstFrame = context.getPrimitives().getIntegerValue(
+                                                        tokens[7]);
+                                        if (tokens.length > 8) {
+                                                maxFrame = context.getPrimitives().getIntegerValue(
+                                                                tokens[8]);
+                                        }
+                                }
+
+                                SearchAgent searchAgent = null;
+
+                                // If replacement needs to be done... use the slow search for
+                                // now
+                                // The fast search does not do replacement
+                                if (bReplace) {
+                                        searchAgent = new SearchFrameset(firstFrame, maxFrame);
+                                } else {
+                                        searchAgent = new SearchFramesetFast(firstFrame, maxFrame);
+                                }
                                 searchAgent.initialise(null, null, frameset, resultsFrameset,
                                                 replacementString, pattern);
@@ -968 +981 @@
                                 String pattern = context.getPrimitives().getStringValue(
                                                 tokens[2]);
-                                SearchAgent searchAgent = new SearchTree();
+                                SearchAgent searchAgent = null;
+                                // If replacement needs to be done... use the slow search for
+                                // now The fast search does not do replacement
+                                if (bReplace) {
+                                        searchAgent = new SearchTree();
+                                } else {
+                                        searchAgent = new SearchTreeFast();
+                                }
                                 _agent = searchAgent;
                                 searchAgent.initialise(null, null, topFrameName,