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

updated for new idl file. extra documenation. a little more PTP work

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

Legend:

Unmodified
Added
Removed

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

    r2098 r2119  
    1717
    1818  public NzdlServiceClient( String [] _args, Properties _props, String _IOR) {
     19    corbaComErrorHolder error = new corbaComErrorHolder();
    1920    try {
    2021      System.err.println("before ORB.init");
    … …  
    2930      m_nzdlServer = corbaifaceHelper.narrow(obj);
    3031      System.err.println("after .narrow");
     32     
    3133      // basic setup
    32       if (m_nzdlServer.initialise()) {
     34      if (m_nzdlServer.initialise(error)) {
    3335    System.err.println("Nzdl init ... YES");
    3436      }
    … …  
    4446      System.exit(1);
    4547    }
     48    if (error.value.value() != corbaComError._corbaNoError) {
     49      System.err.println("CORBA error:" + error.value.value());
     50    }
    4651   
    4752    System.err.println("Service init ... YES");
    … …  
    4954 
    5055  public void configure( String _key, Set _values ) {
     56    corbaComErrorHolder error = new corbaComErrorHolder();
    5157    m_nzdlServer.configure( NzdlCorbaFactory.toCorbaText( _key ),
    52                 NzdlCorbaFactory.toCorbaTextArray( _values ));
     58                NzdlCorbaFactory.toCorbaTextArray( _values ),
     59                error);
     60    if (error.value.value() != corbaComError._corbaNoError) {
     61      System.err.println("CORBA error:" + error.value.value());
     62    }
    5363  }
    5464 
    5565  public Set getCollectionSet( ) {
     66    corbaComErrorHolder error = new corbaComErrorHolder();
    5667    corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder();
    57     m_nzdlServer.collectionList(c_collSet);
     68    m_nzdlServer.collectionList(c_collSet, error);
    5869    Set collSet = new HashSet();
    5970    for (int i=0; i<c_collSet.value.length; i++) {
    6071      collSet.add( NzdlCorbaFactory.toString( c_collSet.value[i] ) );
     72    }
     73    if (error.value.value() != corbaComError._corbaNoError) {
     74      System.err.println("CORBA error:" + error.value.value());
    6175    }
    6276    return collSet ;

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

    r2108 r2119  
    6969  }
    7070
    71   public boolean initialise () {
     71  public boolean initialise (corbaComErrorHolder error) {
    7272    // TODO should map the anything in NzdlService?
    7373    if (nzdl == null)
    7474      throw new Error ("NzdlServer needs a NzdlService to foward calls to ...");
     75    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    7576    return true;
    7677  }
    7778  public void configure (corbatext_t key,
    78           corbatext_t[] cfgline) {
    79 //      m_nzdlServer.configure( NzdlCorbaFactory.toCorbaText( _key ),
    80 //                  NzdlCorbaFactory.toCorbaTextArray( _values ));
     79             corbatext_t[] cfgline,
     80             corbaComErrorHolder error) {
     81    //      m_nzdlServer.configure( NzdlCorbaFactory.toCorbaText( _key ),
     82    //                  NzdlCorbaFactory.toCorbaTextArray( _values ));
    8183
    8284    nzdl.configure( NzdlCorbaFactory.toString(key),
    8385            NzdlCorbaFactory.toSet(cfgline));
    84   }
    85 
    86   public void collectionList (corbatext_tarrayHolder collist) {
     86    error.value = corbaComError.from_int(corbaComError._corbaNoError);
     87  }
     88
     89  public void collectionList (corbatext_tarrayHolder collist,
     90                  corbaComErrorHolder error) {
    8791    //corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder();
    8892    //m_nzdlServer.collectionList(c_collSet);
    … …  
    98102    while (itr.hasNext()) {
    99103      String s = (String) itr.next();
    100        collist.value[i++] = NzdlCorbaFactory.toCorbaText(s);
     104      collist.value[i++] = NzdlCorbaFactory.toCorbaText(s);
    101105    }
     106    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    102107
    103108    return;
    104109  }
    105110  public void hasCollection (corbatext_t corbaCollection,
    106               org.omg.CORBA.BooleanHolder has,
    107               corbaComErrorHolder error) {
    108 //      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    109 //      org.omg.CORBA.BooleanHolder c_has = new org.omg.CORBA.BooleanHolder();
    110 //      m_nzdlServer.hasCollection( NzdlCorbaFactory.toCorbaText(_name), c_has, c_err );
    111 //      if (c_err.value.value() != 0)
    112 //        System.err.println("hasCollection error " + c_err.value.value());
    113 //      return c_has.value;
     111                 org.omg.CORBA.BooleanHolder has,
     112                 corbaComErrorHolder error) {
     113    //      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
     114    //      org.omg.CORBA.BooleanHolder c_has = new org.omg.CORBA.BooleanHolder();
     115    //      m_nzdlServer.hasCollection( NzdlCorbaFactory.toCorbaText(_name), c_has, c_err );
     116    //      if (c_err.value.value() != 0)
     117    //        System.err.println("hasCollection error " + c_err.value.value());
     118    //      return c_has.value;
    114119    String name = NzdlCorbaFactory.toString(corbaCollection);
    115120    has.value  = nzdl.hasCollection(name);
     121    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    116122    return;
    117123  }
    118124  public boolean ping (corbatext_t collection,
    119         corbaComErrorHolder error) {
     125               corbaComErrorHolder error) {
    120126    String name = NzdlCorbaFactory.toString(collection);
    121127    return  nzdl.hasCollection(name);
    122128  }
    123129  public void getDocument (corbatext_t collection,
    124             corbaDocRequestHolder request,
    125             corbaDocResponseHolder response,
    126             corbaComErrorHolder error) {
    127 //      corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
    128 //      corbaDocRequestHolder c_request = NzdlCorbaFactory.createDocRequestHolder( _docID );
    129 //      corbaDocResponseHolder c_response = NzdlCorbaFactory.createDocResponseHolder( );
    130 //      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    131 //      m_nzdlServer.getDocument( c_name, c_request, c_response, c_err );
    132 //      if (c_err.value.value() != 0)
    133 //        System.err.println("getDocument() error " + c_err.value.value());
    134 //      return NzdlCorbaFactory.toString( c_response.value.doc );
     130               corbaDocRequestHolder request,
     131               corbaDocResponseHolder response,
     132               corbaComErrorHolder error) {
     133    //      corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
     134    //      corbaDocRequestHolder c_request = NzdlCorbaFactory.createDocRequestHolder( _docID );
     135    //      corbaDocResponseHolder c_response = NzdlCorbaFactory.createDocResponseHolder( );
     136    //      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
     137    //      m_nzdlServer.getDocument( c_name, c_request, c_response, c_err );
     138    //      if (c_err.value.value() != 0)
     139    //        System.err.println("getDocument() error " + c_err.value.value());
     140    //      return NzdlCorbaFactory.toString( c_response.value.doc );
    135141    String collectionName = NzdlCorbaFactory.toString(collection);
    136142    String documentID = NzdlCorbaFactory.toString(request.value.OID);
    137143    String doc = nzdl.getDocument( collectionName, documentID );
    138144    response.value.doc = NzdlCorbaFactory.toCorbaText(doc);
     145    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    139146    return;
    140147  }
    141148  public void getCollectInfo (corbatext_t collection,
    142                corbaColInfoResponseHolder response,
    143                corbaComErrorHolder error) {
    144 //      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
    145 //      corbaColInfoResponseHolder c_info = NzdlCorbaFactory.createColInfoResponseHolder();
    146 //      m_nzdlServer.getCollectInfo( NzdlCorbaFactory.toCorbaText(_name), c_info, c_err );
    147 //      if (c_err.value.value() != 0)
    148 //        System.err.println("getCollectionInfo() error " + c_err.value.value());
    149 //      return new NzdlCollectionInfo( c_info.value );
     149                  corbaColInfoResponseHolder response,
     150                  corbaComErrorHolder error) {
     151    //      corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
     152    //      corbaColInfoResponseHolder c_info = NzdlCorbaFactory.createColInfoResponseHolder();
     153    //      m_nzdlServer.getCollectInfo( NzdlCorbaFactory.toCorbaText(_name), c_info, c_err );
     154    //      if (c_err.value.value() != 0)
     155    //        System.err.println("getCollectionInfo() error " + c_err.value.value());
     156    //      return new NzdlCollectionInfo( c_info.value );
    150157    String collectionName = NzdlCorbaFactory.toString(collection);
    151158    NzdlCollectionInfo info = nzdl.getCollectionInfo( collectionName );
    152159    response.value = info.getInfo();
     160    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    153161    return;
    154162  }
    155163  public void getFilterInfo (corbatext_t collection,
    156               corbatext_tarrayHolder filterNames,
    157               corbaComErrorHolder error) {
     164                 corbatext_tarrayHolder filterNames,
     165                 corbaComErrorHolder error) {
    158166    String collectionName = NzdlCorbaFactory.toString(collection);
    159167 
    … …  
    164172    while (itr.hasNext()) {
    165173      String s = (String) itr.next();
    166        filterNames.value[i++] = NzdlCorbaFactory.toCorbaText(s);
     174      filterNames.value[i++] = NzdlCorbaFactory.toCorbaText(s);
    167175    }
    168176
     177    error.value = corbaComError.from_int(corbaComError._corbaNoError);
    169178    return;
    170179  }
    171180  public void getFilterOptions (corbatext_t collection,
    172              corbatext_t option,
    173              corbaFilterOptionsResponseHolder response,
    174              corbaComErrorHolder error) {
    175     String collectionName = NzdlCorbaFactory.toString(collection);
    176         System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
    177 
    178     return;
    179       }
     181                corbatext_t option,
     182                corbaFilterOptionsResponseHolder response,
     183                corbaComErrorHolder error) {
     184    String collectionName = NzdlCorbaFactory.toString(collection);
     185    System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
     186
     187    error.value = corbaComError.from_int(corbaComError._corbaProtocolError);
     188    return;
     189  }
    180190  public  void filter (corbatext_t collection,
    181            corbaFilterRequest request,
    182            corbaFilterResponseHolder response,
    183            corbaComErrorHolder error) {
     191               corbaFilterRequest request,
     192               corbaFilterResponseHolder response,
     193               corbaComErrorHolder error) {
    184194    String collectionName = NzdlCorbaFactory.toString(collection);
    185195    System.err.println("TO BE IMPLEMENTED: DON'T KNOW HOW YET !!!");
     196    error.value = corbaComError.from_int(corbaComError. _corbaProtocolError);
    186197    return;
    187198  }
Note: See TracChangeset for help on using the changeset viewer.