Changeset 2087 for trunk/java-client/org

Timestamp:

2001-03-01T12:45:34+13:00 (23 years ago)

Author:

say1

Message:

server changes

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleServer.java (modified) (1 diff)
• ptp (added)
• ptp/Node.java (added)
• service/NzdlServiceImpl.java (modified) (1 diff)

trunk/java-client/org/nzdl/gsdl/SimpleServer.java

@@ -107 +107 @@
    * @param args the arguments ...
    */
-
-
-class NzdlServer extends _corbaifaceImplBase {
-
-  NzdlService nzdl = null;
-  
-  NzdlServer(NzdlService service) {
-    nzdl = service;
-  }
-  
-  NzdlServer() {
-    nzdl = null;
-  }
-
-  public boolean initialise () {
-    // TODO should map the anything in NzdlService?
-    return true;
-  }
-  public void configure (corbatext_t key, 
-          corbatext_t[] cfgline) {
-//      m_nzdlServer.configure( NzdlCorbaFactory.toCorbaText( _key ),
-//                  NzdlCorbaFactory.toCorbaTextArray( _values ));
-
-    nzdl.configure( NzdlCorbaFactory.toString(key),
-            NzdlCorbaFactory.toSet(cfgline));
-  }
-
-  public void collectionList (corbatext_tarrayHolder collist) {
-    //corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder();
-    //m_nzdlServer.collectionList(c_collSet);
-    //Set collSet = new HashSet();
-    //for (int i=0; i<c_collSet.value.length; i++) {
-    //  collSet.add( NzdlCorbaFactory.toString( c_collSet.value[i] ) );
-    //}
-    //return collSet ;
-    Set set = nzdl.getCollectionSet();
-
-    Iterator itr = set.iterator();
-    int i = 0;
-    while (itr.hasNext()) {
-      String s = (String) itr.next();
-       collist.value[i++] = NzdlCorbaFactory.toCorbaText(s);
-    }
-
-    return;
-  }
-  public void hasCollection (corbatext_t corbaCollection,
-              org.omg.CORBA.BooleanHolder has, 
-              corbaComErrorHolder error) {
-//      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
-//      org.omg.CORBA.BooleanHolder c_has = new org.omg.CORBA.BooleanHolder();
-//      m_nzdlServer.hasCollection( NzdlCorbaFactory.toCorbaText(_name), c_has, c_err );
-//      if (c_err.value.value() != 0)
-//        System.err.println("hasCollection error " + c_err.value.value());
-//      return c_has.value;
-    String name = NzdlCorbaFactory.toString(corbaCollection);
-    has.value  = nzdl.hasCollection(name);
-    return;
-  }
-  public boolean ping (corbatext_t collection, 
-        corbaComErrorHolder error) {
-    String name = NzdlCorbaFactory.toString(collection);
-    return  nzdl.hasCollection(name);
-  }
-  public void getDocument (corbatext_t collection, 
-            corbaDocRequestHolder request, 
-            corbaDocResponseHolder response, 
-            corbaComErrorHolder error) {
-//      corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
-//      corbaDocRequestHolder c_request = NzdlCorbaFactory.createDocRequestHolder( _docID );
-//      corbaDocResponseHolder c_response = NzdlCorbaFactory.createDocResponseHolder( );
-//      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
-//      m_nzdlServer.getDocument( c_name, c_request, c_response, c_err );
-//      if (c_err.value.value() != 0)
-//        System.err.println("getDocument() error " + c_err.value.value());
-//      return NzdlCorbaFactory.toString( c_response.value.doc );
-    String collectionName = NzdlCorbaFactory.toString(collection);
-    String documentID = NzdlCorbaFactory.toString(request.value.OID);
-    String doc = nzdl.getDocument( collectionName, documentID );
-    response.value.doc = NzdlCorbaFactory.toCorbaText(doc);
-    return;
-  }
-  public void getCollectInfo (corbatext_t collection, 
-               corbaColInfoResponseHolder response, 
-               corbaComErrorHolder error) {
-//      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
-//      corbaColInfoResponseHolder c_info = NzdlCorbaFactory.createColInfoResponseHolder();
-//      m_nzdlServer.getCollectInfo( NzdlCorbaFactory.toCorbaText(_name), c_info, c_err );
-//      if (c_err.value.value() != 0)
-//        System.err.println("getCollectionInfo() error " + c_err.value.value());
-//      return new NzdlCollectionInfo( c_info.value );
-    String collectionName = NzdlCorbaFactory.toString(collection);
-    NzdlCollectionInfo info = nzdl.getCollectionInfo( collectionName );
-    response.value = info.getInfo();
-    return;
-  }
-  public void getFilterInfo (corbatext_t collection, 
-              corbatext_tarrayHolder filterNames, 
-              corbaComErrorHolder error) {
-
-    return;
-  }
-  public void getFilterOptions (corbatext_t collection, 
-             corbatext_t option, 
-             corbaFilterOptionsResponseHolder response, 
-             corbaComErrorHolder error) {
-    return;
-      }
-  public  void filter (corbatext_t collection, 
-           corbaFilterRequest request, 
-           corbaFilterResponseHolder response, 
-           corbaComErrorHolder error) {
-    return;
-  }
-}
-
-

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

@@ -88 +88 @@
 
   public Set getFilterSet( String _name ) {
-    System.err.println("TO BE IMPLEMENTED !!!");
-    return null ;
+    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
+    corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
+    corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder();
+    m_nzdlServer.getFilterInfo(c_name, c_collSet,c_err);
+    if (c_err.value.value() != 0)
+      System.err.println("getCollectionInfo() error " + c_err.value.value());
+
+    Set collSet = new HashSet();
+    for (int i=0; i<c_collSet.value.length; i++) {
+      collSet.add( NzdlCorbaFactory.toString( c_collSet.value[i] ) );
+    }
+    return collSet ;
+
   }