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

Timestamp:

11/02/08 13:05:01 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/agents

Files:

• DisplayGreenstoneSession.java (added)
• Format.java (modified) (3 diffs)
• SearchAgent.java (modified) (6 diffs)
• SearchFrameset.java (moved) (moved from trunk/src/org/expeditee/agents/SearchFramesetFast.java ) (3 diffs)
• SearchFramesetAndReplace.java (added)
• SearchGreenstone.java (modified) (11 diffs)
• SearchTree.java (moved) (moved from trunk/src/org/expeditee/agents/SearchTreeFast.java ) (5 diffs)
• SearchTreeAndReplace.java (added)
• SpellcheckTree.java (added)
• wordprocessing/JSpellChecker.java (modified) (8 diffs)

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

@@ -5 +5 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 
@@ -45 +46 @@
         @Override
         public Frame process(Frame start) {
-                //TODO What will happen if user runs the SIMPLE form of this...
-                //Does format box need to be disabled?!?!
-                //Check the position of the cursor and only format stuff inside the same box as the cursor
+                // TODO What will happen if user runs the SIMPLE form of this...
+                // Does format box need to be disabled?!?!
+                // Check the position of the cursor and only format stuff inside the
+                // same box as the cursor
                 Collection<Text> itemsToFormat = FrameUtils.getCurrentTextItems();
-                if(itemsToFormat.size() < 1){
+
+                // If the cursor is not inside a box...
+                if (itemsToFormat.size() < 1) {
+                        // Add all the items that are in free space
                         itemsToFormat = start.getBodyTextItems(true);
+                        // Remove all the enclosed items
+                        Collection<Item> seen = new HashSet<Item>();
+                        for (Item i : start.getVisibleItems()) {
+                                if (!seen.contains(i) && i.isEnclosed()) {
+                                        seen.addAll(i.getEnclosingDots());
+                                        itemsToFormat.removeAll(i.getEnclosedItems());
+                                }
+                        }
                 }
-                
+
                 ArrayList<Item> columnHeads = new ArrayList<Item>();
 
@@ -175 +188 @@
                         overwriteMessage("Formatting complete.");
         }
-        
+
         @Override
         protected void message(String message) {

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

@@ -1 +1 @@
 package org.expeditee.agents;
+
+import java.util.Collection;
 
 import org.expeditee.gui.Frame;
@@ -24 +26 @@
 
         public SearchAgent(String searchText) {
-                _pattern = searchText.toLowerCase();
+                if (searchText != null)
+                        _pattern = searchText.toLowerCase();
         }
 
@@ -39 +42 @@
                                         false);
                 }
-                return initialise(frame, item, frame.getFramesetName(), resultFrameset,
+                return initialise(frame, item, getSearchDescription(frame), resultFrameset,
                                 null, pattern);
+        }
+
+        /**
+         * @param frame
+         * @return
+         */
+        protected String getSearchDescription(Frame frame) {
+                return frame.getFramesetName();
         }
 
@@ -56 +67 @@
         public boolean initialise(Frame frame, Item item, String startName,
                         String resultsFrameset, String replacementString, String pattern) {
-                //TODO: Put the init params in the constructor!! Dont want to be setting _pattern in two places!
-                
+                // TODO: Put the init params in the constructor!! Dont want to be
+                // setting _pattern in two places!
+
                 if (_pattern == null)
                         _pattern = pattern.toLowerCase();
@@ -66 +78 @@
                 // and type as the title
                 String title = this.getClass().getSimpleName() + " [" + startName
-                                + "] [" + _pattern + "]";
-                _results = new FrameCreator(resultsFrameset, FrameIO.FRAME_PATH, title, false, true);
+                                + "]"+getResultsTitleSuffix();
+                _results = new FrameCreator(resultsFrameset, FrameIO.FRAME_PATH, title,
+                                false, true);
                 // Set the frame to be displayed after running the agent
                 _end = _results.getFirstFrame();
 
                 return super.initialise(frame, item);
+        }
+
+        protected String getResultsTitleSuffix() {
+                return " [" + _pattern + "]";
         }
 
@@ -111 +128 @@
                 return true;
         }
+        
+        protected int addResults(String frameName, Collection<String> found) {
+                return addResults(frameName, frameName, found);
+        }
+        
+        /**
+         * @param frameNumber
+         * @param frameName
+         * @param found
+         * @return
+         */
+        protected int addResults(String frameNumber, String frameName, Collection<String> found) {
+                int size = found == null ? 0 : found.size();
+                // If the frame exists
+                if (found != null)
+                        _frameCount++;
+                if (size > 0) {
+                        // String repeats = size > 1? ("("+ size+ ")") : "";
+                        for (String s : found) {
+                                StringBuffer surrogate = new StringBuffer();
+                                surrogate.append("[").append(frameNumber).append("] ");
+                                if (s.length() > SearchAgent.SURROGATE_LENGTH)
+                                        surrogate.append(
+                                                        s.substring(0, SearchAgent.SURROGATE_LENGTH - 3))
+                                                        .append("...");
+                                else {
+                                        surrogate.append(s);
+                                }
+
+                                _results.addText(surrogate.toString(), null,
+                                                frameName, null, false);
+                                FrameGraphics.requestRefresh(true);
+                        }
+                }
+                return size;
+        }
 }

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

@@ -4 +4 @@
 
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 
-public class SearchFramesetFast extends SearchAgent {
+public class SearchFrameset extends SearchAgent {
         private long _firstFrame = 1;
 
         private long _maxFrame = Integer.MAX_VALUE;
 
-        public SearchFramesetFast(long firstFrame, long maxFrame, String searchText) {
+        public SearchFrameset(long firstFrame, long maxFrame, String searchText) {
                 this(searchText);
                 _firstFrame = firstFrame;
@@ -18 +17 @@
         }
 
-        public SearchFramesetFast(String searchText) {
+        public SearchFrameset(String searchText) {
                 super(searchText);
         }
@@ -38 +37 @@
                         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+ ")") : "";
-                                for (String s : found) {
-                                        StringBuffer surrogate = new StringBuffer();
-                                        surrogate.append("[").append(i).append("] ");
-                                        if (s.length() > SearchAgent.SURROGATE_LENGTH)
-                                                surrogate.append(
-                                                                s.substring(0, SearchAgent.SURROGATE_LENGTH - 3))
-                                                                .append("...");
-                                        else {
-                                                surrogate.append(s);
-                                        }
-
-                                        _results.addText(surrogate.toString(), null,
-                                                        frameName, null, false);
-                                        FrameGraphics.requestRefresh(true);
-                                }
-                        }
+                        addResults(i + "", frameName, found);
                 }
                 _results.save();

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

@@ -1 +1 @@
 package org.expeditee.agents;
 
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -30 +29 @@
         protected static Greenstone3Connection _gsdl = null;
 
+        public static Greenstone3Connection getConnection() {
+                return _gsdl;
+        }
+
         private static String _maxResults = "10";
 
@@ -84 +87 @@
         }
 
+        public SearchGreenstone(int resultsCount) {
+                this(null);
+                _thisMaxResults = resultsCount + "";
+        }
+
         public SearchGreenstone() {
                 super(null);
@@ -113 +121 @@
                         else if (attribute.equals("autoconnect"))
                                 connect();
-
                         else if (attribute.equals("maxresults")) {
                                 try {
@@ -119 +126 @@
                                 } catch (Exception e) {
                                 }
-                        }
-
-                        else if (attribute.equals("dostemming"))
+                        } else if (attribute.equals("dostemming"))
                                 _doStemming = true;
                         else if (attribute.startsWith("showabstract"))
@@ -139 +144 @@
         }
 
+        protected String getResultsTitle() {
+                return this.getClass().getSimpleName() + "[" + getCursorText() + "]";
+        }
+
         @Override
         protected Frame process(Frame frame) {
-                String resultsTitle = this.getClass().getSimpleName() + "["
-                                + _fullCaseSearchQuery + "]";
+                String resultsTitle = getResultsTitle();
                 _results.setTitle(resultsTitle);
 
@@ -150 +158 @@
                 } else if (_currentResultSet != null) {
                         Text newText = DisplayIO.getCurrentFrame().createNewText(
-                                        _fullCaseSearchQuery);
+                                        getCursorText());
                         _clicked = newText;
                         FrameMouseActions.pickup(newText);
                 }
 
-                if (_currentResultSet == null) {
-                        MessageBay.errorMessage("Could not find Greenstone query text");
+                if (_currentResultSet == null || _currentResultSet.size() == 0) {
+                        MessageBay.errorMessage(getNoResultsMessage());
                         return null;
                 }
@@ -171 +179 @@
 
                 return _results.getFirstFrame();
+        }
+
+        protected String getNoResultsMessage() {
+                return "Could not find Greenstone query text";
+        }
+
+        /**
+         * @return
+         */
+        protected String getCursorText() {
+                return _fullCaseSearchQuery;
         }
 
@@ -189 +208 @@
                 Query query = createQuery(queryText);
                 QueryOutcome queryOutcome = _gsdl.issueQueryToServer(query);
-                _currentResultSet = getResultSetMetadata(queryOutcome);
+                if (queryOutcome != null)
+                        _currentResultSet = getResultSetMetadata(queryOutcome);
         }
 
@@ -281 +301 @@
 
                 if (rd.metadataExists("Title")) {
-                        resultText.append("title = " + rd.getTitle()).append('\n');
+                        resultText.append("title: " + rd.getTitle()).append('\n');
                 }
                 if (rd.metadataExists("Date")) {
-                        resultText.append("date = " + rd.getDate()).append('\n');
+                        resultText.append("date: " + rd.getDate()).append('\n');
                 }
                 if (rd.metadataExists("Booktitle")) {
-                        resultText.append("booktitle = " + rd.getBooktitle()).append('\n');
+                        resultText.append("booktitle: " + rd.getBooktitle()).append('\n');
                 }
                 if (rd.metadataExists("Pages")) {
-                        resultText.append("pages = " + rd.getPages()).append('\n');
+                        resultText.append("pages: " + rd.getPages()).append('\n');
                 }
                 if (rd.metadataExists("Journal")) {
-                        resultText.append("journal = " + rd.getJournal()).append('\n');
+                        resultText.append("journal: " + rd.getJournal()).append('\n');
                 }
                 if (rd.metadataExists("Volume")) {
-                        resultText.append("volume = " + rd.getVolume()).append('\n');
+                        resultText.append("volume: " + rd.getVolume()).append('\n');
                 }
                 if (rd.metadataExists("Number")) {
-                        resultText.append("number = " + rd.getNumber()).append('\n');
+                        resultText.append("number: " + rd.getNumber()).append('\n');
                 }
                 if (rd.metadataExists("Editor")) {
-                        resultText.append("editor = " + rd.getEditor()).append('\n');
+                        resultText.append("editor: " + rd.getEditor()).append('\n');
                 }
                 if (rd.metadataExists("Publisher")) {
-                        resultText.append("publisher = " + rd.getPublisher()).append('\n');
+                        resultText.append("publisher: " + rd.getPublisher()).append('\n');
                 }
                 if (rd.metadataExists("Abstract")) {
-                        resultText.append("abstract = " + rd.getAbstract()).append('\n');
-                }
-                Vector<String> authors = rd.getAuthors();
-                for (Enumeration a = authors.elements(); a.hasMoreElements();) {
-                        String author = (String) a.nextElement();
-                        resultText.append("author = " + author).append('\n');
-                }
-                Vector<String> keywords = rd.getKeywords();
-                for (Enumeration k = keywords.elements(); k.hasMoreElements();) {
-                        String keyword = (String) k.nextElement();
-                        resultText.append("keyword = " + keyword).append('\n');
-                }
+                        resultText.append("abstract: " + rd.getAbstract()).append('\n');
+                }
+                for (String author : rd.getAuthors()) {
+                        resultText.append("author: " + author).append('\n');
+                }
+
+                for (String keyword : rd.getKeywords()) {
+                        resultText.append("keyword: " + keyword).append('\n');
+                }
+
                 resultText.deleteCharAt(resultText.length() - 1);
 
@@ -356 +374 @@
         }
 
+        public static void clearSession() {
+                getConnection().getSessionResults().clear();
+                _currentResultSet = null;
+        }
+
 }

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

@@ -11 +11 @@
 import java.util.Map;
 
+import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.UserSettings;
 import org.expeditee.io.Conversion;
 
-public class SearchTreeFast extends SearchAgent {
+public class SearchTree extends SearchAgent {
         private Map<String, Collection<String>> _searchResults = new HashMap<String, Collection<String>>();
 
-        public SearchTreeFast(String searchText) {
+        public SearchTree(String searchText) {
                 super(searchText);
         }
-        
+
         @Override
         protected Frame process(Frame frame) {
-                if(frame == null)
+                if (frame == null)
                         frame = FrameIO.LoadFrame(_startName);
-                
-                searchTree(frame.getName(), _pattern, _searchResults, new HashSet<String>());
-                
+
+                searchTree(frame.getName(), _searchResults, new HashSet<String>());
                 _results.save();
 
@@ -36 +35 @@
                 if (_clicked != null)
                         _clicked.setLink(resultFrameName);
-                
+
                 return _results.getFirstFrame();
         }
-        
+
+        @Override
+        /**
+         * @param frame
+         * @return
+         */
+        protected String getSearchDescription(Frame frame) {
+                return frame.getName();
+        }
+
         /**
          * Returns a list of the frames searched and any matches on those frames.
-         * @param frameName the name of the top not in the tree of frames to search
-         * @param pattern the pattern to search for
-         * @param results a list of frames on which matches were found and the text that matched the pattern
-         * @param visited a list of the frames that were visited in the searchTree
+         * 
+         * @param frameName
+         *            the name of the top not in the tree of frames to search
+         * @param pattern
+         *            the pattern to search for
+         * @param results
+         *            a list of frames on which matches were found and the text that
+         *            matched the pattern
+         * @param visited
+         *            a list of the frames that were visited in the searchTree
          */
-        public void searchTree(String frameName, String pattern, Map<String, Collection<String>> results, Collection<String> visited) {
-                //Check if this node has already been visited
-                if(visited.contains(frameName))
+        public void searchTree(String frameName,
+                        Map<String, Collection<String>> results, Collection<String> visited) {
+                // Check if this node has already been visited
+                if (visited.contains(frameName))
                         return;
-                
+
                 visited.add(frameName);
-                
+
                 String fullPath = null;
                 for (String possiblePath : UserSettings.FrameDirs) {
@@ -64 +79 @@
                 if (fullPath == null)
                         return;
-                
+
                 _frameCount++;
                 overwriteMessage("Searching " + frameName);
-                
+
                 String frameset = Conversion.getFramesetName(frameName);
-                
+
                 Collection<String> frameResults = new LinkedList<String>();
                 // Open the file and search the text items
@@ -75 +90 @@
                         BufferedReader reader = new BufferedReader(new FileReader(fullPath));
                         String next;
+                        StringBuffer sb = new StringBuffer();
+                        String link = null;
+                        boolean ignore = false;
+
                         while (reader.ready() && ((next = reader.readLine()) != null)) {
-                                if (next.startsWith("T")) {
-                                        String toSearch = next.substring(2);
-                                        if (toSearch.toLowerCase().contains(pattern))
-                                                frameResults.add(toSearch);
-                                }else if (next.startsWith("F")) {
-                                        String link = next.substring(2);
-                                        if(!FrameIO.isValidFrameName(link))
+
+                                if (next.length() == 0) {
+                                        // Ignore annotations
+                                        if (ignore) {
+                                                ignore = false;
+                                                link = null;
+                                                continue;
+                                        }
+
+                                        // Ignore non text items
+                                        if (sb.length() == 0) {
+                                                link = null;
+                                                continue;
+                                        }
+
+                                        String toSearch = sb.substring(0, sb.length() - 1);
+                                        String resultSurrogate = getResultSurrogate(toSearch);
+                                        if (resultSurrogate != null) {
+                                                frameResults.add(resultSurrogate);
+                                        }
+
+                                        if (link != null) {
+                                                searchTree(link, results, visited);
+                                        }
+
+                                        // Reinit the item variables
+                                        link = null;
+                                        sb = new StringBuffer();
+
+                                } else if (ignore) {
+                                        continue;
+                                } else if (next.startsWith("T")) {
+                                        String text = next.substring(2).trim();
+                                        // Ignore the rest of annotation items...
+                                        if (text.length() > 0
+                                                        && text.charAt(0) == AttributeValuePair.ANNOTATION_CHAR) {
+                                                ignore = true;
+                                                continue;
+                                        }
+                                        sb.append(text).append('\n');
+                                } else if (next.startsWith("F")) {
+                                        link = next.substring(2);
+                                        // Convert number only links
+                                        if (Character.isDigit(link.charAt(0)))
                                                 link = frameset + link;
-                                        searchTree(link, pattern, results, visited);
                                 }
                         }
-                        //Only add the results if a match was found on the frame
-                        if(frameResults.size() > 0){
+                        // Only add the results if a match was found on the frame
+                        if (frameResults.size() > 0) {
                                 results.put(frameName, frameResults);
                         }
@@ -97 +152 @@
                 }
                 int size = frameResults.size();
-                if(size > 0){
-                        String repeats = size > 1? ("("+ size+ ")") : "";
-                        _results.addText(frameName + repeats, null, frameName, null, false);
-                        FrameGraphics.requestRefresh(true);
+                if (size > 0) {
+                        addResults(frameName, frameResults);
+
+                        // String repeats = size > 1 ? ("(" + size + ")") : "";
+                        // _results.addText(frameName + repeats, null, frameName, null,
+                        // false);
+                        // FrameGraphics.requestRefresh(true);
                 }
         }
+
+        protected String getResultSurrogate(String toSearch) {
+                if (toSearch.toLowerCase().contains(_pattern))
+                        return toSearch;
+                return null;
+        }
 }

trunk/src/org/expeditee/agents/wordprocessing/JSpellChecker.java

@@ -1 +1 @@
 package org.expeditee.agents.wordprocessing;
 
+import java.awt.Color;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -8 +9 @@
 import java.util.List;
 
+import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.MessageBay;
+import org.expeditee.items.Text;
 
 import com.swabunga.spell.engine.Configuration;
@@ -59 +63 @@
         public static JSpellChecker _theInstance = null;
 
-        public static JSpellChecker getInstance() throws FileNotFoundException, IOException {
+        public static JSpellChecker getInstance() throws FileNotFoundException,
+                        IOException {
                 if (_theInstance == null) {
                         create();
@@ -66 +71 @@
         }
 
+        public static void create(Frame frame) throws FileNotFoundException,
+                        IOException {
+                if(_theInstance == null)
+                        _theInstance = new JSpellChecker();
+                _theInstance.init();
+
+                if (frame != null) {
+                        for (Text t : frame.getBodyTextItems(false)) {
+                                for (String s : t.getText().split(" ")) {
+                                        _theInstance.checker.addToDictionary(s);
+                                }
+                        }
+                }
+        }
+
         public static void create() throws FileNotFoundException, IOException {
-                _theInstance = new JSpellChecker();
-                _theInstance.init();
-        }
-
-        public static String dictFile = FrameIO.PARENT_FOLDER + "dict/english.0";
+                create(null);
+        }
+
+        public static String dictDirectory = FrameIO.PARENT_FOLDER + "dict/";
 
         public JSpellChecker() {
@@ -79 +98 @@
         public void init() throws FileNotFoundException, IOException {
                 log(this.hashCode() + ": JSpellChecker.init");
+                MessageBay.displayMessage("Loading spell checker...");
 
                 checker = new SpellChecker();
-
-                checker.addDictionary(new SpellDictionaryHashMap(new File(dictFile)));
+                SpellDictionaryHashMap dictionaryHashMap = new SpellDictionaryHashMap();
+
+                for (File dict : new File(dictDirectory).listFiles()) {
+                        dictionaryHashMap.addDictionary(dict);
+                }
+
+                checker.addDictionary(dictionaryHashMap);
 
                 initialized = true;
+
+                MessageBay.displayMessage("Spell checker Loaded", Color.green.darker());
         }
 
@@ -97 +124 @@
                 checker.addSpellCheckListener(listener);
                 checker.reset();
+                event = null;
         }
 
@@ -137 +165 @@
 
                 }
-                
-                if(s.length() == 0){
+
+                if (s.length() == 0) {
                         return "No suggestions";
                 }
@@ -146 +174 @@
                 // + "|";
                 // }
-                return s.substring(0, s.length()-1);
+                return s.substring(0, s.length() - 1);
         }