[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/schemedit/ndr/writer MetadataWriter.java, 1.20, 1.21, NSDLCollectionWriter.java, 1.13, 1.14,

[Jonathan O. <os...@us...>]

Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/ndr/writer
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26677

Modified Files:
	MetadataWriter.java NSDLCollectionWriter.java 
Log Message:
now write nsdl:itemId to dcsDataRecord so it can be exposed via webservice (in header for ncs_collect)

Index: NSDLCollectionWriter.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/ndr/writer/NSDLCollectionWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NSDLCollectionWriter.java	5 May 2008 22:33:07 -0000	1.13
--- NSDLCollectionWriter.java	12 Jun 2008 20:35:17 -0000	1.14
***************
*** 190,193 ****
--- 190,195 ----
  		dcsDataRecord.setNdrHandle(report.getMetadataHandle());
  		dcsDataRecord.setMetadataProviderHandle (collectionMetadataProvider);
+ 		dcsDataRecord.setNsdlItemId(this.nsdlItemId);
+ 		
  		dcsDataRecord.setLastSyncDate(new Date());
  		dcsDataRecord.flushToDisk();

Index: MetadataWriter.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/ndr/writer/MetadataWriter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MetadataWriter.java	2 May 2008 19:26:49 -0000	1.20
--- MetadataWriter.java	12 Jun 2008 20:35:17 -0000	1.21
***************
*** 61,64 ****
--- 61,66 ----
  	/**  Description of the Field */
  	protected boolean finalAndValid = false;
+ 	
+ 	protected String nsdlItemId = null;
  
  
***************
*** 192,195 ****
--- 194,198 ----
  			// always write the handle into DcsDataRecord, just to ensure that we are synced
  			dcsDataRecord.setNdrHandle(report.getMetadataHandle());
+ 			dcsDataRecord.setNsdlItemId(this.nsdlItemId);
  			dcsDataRecord.setLastSyncDate(new Date());
  			dcsDataRecord.flushToDisk();
***************
*** 293,297 ****
  		ndrRequest.addNcsPropertyCmd("recordId", recId);
  		ndrRequest.addCommand("property", "uniqueID", recId);
! 		ndrRequest.addCommand("property", "itemId", "oai:nsdl.org:ncs:" + recId);
  
  		ndrRequest.addCommand("relationship", "metadataFor", resHandle);
--- 296,301 ----
  		ndrRequest.addNcsPropertyCmd("recordId", recId);
  		ndrRequest.addCommand("property", "uniqueID", recId);
! 		this.nsdlItemId = "oai:nsdl.org:ncs:" + recId;
! 		ndrRequest.addCommand("property", "itemId", nsdlItemId);
  
  		ndrRequest.addCommand("relationship", "metadataFor", resHandle);
***************
*** 328,331 ****
--- 332,336 ----
  		} */
  
+ 		this.nsdlItemId = this.getMetadataReader().getProperty("itemId");
  		setMetadataForRelationships(ndrRequest, resHandle);