vgritsenko 2003/12/24 06:35:28
Modified: java/src/org/apache/xindice/server/rpc
RPCDefaultMessage.java
java/src/org/apache/xindice/server/rpc/messages
GetDocumentCount.java GetResource.java
Log:
XML-RPC GetResource message changed to return no result when resource
is not found instead of throwing exception.
This is more in line with XML:DB API
Revision Changes Path
1.12 +3 -2
xml-xindice/java/src/org/apache/xindice/server/rpc/RPCDefaultMessage.java
Index: RPCDefaultMessage.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/RPCDefaultMessage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RPCDefaultMessage.java 11 Dec 2003 14:06:16 -0000 1.11
+++ RPCDefaultMessage.java 24 Dec 2003 14:35:28 -0000 1.12
@@ -70,6 +70,7 @@
public static final String API_NAME = "Xindice XML-RPC";
public static final String API_VERSION = "0.1";
+
public static final String RESULT = "result";
public static final String NAME = "name";
public static final String COLLECTION = "collection";
1.5 +2 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentCount.java
Index: GetDocumentCount.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentCount.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GetDocumentCount.java 7 Aug 2003 20:13:23 -0000 1.4
+++ GetDocumentCount.java 24 Dec 2003 14:35:28 -0000 1.5
@@ -79,7 +79,6 @@
Collection col = getCollection((String) message.get(COLLECTION));
Hashtable result = new Hashtable();
-
result.put(RESULT, new Integer((int) col.getDocumentCount()));
return result;
}
1.2 +5 -8
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetResource.java
Index: GetResource.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetResource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetResource.java 24 Dec 2003 02:48:52 -0000 1.1
+++ GetResource.java 24 Dec 2003 14:35:28 -0000 1.2
@@ -89,15 +89,12 @@
}
Collection col = getCollection((String) message.get(COLLECTION));
-
Object obj = col.getEntry(message.get(NAME));
- if (obj == null) {
- throw new Exception(API_NAME + ": Document not found " +
- (String) message.get(NAME));
- }
Hashtable result = new Hashtable();
- if (obj instanceof byte[]) {
+ if (obj == null) {
+ // Return empty result
+ } else if (obj instanceof byte[]) {
// Binary resource
result.put(RESULT, obj);
} else if (message.containsKey(COMPRESSED)) {
