Changeset 2148 for trunk/java-client


Ignore:
Timestamp:
2001-03-09T19:00:03+13:00 (23 years ago)
Author:
say1
Message:

fixed bugs and added error checking ...

Location:
trunk/java-client/org/nzdl/gsdl
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/java-client/org/nzdl/gsdl/SimpleClient.java

    r2140 r2148  
    191191    String queryTerm = queryToQuery;
    192192    Vector  collections = new Vector();
    193    
     193
     194    Set collectionSet = nzdl.getCollectionSet();
     195   
     196    if (collectionSet.size() < 1)
     197      throw new Error("unable to open query collection, no collections avaliable");
     198
     199
    194200    if (queryAllCollections == false) {
    195       collections.addElement(collectionNameToQuery);
     201      // if we're only doing one, we taken either the first or
     202      // the one we've been asked to query...
     203      if (collectionNameToQuery.equals("")) {
     204    Iterator collectionSetIterator = collectionSet.iterator();
     205    collections.addElement(collectionSetIterator.next());
     206      }  else {
     207    collections.addElement(collectionNameToQuery);
     208      }
    196209    } else {
    197       Set collectionSet = nzdl.getCollectionSet();
    198210      Iterator collectionSetIterator = collectionSet.iterator();
    199211      while (collectionSetIterator.hasNext() ) {

  • trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CSModel.java

    r2145 r2148  
    111111  public String getFirstCollection()
    112112  {
    113     return (String)collectionList.get(0);
     113    if (collectionList.size() > 0)
     114      return (String)collectionList.get(0);
     115    else
     116      return "no collections";
    114117  }
    115118  /**

  • trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java

    r2147 r2148  
    1919package org.nzdl.gsdl.SimpleGraphicalClient;
    2020
     21import java.awt.*;
     22import java.awt.event.*;
     23import java.io.*;
     24import java.util.*;
    2125import javax.swing.*;
    2226import javax.swing.border.*;
    23 import java.awt.*;
    24 import java.awt.event.*;
    25 import java.util.*;
    2627import javax.swing.event.*;
    27 import java.io.*;
    28 
    2928
    3029// local libraries
    … …  
    6564  JScrollPane scrollResultsPane;
    6665  /** where the doc contents are displayed */
    67   JTextArea dataTextArea; 
     66  JEditorPane dataTextArea; 
    6867  JScrollPane scrollDataPane;
     68
     69  final static String DOC_HEADER = "<html><body>";
     70  final static String DOC_FOOTER = "</body></html>";
    6971
    7072  /**
    … …  
    158160    dataPanel.setLayout(new BorderLayout());
    159161    dataPanel.setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
    160     dataTextArea = new JTextArea("Document details will appear here", 10, 0);
     162    dataTextArea = new JEditorPane("text/html",
     163                   "<html><body>Document details will appear here.\n\n\n</body></html>");
    161164    dataTextArea.setEditable(false);
    162     dataTextArea.setLineWrap(true);
     165    dataTextArea.setEditable(false);
    163166    dataTextArea.setFont(docFont);
    164167    dataTextArea.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     168    //dataTextArea.setPreferredSize(new Dimension(100, 100));
    165169    scrollDataPane = new JScrollPane(dataTextArea);
     170    scrollDataPane.setPreferredSize(new Dimension(100, 100));
    166171    dataPanel.add(scrollDataPane, BorderLayout.CENTER);
    167172   
    … …  
    179184  }
    180185
    181 
    182 
    183     /* respond to the user pressing the Search button */
     186  /** respond to the user pressing the Search button */
    184187
    185188public void actionPerformed(ActionEvent e) {
    … …  
    225228       } // end else
    226229           // default to showing the top ranked document
     230      if (docIDs.size() > 0)
    227231           resultsList.setSelectedIndex(0);
    228232       } // end if
    … …  
    232236 } //end actionPerformed
    233237
    234 
    235 
    236     /* handles selection events in the results list so that when the
     238  /** handles selection events in the results list so that when the
    237239       user selects a new title (say) the document contents is
    238240       automatically displayed in the main panel */
    … …  
    252254         // should cache document contents here to speed access
    253255         String documentContents = csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID());
     256         documentContents = DOC_HEADER + documentContents + DOC_FOOTER;
    254257         dataTextArea.setText(documentContents);
    255258         dataTextArea.setCaretPosition(0);
    … …  
    257260     } //end valueChanged
    258261}//end ResultListSelectionHandler
     262>>>>>>> 1.4
    259263
    260264

  • trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java

    r2130 r2148  
    5454 
    5555  public void configure( String _key, Set _values ) {
     56    if (_key == null || _key.equals("")){
     57      throw new Error ("null or empty collection _key");
     58    }
     59    if (_values == null ){
     60      throw new Error ("null or empty collection _values");
     61    }
    5662    corbaComErrorHolder error = NzdlCorbaFactory.createComErrorHolder();
    5763    m_nzdlServer.configure( NzdlCorbaFactory.toCorbaText( _key ),
    … …  
    7884 
    7985  public boolean hasCollection( String _name ) {
     86    if (_name == null || _name.equals("")){
     87      throw new Error ("null or empty collection _name");
     88    }
    8089    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    8190    org.omg.CORBA.BooleanHolder c_has = new org.omg.CORBA.BooleanHolder();
    … …  
    8796 
    8897  public boolean pingCollection( String _name ) {
     98    if (_name == null || _name.equals("")){
     99      throw new Error ("null or empty collection _name");
     100    }
    89101    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    90102    boolean result  = m_nzdlServer.ping( NzdlCorbaFactory.toCorbaText(_name), c_err );
    … …  
    95107 
    96108  public NzdlCollectionInfo getCollectionInfo( String _name ) {
     109    if (_name == null || _name.equals("")){
     110      throw new Error ("null or empty collection _name");
     111    }
    97112    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    98113    corbaColInfoResponseHolder c_info = NzdlCorbaFactory.createColInfoResponseHolder();
    … …  
    104119
    105120  public Set getFilterSet( String _name ) {
     121    if (_name == null || _name.equals("")){
     122      throw new Error ("null or empty filter _name");
     123    }
    106124    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    107125    corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
    … …  
    120138
    121139  public Set getMetaTagSet( String _name ) {
     140    if (_name == null || _name.equals("")){
     141      throw new Error ("null or empty _name");
     142    }
    122143    System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
    123144    return null ;
    … …  
    125146
    126147  public String getDocument( String _name, String _docID ) {
     148    if (_name == null || _name.equals("")){
     149      throw new Error ("null or empty _name");
     150    }
     151    if (_docID == null || _docID.equals("")){
     152      throw new Error ("null or empty _docID");
     153    }
    127154    corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
    128155    corbaDocRequestHolder c_request = NzdlCorbaFactory.createDocRequestHolder( _docID );
    … …  
    136163
    137164  public Set getMetaData( String _name, String _docID, String _metaTag ) {
     165    if (_name == null || _name.equals("")){
     166      throw new Error ("null or empty _name");
     167    }
     168    if (_docID == null || _docID.equals("")){
     169      throw new Error ("null or empty _docID");
     170    }
     171    if (_metaTag == null || _metaTag.equals("")){
     172      throw new Error ("null or empty _metaTag");
     173    }
    138174    NzdlRequest request  = new NzdlRequest( _docID, _metaTag );
    139175    NzdlResponse response = new NzdlResponse( );
    … …  
    149185
    150186  public Map getMetaData( String _name, List _docIDs, String _metaTag ) {
     187    if (_name == null || _name.equals("")){
     188      throw new Error ("null or empty _name");
     189    }
     190    if (_docIDs == null){
     191      throw new Error ("null or empty _docID");
     192    }
     193    if (_metaTag == null || _metaTag.equals("")){
     194      throw new Error ("null or empty _metaTag");
     195    }
    151196    NzdlRequest request  = new NzdlRequest( _docIDs, _metaTag );
    152197    NzdlResponse response = new NzdlResponse( );
    … …  
    159204 
    160205  public void service( String _name, NzdlRequest _request, NzdlResponse _response ) {   
     206    if (_name == null || _name.equals("")){
     207      throw new Error ("null or empty _name");
     208    }
     209    if (_request == null || _request.equals("")){
     210      throw new Error ("null or empty _request");
     211    }
     212    if (_response == null || _response.equals("")){
     213      throw new Error ("null or empty _response");
     214    }
    161215    corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
    162216    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
Note: See TracChangeset for help on using the changeset viewer.