Changeset 2152 for trunk/java-client

Timestamp:

2001-03-09T23:26:57+13:00 (23 years ago)

Author:

say1

Message:

caching NzdlService now works ...

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleGraphicalClient/SearchPanel.java (modified) (1 diff)
• service/NzdlResponse.java (modified) (2 diffs)
• service/NzdlServiceCachingClient.java (modified) (5 diffs)
• util/NzdlIORs.java (modified) (4 diffs)

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

@@ -246 +246 @@
       Result result =  (Result) resultsList.getSelectedValue();
       if (result.toString() == Result.FAKE_RESULT) {
-    dataTextArea.setText(null);
+    dataTextArea.setText("");
     //System.err.println("no results");
       }

trunk/java-client/org/nzdl/gsdl/service/NzdlResponse.java

@@ -51 +51 @@
   public NzdlResponse( ) {
     m_responseHolder = NzdlCorbaFactory.createFilterResponseHolder();
+    m_response = m_responseHolder.value;
+  }
+
+  /**
+   * Create an empty instance of a NzdlResponse object.
+   */
+  public void copyData(NzdlResponse old) {
+    m_responseHolder = old.m_responseHolder ;
+    m_response = old.m_response;
+    m_resultSet =  old.m_resultSet;
+    m_frequencies = old.m_frequencies;
+    m_queryTerms = old.m_queryTerms;
+  }
+
+  /**
+   * Get the corbaFilterReponse.
+   */
+  public corbaFilterResponse getResponse() {
+    return m_response;
+  }
+
+  /**
+   * Set the corbaFilterReponse.
+   */
+  public void setResponse(corbaFilterResponse response) {
+    m_response = response;
+    m_responseHolder.value = response;
+    parseResponse();
   }
 
@@ -128 +156 @@
     m_resultSet = new NzdlResultSet();
     m_resultSet.setNumOfDocs( m_response.numDocs );
+    if (m_response.isApprox == null)
+      throw new Error ("null m_response.isApprox in parseResponse");
     m_resultSet.setResultType( m_response.isApprox.value() );
     /** HAS SIDE EFFECT ! */

trunk/java-client/org/nzdl/gsdl/service/NzdlServiceCachingClient.java

@@ -25 +25 @@
   
   public NzdlCollectionInfo getCollectionInfo( String _name ) {
+    //System.err.println("in NzdlServiceCachingClient::getCollectionInfo()");
     NzdlCollectionInfo info = null;
     info = (NzdlCollectionInfo)_collectionInfo.get(_name);
@@ -31 +32 @@
     info = super.getCollectionInfo(_name);
     _collectionInfo.put(_name,info);
-    
+
+    System.err.println("Cache miss (getCollectionInfo)");
     return info;
   }
@@ -37 +39 @@
   public String getDocument( String _name, String _docID ) {
     String doc = null;
-    doc = (String)_collectionInfo.get(_name + _docID);
+    String key = "" + _name + _docID;
+    doc = (String)_docs.get(key);
     if (doc != null)
       return doc;
     doc = super.getDocument(_name,_docID);
-    _docs.put(_name + _docID,doc);
+    _docs.put(key, doc);
+    
+    System.err.println("Cache miss (getDocument) " + _name 
+                + " " +_docID);
     
     return doc;
@@ -47 +53 @@
 
   public void service( String _name, NzdlRequest _request, NzdlResponse _response ) {    
-    if (_name == null || _name.equals("")){
-      throw new Error ("null or empty _name");
+    
+    String key = _name + corbaFilterRequestToString(_request);
+
+    if (_services.get(key) != null) {
+      _response.copyData((NzdlResponse) _services.get(key));
+      return;
     }
-    if (_request == null || _request.equals("")){
-      throw new Error ("null or empty _request");
-    }
-    if (_response == null || _response.equals("")){
-      throw new Error ("null or empty _response");
-    }
-    
-    NzdlResponse info = null;
-    _response.getHolder().value = (corbaFilterResponse)
-      _services.get(_name + corbaFilterRequestToString(_request));
-
-    if (info != null)      
-      return;
 
     super.service(_name, _request,_response);
-    _collectionInfo.put(_name +corbaFilterRequestToString(_request),
-            _response.getHolder().value);
+
+    _services.put(key, _response);
+    
+    System.err.println("Cache miss (service)" + key);
     return;
   }
@@ -108 +107 @@
     return buf.toString();
   }
-
-
 }
 

trunk/java-client/org/nzdl/gsdl/util/NzdlIORs.java

@@ -57 +57 @@
 import org.nzdl.gsdl.service.NzdlService;
 import org.nzdl.gsdl.service.NzdlServiceClient;
+import org.nzdl.gsdl.service.NzdlServiceCachingClient;
 
 /**
@@ -98 +99 @@
   };
 
-
+  /** Are we using a caching NzdlService ? */
+  static public boolean nzdlServiceCachingClass = true;
 
   /**
@@ -128 +130 @@
     if (knownIORs != null)
       return;
-    
+
     Properties blarg = new Properties();
     
@@ -380 +382 @@
     NzdlServiceClient nzdl = null;
     try {
-      nzdl = new NzdlServiceClient( _args, _props, _IOR);
+      if (nzdlServiceCachingClass) 
+    nzdl = new NzdlServiceCachingClient( _args, _props, _IOR);
+      else
+    nzdl = new NzdlServiceClient( _args, _props, _IOR);
     } catch (Throwable t) {
       System.err.println ("failed to initialise using:");