[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/repository RepositoryManager.java, 1.178, 1.179,

[John W. <jwe...@us...>]

Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/repository
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7206/src/org/dlese/dpc/repository

Modified Files:
	RepositoryManager.java 
Log Message:
Added escaping (entity references) of values that get inserted into the collection record in the PutCollection method. Fixes problem where PutCollection failed if invalid XML was in values

Index: RepositoryManager.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/repository/RepositoryManager.java,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** RepositoryManager.java	16 Mar 2010 21:42:01 -0000	1.178
--- RepositoryManager.java	25 Mar 2010 00:16:05 -0000	1.179
***************
*** 4261,4270 ****
  					description = (description == null ? "" : description);
  					collRecordXml = Files.readFileFromJarClasspath("/org/dlese/dpc/repository/COLLECTION-RECORD-TEMPLATE.xml").toString();
! 					collRecordXml = collRecordXml.replaceFirst("@FORMAT@", xmlFormat);
! 					collRecordXml = collRecordXml.replaceFirst("@KEY@", collectionKey);
! 					collRecordXml = collRecordXml.replaceAll("@TITLE@", title);
! 					collRecordXml = collRecordXml.replaceFirst("@DESCRIPTION@", description);
  					collRecordXml = collRecordXml.replaceFirst("@ACCESSION_DATE@", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(accessionDate));
! 					collRecordXml = collRecordXml.replaceFirst("@ID@", collId);
  
  					// Index the collection record:
--- 4261,4270 ----
  					description = (description == null ? "" : description);
  					collRecordXml = Files.readFileFromJarClasspath("/org/dlese/dpc/repository/COLLECTION-RECORD-TEMPLATE.xml").toString();
! 					collRecordXml = collRecordXml.replaceFirst("@FORMAT@", XMLUtils.escapeXml(xmlFormat));
! 					collRecordXml = collRecordXml.replaceFirst("@KEY@", XMLUtils.escapeXml(collectionKey));
! 					collRecordXml = collRecordXml.replaceAll("@TITLE@", XMLUtils.escapeXml(title));
! 					collRecordXml = collRecordXml.replaceFirst("@DESCRIPTION@", XMLUtils.escapeXml(description));
  					collRecordXml = collRecordXml.replaceFirst("@ACCESSION_DATE@", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(accessionDate));
! 					collRecordXml = collRecordXml.replaceFirst("@ID@", XMLUtils.escapeXml(collId));
  
  					// Index the collection record: