[Exist-commits] eXist-1.0/src/org/exist/backup Backup.java,1.19,1.20 Restore.java,1.15,1.16

[Giulio V. <gva...@us...>]

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

Modified Files:
	Backup.java Restore.java 
Log Message:
restore mimetype

Index: Restore.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/backup/Restore.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Restore.java	23 Mar 2005 22:35:39 -0000	1.15
--- Restore.java	27 Mar 2005 17:11:48 -0000	1.16
***************
*** 17,20 ****
--- 17,21 ----
  import org.exist.xmldb.CollectionImpl;
  import org.exist.xmldb.UserManagementService;
+ import org.exist.xmldb.EXistResource;
  import org.xml.sax.Attributes;
  import org.xml.sax.InputSource;
***************
*** 185,189 ****
--- 186,192 ----
  				final String perms = atts.getValue("mode");
  				
+ 				
  				String filename = atts.getValue("filename");
+ 				final String mimetype = atts.getValue("mimetype");
  				if (filename == null) filename = name;
  
***************
*** 201,204 ****
--- 204,210 ----
  					final Resource res =
  						current.createResource(name, type);
+ 					if (mimetype != null)
+ 						((EXistResource)res).setMimeType(mimetype);
+ 					
  					res.setContent(f);
  					if(dialog == null)

Index: Backup.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/backup/Backup.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Backup.java	23 Mar 2005 15:38:30 -0000	1.19
--- Backup.java	27 Mar 2005 17:11:47 -0000	1.20
***************
*** 309,313 ****
  					encode( ""+resources[i] )
  					 );
! 
  			
  			serializer.startElement(NS, "resource", "resource", attr);
--- 309,319 ----
  					encode( ""+resources[i] )
  					 );
! 			attr.addAttribute(
! 					NS,
! 					"mimetype",
! 					"mimetype",
! 					"CDATA",
! 					encode( ((EXistResource)resource).getMimeType())
! 					 );
  			
  			serializer.startElement(NS, "resource", "resource", attr);