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

Timestamp:

07/28/08 16:35:49 (16 years ago)

Author:

ra33

Message:

Added faster search tree

Location:

trunk/src/org/expeditee/agents

Files:

• SearchFramesetFast.java (modified) (2 diffs)
• SearchFramesetNoResults.java (modified) (2 diffs)
• SearchTreeFast.java (added)
• SearchTreeNoResults.java (added)

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

@@ -23 +23 @@
         protected Frame process(Frame frame) {
                 String path = frame.path;
-                _frameCount = FrameIO.getLastNumber(frame.getName());
-                for (long i = _firstFrame;i <= _maxFrame && i < _frameCount; i++) {
+                int count = FrameIO.getLastNumber(frame.getName());
+                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
                         if (_stop) {
                                 break;
@@ -32 +32 @@
                         Collection<String> found = FrameIO.searchFrame(frameName, _pattern, path);
                         int size = found == null? 0 :found.size();
+                        //If the frame exists
+                        if(found != null)
+                                _frameCount++;
                         if(size > 0){
                                 String repeats = size > 1? ("("+ size+ ")") : "";

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

@@ -25 +25 @@
         protected Frame process(Frame frame) {
                 String path = frame.path;
-                _frameCount = FrameIO.getLastNumber(frame.getFramesetName());
-                for (long i = _firstFrame;i <= _maxFrame && i < _frameCount; i++) {
+                int count = FrameIO.getLastNumber(frame.getFramesetName());
+                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
                         if (_stop) {
                                 break;
@@ -33 +33 @@
                         Collection<String> found = FrameIO.searchFrame(frameName, _pattern, path);
                         int size = found == null? 0 :found.size();
+                        if(found!= null)
+                                _frameCount++;
                         if(size > 0){
                                 _results.put(frameName, found);