Changeset 162 for trunk/src/org/expeditee/agents

Timestamp:

07/28/08 15:08:13 (16 years ago)

Author:

ra33

Message:

Added faster versions of search frameset

Location:

trunk/src/org/expeditee/agents

Files:

• SearchAgent.java (modified) (4 diffs)
• SearchFrameset.java (modified) (1 diff)
• SearchFramesetFast.java (added)
• SearchFramesetNoResults.java (added)

trunk/src/org/expeditee/agents/SearchAgent.java

@@ -11 +11 @@
 public abstract class SearchAgent extends DefaultAgent {
 
+        private static final String DEFAULT_RESULTS_FRAMESET = "SearchResults";
+        
         protected FrameCreator _results;
 
@@ -26 +28 @@
                 //TODO use a results frame specified on the profile frame
                 if (item.getLink() == null) {
-                        resultFrameset = frame.getFramesetName();
+                        resultFrameset = DEFAULT_RESULTS_FRAMESET;
                 } else {
                         resultFrameset = Conversion.getFramesetName(item.getAbsoluteLink(),
@@ -36 +38 @@
         public boolean initialise(Frame frame, Item item, String startName, String resultsFrameset,
                         String replacementString, String pattern) {
-                _pattern = pattern;
+                _pattern = pattern.toLowerCase();
                 _replacementString = replacementString;
                 _startName = startName;
@@ -58 +60 @@
                         String replacementString) {
                 String searchStr = itemToSearch.getText().toLowerCase();
-                String[] result = searchStr.split(pattern.toLowerCase(), 2);
-                boolean bFound = result.length > 1;
+                boolean bFound = searchStr.matches(pattern.toLowerCase());
                 // If it is a find and replace... then replace with the replacement
                 // string

trunk/src/org/expeditee/agents/SearchFrameset.java

@@ -5 +5 @@
 
 public class SearchFrameset extends SearchAgent {
+        private long _firstFrame = 1;
+        private long _maxFrame = Integer.MAX_VALUE;
+        
+        public SearchFrameset(long firstFrame, long maxFrame) {
+                _firstFrame = firstFrame;
+                _maxFrame = maxFrame;
+        }
+        
+        public SearchFrameset() {
+                super();
+        }
 
         @Override
         protected Frame process(Frame frame) {
                 int count = FrameIO.getLastNumber(_startName);
-                for (int i = 1; i < count; i++) {
+                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
                         if (_stop) {
                                 break;