Changeset 1831

Timestamp:

2001-01-11T16:17:07+13:00 (23 years ago)

Author:

paynter

Message:

Tidying code, rearranging initialisation code.

Location:

trunk/gsdl/src/phind/client

Files:

• Phind.java (modified) (10 diffs)
• ResultCanvas.java (modified) (3 diffs)

trunk/gsdl/src/phind/client/Phind.java

@@ -32 +32 @@
 
 <APPLET CODE="Phind.class" WIDTH=500 HEIGHT=500>
+
   <PARAM NAME=phindcgi    VALUE="http://kowhai/cgi-bin/phindcgi">
   <PARAM NAME=library     VALUE="http://kowhai/cgi-bin/library">
+
   <PARAM NAME=backdrop    VALUE="http://kowhai/~paynter/transfer/phindtest/green1.jpg">
+
   <PARAM NAME=collection  VALUE="fao.org">
+
   <PARAM NAME=orientation VALUE="vertical">
   <PARAM NAME=depth       VALUE="2">
+  <PARAM NAME=blocksize   VALUE="10">
+
   <PARAM NAME=fontsize    VALUE="12">
-  <PARAM NAME=blocksize   VALUE="10">
   The Phind java applet.
 </APPLET>
@@ -96 +101 @@
 public class Phind extends java.applet.Applet {
     
-    // elements of the page
-    Label titleLabel;
-    TextField wordField;
-    Button searchButton, prevButton, nextButton;
+    // What is the collection called?
+    public String collection;
+
+    // Internet address of phind resources
+    public String library_address, phindcgi_address;
+
+    // Number of phrases to retrieve at any one time
+    public int phraseBlockSize;
 
     // Appearance parameters
@@ -108 +117 @@
 
     // Do we want a background image in the applet?
-    String backdrop_address;
     public boolean showImage;
+    public String backdrop_address;
     public Image backgroundImage;
-
-    // Holders for the downloaded data
-    Panel resultPanel;
-    ResultDisplay firstDisplay, lastDisplay;
 
     // the mode of operation
@@ -122 +127 @@
     final int searchMode = 2;
 
-    // what to search for
-    String collection;
-    int phraseBlockSize;
-
-    //int stopwordLevel = 1;
-    //int lowFrequencyCutoff = 0;
-    //int stemming = 0;
-
-    // where to search
-    Socket connection;
-    String library_address, phindcgi_address;
-    URL library, phindcgi;
-
-    String search_url;
-
-    // browser details
-    String localHost;
+    // elements of the page
+    Label titleLabel;
+    TextField wordField;
+    Button searchButton, prevButton, nextButton;
+
+    // Holders for the downloaded data
+    Panel resultPanel;
+    ResultDisplay firstDisplay, lastDisplay;
 
     // The time at which the last query finished
@@ -166 +162 @@
   
     public String getAppletInfo() {
-    return "Phind by Gordon Paynter ([email protected]). Copyright 1997-2000.";
-    }
+    return "Phind by Gordon Paynter ([email protected]). Copyright 1997-2000.";
+    }
+
 
     public void init() {
 
-    // default search variable values 
     mode = initMode;
+    
+    // Default applet parameters
+    collection = "";
+    phindcgi_address = "";
+    library_address = "";
+    
+    showImage = false;
+    backdrop_address = "";
+ 
+    vertical = true;
+    depth = 3;
+
+    phraseBlockSize = 10;
+    fontSize = 12;
+
+    // Read applet parameters
+    getParameters();
+
+    
+    // Initialise the user interface
+    setBackground(Color.white);
     lastQueryEndTime = new Date();
+
+    // fonts used to output text
+    plainFont = new Font("Helvetica", Font.PLAIN, fontSize);
+    boldFont  = new Font("Helvetica", Font.BOLD, fontSize);
+
+    // The phind applet layout manager
+    setLayout(new BorderLayout());
+
+    // the Panel containing the displays is in the center of the display
+    resultPanel = new Panel();
+    if (vertical) {
+        resultPanel.setLayout(new GridLayout(depth,1,0,2));
+    } else {
+        System.out.println("horizontal");
+        resultPanel.setLayout(new GridLayout(1,depth,2,0));
+    }
+    add("Center", resultPanel);
+
+    // Create ResultDisplays and place in the interface
+    ResultDisplay d1, d2 = null;
+    firstDisplay = new ResultDisplay(this, null);
+    resultPanel.add(firstDisplay);
+
+    d1 = firstDisplay;
+    for (int i = 2; i <= depth; i++) {
+        d2 = new ResultDisplay(this, d1);
+        resultPanel.add(d2);
+        d1 = d2;
+    }
+        lastDisplay = d2;
+
+
+    // The "control panel" 
+    Panel p1 = new Panel();
+    add("North", p1);
+    p1.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+
+    searchButton = new Button("Search");
+    searchButton.setFont(boldFont);
+    p1.add(searchButton);
+
+    Label tempLabel = new Label("  for");
+    tempLabel.setFont(boldFont);
+    p1.add(tempLabel);
+
+    wordField = new TextField(12);
+    wordField.setFont(boldFont);
+    p1.add(wordField);
+
+    Label temp2 = new Label("          ");
+    p1.add(temp2);
+
+    prevButton = new Button("Previous");
+    prevButton.setFont(boldFont);
+    prevButton.disable();
+    p1.add(prevButton);
+
+    nextButton = new Button("  Next  ");
+    nextButton.setFont(boldFont);
+    nextButton.disable();
+    p1.add(nextButton);
+
+    // lets get started then
+    setStatus("Welcome to Phind.");
+    mode = idleMode;
+    }
+
+
+    // Get the applet parameters
+    void getParameters() {
+
 
     // What is this collection called?
     try { 
         collection = new String(getParameter("collection"));
-    } catch (Exception e) { 
-        System.err.println("Phind: You must specify a collection.");
+        System.out.println("Phind collection: " + collection);
+    } catch (Exception e) {
+        System.err.println("Phind could not read collection name: " + e.toString());
         stop();
-    }
-    System.out.println("Phind collection: " + collection);
+    }
 
     // Where do we get the phind data
     try { 
         phindcgi_address = new String(getParameter("phindcgi"));
+        phindcgi_address = tidy_URL(phindcgi_address, true);
+        System.out.println("Phind phindcgi: " + phindcgi_address);
     } catch (Exception e) { 
-        System.err.println("Phind: You must specify a URL for phindcgi.");
+        System.err.println("Phind could not process phindcgi URL: " + e.toString());
         stop();
     }
-    phindcgi_address = tidy_URL(phindcgi_address, true);
-    System.out.println("Phind phindcgi: " + phindcgi_address);
 
     // Where is the collection served from
     try { 
         library_address = new String(getParameter("library"));
+        library_address = tidy_URL(library_address, true);
+        System.out.println("Phind library: " + library_address);
     } catch (Exception e) { 
-        System.err.println("Phind: You must specify a URL for library.");
-        stop();
-    }
-    library_address = tidy_URL(library_address, true);
-    System.out.println("Phind library: " + library_address);
+        System.err.println("Phind library: not specified");
+        library_address = "";
+    }
 
     // Should we display a background image?
-    showImage = false;
-    try { 
+    try {
         backdrop_address = new String(getParameter("backdrop"));
         backdrop_address = tidy_URL(backdrop_address, false);
@@ -214 +301 @@
         System.out.println("Phind backdrop: " + backdrop_address);
     } catch (Exception e) { 
-        System.out.println("Phind backdrop not set");
-    }
-
-    // Is there a search URL for this collection?
-    try {
-        search_url = new String(getParameter("search_url"));
-        System.out.println("Phind search URL: " + search_url);
-    } catch (Exception e) { 
-        System.out.println("Phind search_url not set.");
+        System.out.println("Phind backdrop not set: " + e.toString());
     }
 
     // Are the windows arranged vertically or horizontally
-    vertical = true;
     try {
         if (getParameter("orientation").toLowerCase().startsWith("h")) {
@@ -237 +315 @@
 
     // How many phind windows are there?
-    Integer temp;
     try { 
-        temp = Integer.valueOf(getParameter("depth"));
-        depth = temp.intValue();
-    } catch (Exception e) { 
-        temp = null;
+        depth = Integer.valueOf(getParameter("depth")).intValue();
+    } catch (Exception e) {
         depth = 3;
     }
@@ -249 +324 @@
     // How many phrases should we fetch at any given time?
     try { 
-        temp = Integer.valueOf(getParameter("blocksize"));
-        phraseBlockSize = temp.intValue();
+        phraseBlockSize = Integer.valueOf(getParameter("blocksize")).intValue();
     } catch (Exception e) { 
-        temp = null;
         phraseBlockSize = 10;
     }
-    System.out.println("Phind phrase block size: " + phraseBlockSize);
+    System.out.println("Phind retrieval block size: " + phraseBlockSize);
 
     // How large should the font be?
     try { 
-        temp = Integer.valueOf(getParameter("fontsize"));
-        fontSize = temp.intValue();
+        fontSize = Integer.valueOf(getParameter("fontsize")).intValue();
     } catch (Exception e) { 
-        temp = null;
         fontSize = 12;
     }
     System.out.println("Phind font size: " + fontSize);
-
-    // browser details
-    try {
-        localHost = InetAddress.getLocalHost().toString();
-    } catch (Exception e) {
-        localHost = "Can't get client host.";
-    }
-    System.out.println("Phind client: " + localHost);
-    System.out.println("");
-
-    // The phind applet layout manager
-    setLayout(new BorderLayout());
-
-    // initialise the user interface
-    setBackground(Color.white);
-    plainFont = new Font("Helvetica", Font.PLAIN, fontSize);
-    boldFont  = new Font("Helvetica", Font.BOLD, fontSize);
-
-    // the main Result area
-
-    // the Panel containing the displays is in the center of the display
-    resultPanel = new Panel();
-    if (vertical) {
-        resultPanel.setLayout(new GridLayout(depth,1,0,2));
-    } else {
-        System.out.println("horizontal");
-        resultPanel.setLayout(new GridLayout(1,depth,2,0));
-    }
-    add("Center", resultPanel);
-
-    // Create ResultDisplays and place in the interface
-    ResultDisplay d1, d2 = null;
-    firstDisplay = new ResultDisplay(this, null);
-    resultPanel.add(firstDisplay);
-
-    d1 = firstDisplay;
-    for (int i = 2; i <= depth; i++) {
-        d2 = new ResultDisplay(this, d1);
-        resultPanel.add(d2);
-        d1 = d2;
-    }
-      
-    lastDisplay = d2;
-
-
-    // The "control panel" 
-    Panel p1 = new Panel();
-    add("North", p1);
-    p1.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
-
-    searchButton = new Button("Search");
-    searchButton.setFont(boldFont);
-    p1.add(searchButton);
-
-    Label tempLabel = new Label("  for");
-    tempLabel.setFont(boldFont);
-    p1.add(tempLabel);
-
-    wordField = new TextField(12);
-    wordField.setFont(boldFont);
-    p1.add(wordField);
-
-    Label temp2 = new Label("          ");
-    p1.add(temp2);
-
-    prevButton = new Button("Previous");
-    prevButton.setFont(boldFont);
-    prevButton.disable();
-    p1.add(prevButton);
-
-    nextButton = new Button("  Next  ");
-    nextButton.setFont(boldFont);
-    nextButton.disable();
-    p1.add(nextButton);
-
-    // lets get started then
-    setStatus("Welcome to Phind.");
-    mode = idleMode;
-    }
-
+    }
 
     void setStatus(String status) {
@@ -551 +543 @@
     System.out.println("sending query: " + query);
     try {
-        phindcgi = new URL(query);
+        URL phindcgi = new URL(query);
         DataInputStream in = new DataInputStream(phindcgi.openStream());
         byte[] buffer;
@@ -702 +694 @@
     }
 
+
+
+    // Open an arbitrary web page
+    void displayWebPage(String address, String window) {
+    try { 
+        URL url= new URL(address);
+        if (window.length() > 0) {
+        getAppletContext().showDocument(url, window);
+        } else {
+        getAppletContext().showDocument(url);
+        }
+    } catch (Exception e) { 
+        System.out.println("Cannot open web page: " + e.toString());
+    }
+    }
+
 }

trunk/gsdl/src/phind/client/ResultCanvas.java

@@ -477 +477 @@
         //User clicks on a phrase
         if (item.isPhrase()) {
-
             itemSelected = itemSelected;
             update(getGraphics());
-      
             parent.lookupPhrase(item.hiddenText(), item.toString(), 2);
 
             // If meta key is held down, send query to search engine
-            if (event.metaDown()) { 
-            if (phind.search_url.equals("none") || phind.search_url.equals("")) {
-                System.out.println("No searching in this collection");
-            } else {
-                URL url;
-                try { 
-                url = new URL(phind.search_url + "%22" + item.toString() + "%22&");
-                phind.getAppletContext().showDocument(url, "phindsearch");
-                System.out.println("The query is: " + url.toString());
-                } catch (Exception e) { 
-                System.out.println("URL error: " + e.toString());
-                }
-            }
+            if (event.metaDown() && !phind.library_address.equals("")) {
+            String address = phind.library_address  
+                + "a=q&c=" + phind.collection
+                + "&q=%22" + item.toString().replace(' ', '+') + "%22";
+            phind.displayWebPage(address, "phindsearch");
             }
-
         } 
 
@@ -506 +495 @@
             update(getGraphics());
             parent.lookupPhrase(item.hiddenText(), item.toString(), 2);
+
+            // If meta key is held down, send query to search engine
+            if (event.metaDown() && !phind.library_address.equals("")) {
+            String address = phind.library_address  
+                + "a=q&c=" + phind.collection
+                + "&q=%22" + item.toString().replace(' ', '+') + "%22";
+            phind.displayWebPage(address, "phindsearch");
+            }
         } 
 
@@ -513 +510 @@
             update(getGraphics());
 
-            URL url;
-            try {
-            String address = phind.library_address 
-                + "a=d&c=" + phind.collection 
-                + "&d=" + item.hiddenText()
-                + "&q=" + parent.searchPhrase.replace(' ', '+');
-            url = new URL(address);
-            System.out.println("URL selected: " + url.toString());
-            phind.getAppletContext().showDocument(url, "phinddoc");
-            } catch (Exception e) {
-            System.out.println("URL error: " + e.toString());
-            }
+            String address = phind.library_address 
+            + "a=d&c=" + phind.collection 
+            + "&d=" + item.hiddenText()
+            + "&q=" + parent.searchPhrase.replace(' ', '+');
+            phind.displayWebPage(address, "phinddoc");
         }