Changeset 2284 for trunk/java-client
- Timestamp:
- 2001-04-04T23:44:22+12:00 (23 years ago)
- Location:
- trunk/java-client
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/java-client/ChangeLog
r2278 r2284 1 2001-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 7 2001-04-04 23:07 daven 8 9 * org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java: error 10 prevention for popup menu. 11 12 2001-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 22 2001-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 1 32 2001-04-04 11:29 say1 2 33 -
trunk/java-client/org/nzdl/gsdl/Proxy.java
r2269 r2284 38 38 import org.nzdl.gsdl.service.NzdlServiceServer; 39 39 import org.nzdl.gsdl.service.NzdlServiceClient; 40 import org.nzdl.gsdl.service.NzdlCrossCollectionWrapper; 40 41 import org.nzdl.gsdl.util.NzdlCorbaFactory; 41 42 import org.nzdl.gsdl.util.NzdlServiceFactory; … … 70 71 corbaComErrorHolder error = NzdlCorbaFactory.createComErrorHolder(); 71 72 try{ 72 73 NzdlPreferences.setBoolean("Connect to multiple servers", true);73 NzdlPreferences.saving = false; 74 NzdlPreferences.setBoolean("Connect to multiple servers", false); 74 75 NzdlPreferences.setBoolean("Cache corba requests", true); 75 76 NzdlPreferences.setBoolean("Save documents", true); 76 NzdlPreferences.setBoolean("Log at the NzdlService level", true);77 NzdlPreferences.setBoolean("Log at the NzdlService level", false); 77 78 78 79 NzdlService client = NzdlServiceFactory.createNzdlService(args, … … 81 82 null, 82 83 null); 84 //client = new NzdlCrossCollectionWrapper(client,""); 83 85 84 86 ORB orb = ORB.init(args, null); -
trunk/java-client/org/nzdl/gsdl/service/Makefile
r2278 r2284 26 26 NzdlDocSaveWrapper.class \ 27 27 NzdlMultiWayWrapper.class \ 28 NzdlCacheWrapper.class 29 28 NzdlCacheWrapper.class\ 29 NzdlCrossCollectionWrapper.class 30 30 31 31 all: $(CLASSFILES) -
trunk/java-client/org/nzdl/gsdl/service/NzdlMultiWayWrapper.java
r2270 r2284 91 91 } 92 92 93 String findServer(String _name) {93 static String findServer(String _name) { 94 94 int separator = _name.indexOf(':'); 95 95 String result = _name.substring(0,separator); … … 97 97 } 98 98 99 String findCollection(String _name) {99 static String findCollection(String _name) { 100 100 String result = ""; 101 101 try { -
trunk/java-client/org/nzdl/gsdl/service/NzdlRequest.java
r2163 r2284 42 42 43 43 private corbaFilterRequest m_Filter = null; 44 45 public NzdlRequest( corbaFilterRequest request ) { 46 m_Filter = request; 47 } 44 48 45 49 /** … … 104 108 return m_Filter; 105 109 } 106 110 107 111 } -
trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java
r2220 r2284 122 122 */ 123 123 public Set getCollectionSet( ) { 124 System.err.println("Client::getCollectionSet() start"); 124 125 corbaComErrorHolder error = NzdlCorbaFactory.createComErrorHolder(); 125 126 corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder(); … … 127 128 Set collSet = new HashSet(); 128 129 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); 130 133 } 131 134 if (error.value.value() != corbaComError._corbaNoError) { 132 135 System.err.println("CORBA error:" + error.value.value()); 133 136 } 137 System.err.println("Client::getCollectionSet() end " + error.value.value()); 134 138 return collSet ; 135 139 } … … 180 184 */ 181 185 public NzdlCollectionInfo getCollectionInfo( String _name ) { 186 System.err.println("getCollectionInfo " + _name); 182 187 if (_name == null || _name.equals("")){ 183 188 throw new Error ("null or empty collection _name"); … … 223 228 throw new Error ("null or empty _name"); 224 229 } 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)"); 226 231 return null ; 227 232 } … … 273 278 NzdlResponse response = new NzdlResponse( ); 274 279 service( _name, request, response ); 280 if (response == null || response.getResponse() == null) { 281 return new HashSet(); 282 } 275 283 NzdlResultSet resultSet = response.getResultSet(); 276 284 /* … … 296 304 } 297 305 if (_docIDs == null){ 298 throw new Error ("null or empty _docID");306 throw new Error ("null _docIDs"); 299 307 } 300 308 if (_metaTag == null || _metaTag.equals("")){ … … 321 329 */ 322 330 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"); 331 339 } 332 340 corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name ); -
trunk/java-client/org/nzdl/gsdl/service/NzdlServiceServer.java
r2172 r2284 104 104 public void collectionList (corbatext_tarrayHolder collist, 105 105 corbaComErrorHolder error) { 106 System.err.println("Server::getCollectionSet() start " + error.value.value()); 106 107 //corbatext_tarrayHolder c_collSet = NzdlCorbaFactory.createCorbaTextArrayHolder(); 107 108 //m_nzdlServer.collectionList(c_collSet); … … 112 113 //return collSet ; 113 114 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()]; 114 119 115 120 Iterator itr = set.iterator(); … … 117 122 while (itr.hasNext()) { 118 123 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); 120 126 } 121 127 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 125 133 /** 126 134 * Does the server have a specific collections? … … 182 190 return; 183 191 } 192 184 193 public void getCollectInfo (corbatext_t collection, 185 194 corbaColInfoResponseHolder response, … … 197 206 return; 198 207 } 208 199 209 public void getFilterInfo (corbatext_t collection, 200 210 corbatext_tarrayHolder filterNames, … … 214 224 return; 215 225 } 226 216 227 public void getFilterOptions (corbatext_t collection, 217 228 corbatext_t option, … … 219 230 corbaComErrorHolder error) { 220 231 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)"); 222 233 223 234 error.value = corbaComError.from_int(corbaComError._corbaProtocolError); 224 235 return; 225 236 } 237 226 238 public void filter (corbatext_t collection, 227 239 corbaFilterRequest request, 228 240 corbaFilterResponseHolder response, 229 241 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 } 233 259 return; 234 260 } -
trunk/java-client/org/nzdl/gsdl/service/NzdlWrapper.java
r2178 r2284 68 68 */ 69 69 public Set getCollectionSet( ) { 70 System.err.println("here" + this);71 70 return service.getCollectionSet(); 72 71 }
Note:
See TracChangeset
for help on using the changeset viewer.