Changeset 2284


Ignore:
Timestamp:
2001-04-04T23:44:22+12:00 (23 years ago)
Author:
say1
Message:

Cross collection searching

Location:
trunk/java-client
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/java-client/ChangeLog

    r2278 r2284  
     12001-04-04 23:32  say1
     2
     3    * org/nzdl/gsdl/: SimpleGraphicalClient/SearchPanel.java,
     4    service/NzdlResultSet.java: added line showing the query term
     5    qrequencies
     6
     72001-04-04 23:07  daven
     8
     9    * org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java: error
     10    prevention for popup menu.
     11
     122001-04-04 22:44  daven
     13
     14    * org/nzdl/gsdl/SimpleGraphicalClient/: Berry.java,
     15    BerryBasketModel.java, BerryBasketPanel.java, CSFrame.java,
     16    CSModel.java, QueryHistoryItem.java, QueryHistoryModel.java,
     17    Result.java, SearchPanel.java: turned on the BerryBasket. Try
     18    right-clicking on a result in the results List to add one - no
     19    delete yet. Re-sizing maybe improved as well - no guarantees yet
     20    though.
     21
     222001-04-04 15:01  say1
     23
     24    * ChangeLog, org/nzdl/gsdl/Makefile,
     25    org/nzdl/gsdl/SimpleGraphicalClient/CSModel.java,
     26    org/nzdl/gsdl/SimpleGraphicalClient/Makefile,
     27    org/nzdl/gsdl/service/Makefile,
     28    org/nzdl/gsdl/service/NzdlLogWrapper.java,
     29    org/nzdl/gsdl/util/Makefile: changed JAVACOPTIONS. log files now
     30    written to home directory. error catching in CSModel. ChangeLog.
     31
    1322001-04-04 11:29  say1
    233

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

    r2269 r2284  
    3838import org.nzdl.gsdl.service.NzdlServiceServer;
    3939import org.nzdl.gsdl.service.NzdlServiceClient;
     40import org.nzdl.gsdl.service.NzdlCrossCollectionWrapper;
    4041import org.nzdl.gsdl.util.NzdlCorbaFactory;
    4142import org.nzdl.gsdl.util.NzdlServiceFactory;
    … …  
    7071    corbaComErrorHolder error = NzdlCorbaFactory.createComErrorHolder();
    7172    try{
    72      
    73       NzdlPreferences.setBoolean("Connect to multiple servers", true);
     73      NzdlPreferences.saving = false;
     74      NzdlPreferences.setBoolean("Connect to multiple servers", false);
    7475      NzdlPreferences.setBoolean("Cache corba requests", true);
    7576      NzdlPreferences.setBoolean("Save documents", true);
    76       NzdlPreferences.setBoolean("Log at the NzdlService level", true);
     77      NzdlPreferences.setBoolean("Log at the NzdlService level", false);
    7778
    7879      NzdlService client = NzdlServiceFactory.createNzdlService(args,
    … …  
    8182                                null,
    8283                                null);
     84      //client = new NzdlCrossCollectionWrapper(client,"");
    8385     
    8486      ORB orb = ORB.init(args, null);

  • trunk/java-client/org/nzdl/gsdl/service/Makefile

    r2278 r2284  
    2626          NzdlDocSaveWrapper.class \
    2727          NzdlMultiWayWrapper.class \
    28           NzdlCacheWrapper.class
    29 
     28          NzdlCacheWrapper.class\
     29          NzdlCrossCollectionWrapper.class
    3030
    3131all: $(CLASSFILES)

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

    r2270 r2284  
    9191  }
    9292
    93   String findServer(String _name) {
     93  static String findServer(String _name) {
    9494    int separator = _name.indexOf(':');   
    9595    String result = _name.substring(0,separator);
    … …  
    9797  }
    9898
    99   String findCollection(String _name) {
     99  static String findCollection(String _name) {
    100100    String result = "";
    101101    try {

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

    r2163 r2284  
    4242
    4343  private corbaFilterRequest m_Filter = null;
     44
     45  public NzdlRequest( corbaFilterRequest request ) {
     46    m_Filter =  request;
     47  }
    4448
    4549  /**
    … …  
    104108    return m_Filter;
    105109  }
    106   
     110 
    107111}

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

    r2220 r2284  
    122122   */
    123123  public Set getCollectionSet( ) {
     124    System.err.println("Client::getCollectionSet() start");
    124125    corbaComErrorHolder error = NzdlCorbaFactory.createComErrorHolder();
    125126    corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder();
    … …  
    127128    Set collSet = new HashSet();
    128129    for (int i=0; i<c_collSet.value.length; i++) {
    129       collSet.add( NzdlCorbaFactory.toString( c_collSet.value[i] ) );
     130      String collName = NzdlCorbaFactory.toString( c_collSet.value[i] );
     131      if (collName.indexOf("nuipepa") == -1)
     132    collSet.add(collName);
    130133    }
    131134    if (error.value.value() != corbaComError._corbaNoError) {
    132135      System.err.println("CORBA error:" + error.value.value());
    133136    }
     137    System.err.println("Client::getCollectionSet() end " + error.value.value());
    134138    return collSet ;
    135139  }
    … …  
    180184   */
    181185  public NzdlCollectionInfo getCollectionInfo( String _name ) {
     186    System.err.println("getCollectionInfo " + _name);
    182187    if (_name == null || _name.equals("")){
    183188      throw new Error ("null or empty collection _name");
    … …  
    223228      throw new Error ("null or empty _name");
    224229    }
    225     System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
     230    System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!! (getMetaTagSet)");
    226231    return null ;
    227232  }
    … …  
    273278    NzdlResponse response = new NzdlResponse( );
    274279    service( _name, request, response );
     280    if (response == null || response.getResponse() == null) {
     281      return new HashSet();
     282    }
    275283    NzdlResultSet resultSet = response.getResultSet();
    276284    /*
    … …  
    296304    }
    297305    if (_docIDs == null){
    298       throw new Error ("null or empty _docID");
     306      throw new Error ("null _docIDs");
    299307    }
    300308    if (_metaTag == null || _metaTag.equals("")){
    … …  
    321329   */
    322330  public void service( String _name, NzdlRequest _request, NzdlResponse _response ) {   
    323     if (_name == null || _name.equals("")){
    324       throw new Error ("null or empty _name");
    325     }
    326     if (_request == null || _request.equals("")){
    327       throw new Error ("null or empty _request");
    328     }
    329     if (_response == null || _response.equals("")){
    330       throw new Error ("null or empty _response");
     331    if (_name == null || _name.equals("")) {
     332      throw new Error ("null or empty _name");
     333    }
     334    if (_request == null) {
     335      throw new Error ("null _request");
     336    }
     337    if (_response == null) {
     338      throw new Error ("null _response");
    331339    }
    332340    corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );

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

    r2172 r2284  
    104104  public void collectionList (corbatext_tarrayHolder collist,
    105105                  corbaComErrorHolder error) {
     106    System.err.println("Server::getCollectionSet() start " + error.value.value());
    106107    //corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder();
    107108    //m_nzdlServer.collectionList(c_collSet);
    … …  
    112113    //return collSet ;
    113114    Set set = nzdl.getCollectionSet();
     115    System.err.println("Server::getCollectionSet() in " + error.value.value());
     116    System.err.println("Server::getCollectionSet() in " + set);
     117
     118    collist.value = new corbatext_t[set.size()];
    114119
    115120    Iterator itr = set.iterator();
    … …  
    117122    while (itr.hasNext()) {
    118123      String s = (String) itr.next();
    119       collist.value[i++] = NzdlCorbaFactory.toCorbaText(s);
     124      if (s.indexOf("nuipepa") == -1)
     125    collist.value[i++] = NzdlCorbaFactory.toCorbaText(s);
    120126    }
    121127    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    122 
    123     return;
    124   }
     128    System.err.println("Server::getCollectionSet() end " + error.value.value());
     129
     130    return;
     131  }
     132
    125133  /**
    126134   * Does the server have a specific collections?
    … …  
    182190    return;
    183191  }
     192
    184193  public void getCollectInfo (corbatext_t collection,
    185194                  corbaColInfoResponseHolder response,
    … …  
    197206    return;
    198207  }
     208
    199209  public void getFilterInfo (corbatext_t collection,
    200210                 corbatext_tarrayHolder filterNames,
    … …  
    214224    return;
    215225  }
     226
    216227  public void getFilterOptions (corbatext_t collection,
    217228                corbatext_t option,
    … …  
    219230                corbaComErrorHolder error) {
    220231    String collectionName = NzdlCorbaFactory.toString(collection);
    221     System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
     232    System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!! (getFilterOptions)");
    222233
    223234    error.value = corbaComError.from_int(corbaComError._corbaProtocolError);
    224235    return;
    225236  }
     237
    226238  public  void filter (corbatext_t collection,
    227239               corbaFilterRequest request,
    228240               corbaFilterResponseHolder response,
    229241               corbaComErrorHolder error) {
    230     String collectionName = NzdlCorbaFactory.toString(collection);
    231     System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
    232     error.value = corbaComError.from_int(corbaComError. _corbaProtocolError);
     242    //corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
     243    //corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
     244    //m_nzdlServer.filter( c_name, _request.getFilter(), _response.getHolder(), c_err );
     245    //if (c_err.value.value() != 0)
     246    //  System.err.println("service() error " + c_err.value.value());
     247    error.value = corbaComError.from_int(corbaComError._corbaNoError);
     248
     249    String collectionName = NzdlCorbaFactory.toString(collection);
     250    NzdlRequest _request = new NzdlRequest(request);
     251    NzdlResponse _response = new NzdlResponse();
     252    _response.setResponse(response.value);
     253
     254    try {
     255      nzdl.service(collectionName,_request,_response);
     256    } catch (Throwable t) {
     257          error.value = corbaComError.from_int(corbaComError._corbaProtocolError);
     258    }
    233259    return;
    234260  }

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

    r2178 r2284  
    6868   */
    6969  public Set getCollectionSet( ) {
    70     System.err.println("here" + this);
    7170    return service.getCollectionSet();
    7271  }
Note: See TracChangeset for help on using the changeset viewer.