Changeset 382

Timestamp:

11/10/08 14:07:37 (16 years ago)

Author:

ra33

Message:

update greenstone3 class to use types maps and arrays

Location:

trunk/src/org/expeditee

Files:

• greenstone/Greenstone3Connection.java (modified) (10 diffs)
• io/HTMLWriter.java (modified) (1 diff)

trunk/src/org/expeditee/greenstone/Greenstone3Connection.java

@@ -11 +11 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -47 +48 @@
 public class Greenstone3Connection {
         /** an ordered list of {@link Query} objects */
-        private List queryList;
+        private List<Query> queryList;
 
         /**
@@ -60 +61 @@
          * with each item being NULL.
          */
-        private Map allKeywords;
-
-        /**
-         * a HashMap keyed on the author names found for all documents returned in
-         * this session. Each item in the map is itself a HashMap, keyed on document
-         * IDs with each item being NULL.
-         */
-        private Map allAuthors;
+        private Map<String, Set<String>> allKeywords;
+
+        /**
+         * a set of authors names
+         */
+        private Map<String, Set<String>> allAuthors;
 
         /**
@@ -74 +73 @@
          * document IDs with each item being NULL.
          */
-        private Map allDates;
+        private Map<String, Set<String>> allDates;
 
         /**
@@ -81 +80 @@
          * IDs with each item being NULL.
          */
-        private Map allJournals;
+        private Map<String, Set<String>> allJournals;
 
         /**
@@ -88 +87 @@
          * IDs with each item being NULL.
          */
-        private Map allBooktitles;
+        private Map<String, Set<String>> allBooktitles;
 
         /** the <i>hostname</i> where the Greenstone 3 server is running */
@@ -155 +154 @@
                         this.SOAPrequestHeader = "POST /greenstone3/services/localsite HTTP/1.1\nHost: 130.217.220.10:8111\nSOAPAction: hcibib/PROCESSNAME\nContent-Type: text/xml;charset=utf-8\nContent-Length: ";
                 }
-                this.queryList = Collections.synchronizedList(new ArrayList());
+                this.queryList = Collections.synchronizedList(new ArrayList<Query>());
                 this.allResults = Collections
                                 .synchronizedMap(new HashMap<String, ResultDocument>());
-                this.allKeywords = Collections.synchronizedMap(new HashMap());
-                this.allAuthors = Collections.synchronizedMap(new HashMap());
-                this.allDates = Collections.synchronizedMap(new HashMap());
-                this.allJournals = Collections.synchronizedMap(new HashMap());
-                this.allBooktitles = Collections.synchronizedMap(new HashMap());
+                this.allKeywords = Collections.synchronizedMap(new HashMap<String, Set<String>>());
+                this.allAuthors = Collections
+                                .synchronizedMap(new HashMap<String, Set<String>>());
+                this.allDates = Collections.synchronizedMap(new HashMap<String, Set<String>>());
+                this.allJournals = Collections.synchronizedMap(new HashMap<String, Set<String>>());
+                this.allBooktitles = Collections.synchronizedMap(new HashMap<String, Set<String>>());
         }
 
@@ -572 +572 @@
                                         String s = keywords[i].trim().toLowerCase();
                                         resultDocument.addKeyword(s);
-                                        if (allKeywords.containsKey(s)) {
-                                                HashMap docMap = (HashMap) allKeywords.get(s);
-                                                docMap.put(docID, null);
-                                                allKeywords.put(s, docMap);
-                                        } else {
-                                                HashMap docMap = new HashMap();
-                                                docMap.put(docID, null);
-                                                allKeywords.put(s, docMap);
+                                        Set<String> docSet = allKeywords.get(metadataval);
+                                        if (docSet == null) {
+                                                docSet = new HashSet<String>();
                                         }
+                                        docSet.add(docID);
+                                        allKeywords.put(metadataval, docSet);
                                 }
                         } else if (metadata.compareTo("Creator") == 0) {
@@ -606 +603 @@
                                         // System.err.println(s);
                                         resultDocument.addAuthor(s);
-                                        if (allAuthors.containsKey(s)) {
-                                                HashMap docMap = (HashMap) allAuthors.get(s);
-                                                docMap.put(docID, null);
-                                                allAuthors.put(s, docMap);
-                                        } else {
-                                                HashMap docMap = new HashMap();
-                                                docMap.put(docID, null);
-                                                allAuthors.put(s, docMap);
+
+                                        Set<String> docSet = allAuthors.get(s);
+                                        if (docSet == null) {
+                                                docSet = new HashSet<String>();
                                         }
+                                        docSet.add(docID);
+                                        allAuthors.put(s, docSet);
                                 }
                         } else if (metadata.compareTo("Title") == 0) {
@@ -620 +615 @@
                         } else if (metadata.compareTo("Booktitle") == 0) {
                                 resultDocument.setBooktitle(metadataval);
-                                if (allBooktitles.containsKey(metadataval)) {
-                                        HashMap docMap = (HashMap) allBooktitles.get(metadataval);
-                                        docMap.put(docID, null);
-                                        allBooktitles.put(metadataval, docMap);
-                                } else {
-                                        HashMap docMap = new HashMap();
-                                        docMap.put(docID, null);
-                                        allBooktitles.put(metadataval, docMap);
+                                
+                                Set<String> docSet = allBooktitles.get(metadataval);
+                                if (docSet == null) {
+                                        docSet = new HashSet<String>();
                                 }
+                                docSet.add(docID);
+                                allBooktitles.put(metadataval, docSet);
                         } else if (metadata.compareTo("Date") == 0) {
                                 resultDocument.setDate(metadataval.replaceAll("[^0-9]", ""));
-                                if (allDates.containsKey(metadataval)) {
-                                        HashMap docMap = (HashMap) allDates.get(metadataval);
-                                        docMap.put(docID, null);
-                                        allDates.put(metadataval, docMap);
-                                } else {
-                                        HashMap docMap = new HashMap();
-                                        docMap.put(docID, null);
-                                        allDates.put(metadataval, docMap);
+                                Set<String> docSet = allDates.get(metadataval);
+                                if (docSet == null) {
+                                        docSet = new HashSet<String>();
                                 }
+                                docSet.add(docID);
+                                allDates.put(metadataval, docSet);
                         } else if (metadata.compareTo("Pages") == 0) {
                                 resultDocument.setPages(metadataval);
                         } else if (metadata.compareTo("Journal") == 0) {
                                 resultDocument.setJournal(metadataval);
-                                if (allJournals.containsKey(metadataval)) {
-                                        HashMap docMap = (HashMap) allJournals.get(metadataval);
-                                        docMap.put(docID, null);
-                                        allJournals.put(metadataval, docMap);
-                                } else {
-                                        HashMap docMap = new HashMap();
-                                        docMap.put(docID, null);
-                                        allJournals.put(metadataval, docMap);
+                                Set<String> docSet = allJournals.get(metadataval);
+                                if (docSet == null) {
+                                        docSet = new HashSet<String>();
                                 }
+                                docSet.add(docID);
+                                allJournals.put(metadataval, docSet);
                         } else if (metadata.compareTo("Volume") == 0) {
                                 resultDocument.setVolume(metadataval);

trunk/src/org/expeditee/io/HTMLWriter.java

@@ -12 +12 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
-
-import sun.awt.image.ToolkitImage;
 
 public class HTMLWriter extends AbstractHTMLWriter {