Changeset 313 for trunk/src/org/expeditee/agents/SearchGreenstone.java

Timestamp:

09/23/08 15:05:41 (16 years ago)

Author:

ra33

Message:

Added more features to the Greenstone Search

File:

• trunk/src/org/expeditee/agents/SearchGreenstone.java (modified) (12 diffs)

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

@@ -1 +1 @@
 package org.expeditee.agents;
 
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Vector;
 
@@ -12 +12 @@
 import org.expeditee.greenstone.ResultDocument;
 import org.expeditee.gui.AttributeValuePair;
+import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameCreator;
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Text;
 
 public class SearchGreenstone extends SearchAgent {
 
+        private static String _fullCaseSearchQuery = null;
+
         private static boolean _doCasefolding = true;
 
@@ -27 +32 @@
         private static String _maxResults = "10";
 
+        private static boolean _showAbstract = false;
+        private static boolean _showKeywords = false;
+        private static boolean _showAuthors = false;
+        private static boolean _showDate = false;
+
+        private String _thisMaxResults = "10";
+
         private int _indexChoice = 1;
 
@@ -35 +47 @@
         private static String[] _indexKeys = { "TX", "TI", "JO", "BO", "CR", "KE" };
 
-        protected static Vector<Result> _currentResultSet;
+        protected static Vector<Result> _currentResultSet = null;
+
+        private boolean _useLastSearchResults = false;
+
+        /**
+         * dateMap is a hash table. The keys are year values. the data associated
+         * with each key is a Vector of document IDs therefore, for the current
+         * result set you can get the set of years in which the results were
+         * published, and for each year you can get the set of documents published
+         * in that year
+         * 
+         * If you want to introduce additional mappings (eg document written by
+         * authors) you should introduce additional structures here (HashMap used in
+         * the same way as dateMap will probably suffice
+         * 
+         */
+        protected static Map<String, Vector<String>> _dateMap = new HashMap<String, Vector<String>>();
+
+        protected static Map<Integer, Vector<String>> _pageCountMap = new HashMap<Integer, Vector<String>>();
+
+        protected static Map<String, String> _titleMap = new HashMap<String, String>();
+
+        public SearchGreenstone(int resultsCount, String searchText) {
+                super(searchText);
+                _thisMaxResults = resultsCount + "";
+                _fullCaseSearchQuery = searchText;
+        }
 
         public SearchGreenstone(String searchText) {
                 super(searchText);
-        }
-
-        public SearchGreenstone(int resultsCount, String searchText) {
-                this(searchText);
-                _maxResults = resultsCount + "";
+                _thisMaxResults = _maxResults;
+                _fullCaseSearchQuery = searchText;
+        }
+
+        public SearchGreenstone() {
+                super(null);
+                _useLastSearchResults = true;
         }
 
@@ -61 +101 @@
                         if (attribute.equals("campus"))
                                 _locationChoice = 0;
-                        if (attribute.equals("autoconnect"))
+                        else if (attribute.equals("autoconnect"))
                                 connect();
 
-                        if (attribute.equals("maxresults")) {
+                        else if (attribute.equals("maxresults")) {
                                 try {
                                         _maxResults = avp.getValue();
@@ -71 +111 @@
                         }
 
-                        if (attribute.equals("dostemming"))
+                        else if (attribute.equals("dostemming"))
                                 _doStemming = true;
+                        else if (attribute.startsWith("showabstract"))
+                                _showAbstract = true;
+                        else if (attribute.startsWith("showauthor"))
+                                _showAuthors = true;
+                        else if (attribute.startsWith("showkeyword"))
+                                _showKeywords = true;
+                        else if (attribute.startsWith("showdate"))
+                                _showDate = true;
                 }
         }
@@ -83 +131 @@
         @Override
         protected Frame process(Frame frame) {
-                _results.setTitle("SearchGreenstone [" + _pattern + "]");
-
-                connect();
-
-                doQuery(_pattern);
+                String resultsTitle = this.getClass().getSimpleName() + "["
+                                + _fullCaseSearchQuery + "]";
+                _results.setTitle(resultsTitle);
+
+                if (!_useLastSearchResults) {
+                        connect();
+                        doQuery(_pattern);
+                } else if (_currentResultSet != null) {
+                        Text newText = DisplayIO.getCurrentFrame().createNewText(
+                                        _fullCaseSearchQuery);
+                        _clicked = newText;
+                        FrameMouseActions.pickup(newText);
+                }
+
+                if (_currentResultSet == null) {
+                        MessageBay.errorMessage("Could not find Greenstone query text");
+                        return null;
+                }
 
                 createResults();
-                
+
                 _results.save();
 
                 String resultFrameName = _results.getName();
-                if (_clicked != null)
+                if (_clicked != null) {
                         _clicked.setLink(resultFrameName);
+                        _clicked.setText(resultsTitle);
+                }
 
                 return _results.getFirstFrame();
@@ -104 +167 @@
         }
 
+        /**
+         * TODO make this more efficient so the maps are loaded on demand...
+         * 
+         * @param queryText
+         */
         protected void doQuery(String queryText) {
+                _pageCountMap.clear();
+                _dateMap.clear();
+                _titleMap.clear();
+
                 Query query = createQuery(queryText);
                 QueryOutcome queryOutcome = _gsdl.issueQueryToServer(query);
@@ -113 +185 @@
 
                 Query query = new Query();
-
                 // set the query options
                 query.setQueryText(queryText);
-
                 query.setIndex(_indexKeys[_indexChoice]);
-                query.setMaxDocsToReturn(_maxResults);
+                query.setMaxDocsToReturn(_thisMaxResults);
 
                 if (_doStemming) {
@@ -138 +208 @@
 
                 Vector<Result> results = queryOutcome.getResults();
-                for (Enumeration<Result> e = results.elements(); e.hasMoreElements();) {
-                        Result result = e.nextElement();
+                for (Result result : results) {
                         getResultMetadata(result);
                 }
@@ -193 +262 @@
                         ResultDocument rd = _gsdl.getDocument(docID);
                         int docRank = result.getRank();
-                        // Put the details on a separate frame
-                        FrameCreator details = new FrameCreator(rd.getTitle());
-                        details.addText(getDetails(rd), null, null, null, true);
-
-                        resultsCreator.addText((docRank + 1) + ". " + rd.getTitle(), null,
-                                        details.getName(), "getTextFromChildFrame", false);
-
-                        FrameGraphics.requestRefresh(true);
+
+                        addText(rd, resultsCreator, (docRank + 1) + ". " + rd.getTitle());
                 }
         }
@@ -252 +315 @@
         }
 
+        @Override
+        public Frame getResultFrame() {
+                if (_useLastSearchResults && _currentResultSet == null)
+                        return null;
+
+                return super.getResultFrame();
+        }
+
+        protected void addText(ResultDocument rd, FrameCreator results, String text) {
+                // Put the details on a separate frame
+                FrameCreator details = new FrameCreator(rd.getTitle());
+                details.addText(getDetails(rd), null, null, null, true);
+
+                if (_showDate && rd.metadataExists("Date"))
+                        text += ", " + rd.getDate();
+                
+                if (_showAbstract && rd.metadataExists("Abstract"))
+                        text += "\n  " + rd.getAbstract();
+                
+                if (_showAuthors && rd.metadataExists("Creator"))
+                        text += "\nAuthors" + rd.getAuthors().toString();
+                
+                if (_showKeywords && rd.getKeywords().size() > 0)
+                        text += "\nKeywords" + rd.getKeywords().toString();
+
+                results.addText(text, null, details.getName(), "getTextFromChildFrame",
+                                false);
+
+                FrameGraphics.requestRefresh(true);
+        }
+
 }