[Exist-commits] eXist-1.0/src/org/exist/xmldb DatabaseImpl.java,1.20,1.21 RemoteXMLResource.java,1.15,1.16

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xmldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17693/src/org/exist/xmldb

Modified Files:
	DatabaseImpl.java RemoteXMLResource.java 
Log Message:
Remote backup/restore did not work.

Index: DatabaseImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/DatabaseImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DatabaseImpl.java	3 Sep 2004 09:05:32 -0000	1.20
--- DatabaseImpl.java	16 Sep 2004 12:33:43 -0000	1.21
***************
*** 141,145 ****
                  "collection " + collection +
                  " does not start with '" + selector + "'" );
-         String address = DEFAULT_HOST;
          String c = collection.substring( selector.length() );
          if(c.endsWith("/") && c.length() > 1)
--- 141,144 ----
***************
*** 150,158 ****
          }
          else if ( c.startsWith( "//" ) ) {
!             return getRemoteCollection(user, password, address, c);
          }
          else
              throw new XMLDBException( ErrorCodes.INVALID_DATABASE,
!                 "malformed url: " + address );
      }
      
--- 149,157 ----
          }
          else if ( c.startsWith( "//" ) ) {
!             return getRemoteCollection(user, password, c);
          }
          else
              throw new XMLDBException( ErrorCodes.INVALID_DATABASE,
!                 "malformed url: " + c );
      }
      
***************
*** 165,171 ****
       * @throws XMLDBException
       */
!     private Collection getRemoteCollection(String user, String password, String address, String c) throws XMLDBException {
          // use remote database via XML-RPC
          mode = REMOTE;
          if ( user == null ) {
              user = "guest";
--- 164,171 ----
       * @throws XMLDBException
       */
!     private Collection getRemoteCollection(String user, String password, String c) throws XMLDBException {
          // use remote database via XML-RPC
          mode = REMOTE;
+         String address = DEFAULT_HOST;
          if ( user == null ) {
              user = "guest";
***************
*** 177,180 ****
--- 177,182 ----
          if ( ( p = c.indexOf( "/db", 2 ) ) > -1 ) {
              address = "http://" + c.substring( 2, p );
+             if(address.charAt(address.length() - 1) == '/')
+             	address = address.substring(0, address.length() - 1);
              c = c.substring( p );
          }

Index: RemoteXMLResource.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteXMLResource.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RemoteXMLResource.java	12 Aug 2004 16:07:17 -0000	1.15
--- RemoteXMLResource.java	16 Sep 2004 12:33:43 -0000	1.16
***************
*** 193,196 ****
--- 193,197 ----
  				reader.parse(new InputSource(new StringReader(content)));
  			} catch (SAXException saxe) {
+ 				saxe.printStackTrace();
  				throw new XMLDBException(ErrorCodes.VENDOR_ERROR, saxe.getMessage(), saxe);
  			} catch (ParserConfigurationException pce) {
***************
*** 207,211 ****
  				throw new XMLDBException(ErrorCodes.VENDOR_ERROR, ioe.getMessage(), ioe);
  			}
- 
  	}
  
--- 208,211 ----