DLESE: Digital Lib. for Earth System Ed.

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/schemedit/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26124/action

Modified Files:
	CollectionServicesAction.java 
Log Message:
validation and export reporting now uses classes specific to the type of report, rather than the generic Report class

Index: CollectionServicesAction.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/schemedit/action/CollectionServicesAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** CollectionServicesAction.java	17 Jun 2005 19:14:48 -0000	1.14
--- CollectionServicesAction.java	7 Jul 2005 05:38:14 -0000	1.15
***************
*** 282,286 ****
  		

  		csForm.setArchivedReports (exportingService.getArchivedReports());

! 		csForm.setReport (exportingService.getServiceReport());

  		try {

  			//showExportMessages

--- 282,286 ----
  		

  		csForm.setArchivedReports (exportingService.getArchivedReports());

! 		csForm.setExportReport (exportingService.getExportReport());

  		try {

  			//showExportMessages

***************
*** 317,322 ****
  				String collection = request.getParameter("collection");

  				if (collection != null && collection.trim().length() > 0) {

! 					Report report = exportingService.getArchivedReport (collection);

! 					csForm.setReport(report);

  				}

  				return mapping.findForward ("export.reports");

--- 317,322 ----
  				String collection = request.getParameter("collection");

  				if (collection != null && collection.trim().length() > 0) {

! 					ExportReport report = (ExportReport) exportingService.getArchivedReport (collection);

! 					csForm.setExportReport(report);

  				}

  				return mapping.findForward ("export.reports");

***************
*** 348,352 ****
  			csForm.setDcsSetInfo(null);

  			csForm.setDestPath(null);

! 			csForm.setReport(null);

  			return mapping.findForward ("export.collection");

  		}

--- 348,352 ----
  			csForm.setDcsSetInfo(null);

  			csForm.setDestPath(null);

! 			csForm.setExportReport(null);

  			return mapping.findForward ("export.collection");

  		}

***************
*** 373,377 ****
  		csForm.setDcsSetInfo(dcsSetInfo);

  

! 		csForm.setReport(null);

  		return mapping.findForward("export.collection");

  	}

--- 373,377 ----
  		csForm.setDcsSetInfo(dcsSetInfo);

  

! 		csForm.setExportReport(null);

  		return mapping.findForward("export.collection");

  	}

***************
*** 422,426 ****
  			DcsSetInfo dcsSetInfo = SchemEditUtils.getDcsSetInfo(collection, rm);

  			csForm.setDcsSetInfo(dcsSetInfo);

! 			csForm.setReport(null);

  			csForm.setIsExporting(true);

  			try {

--- 422,426 ----
  			DcsSetInfo dcsSetInfo = SchemEditUtils.getDcsSetInfo(collection, rm);

  			csForm.setDcsSetInfo(dcsSetInfo);

! 			csForm.setExportReport(null);

  			csForm.setIsExporting(true);

  			try {

***************
*** 468,472 ****
  		} 

  */

! 		csForm.setReport (validatingService.getServiceReport());

  		csForm.setArchivedReports (validatingService.getArchivedReports());

  		try {

--- 468,472 ----
  		} 

  */

! 		csForm.setValidationReport (validatingService.getValidationReport());

  		csForm.setArchivedReports (validatingService.getArchivedReports());

  		try {

***************
*** 501,505 ****
  				String collection = request.getParameter("collection");

  				validatingService.clearServiceReport();

! 				csForm.setReport(null);

  				if (collection != null && collection.trim().length() > 0) {

  					// csForm.setDestPath ("");

--- 501,505 ----
  				String collection = request.getParameter("collection");

  				validatingService.clearServiceReport();

! 				csForm.setValidationReport(null);

  				if (collection != null && collection.trim().length() > 0) {

  					// csForm.setDestPath ("");

***************
*** 512,516 ****
  					csForm.setCollection (null);

  					csForm.setDcsSetInfo(null);

! 					csForm.setReport(null);

  					return mapping.findForward ("validate.collection");

  				}

--- 512,516 ----
  					csForm.setCollection (null);

  					csForm.setDcsSetInfo(null);

! 					csForm.setValidationReport(null);

  					return mapping.findForward ("validate.collection");

  				}

***************
*** 519,524 ****
  				String collection = request.getParameter("collection");

  				if (collection != null && collection.trim().length() > 0) {

! 					Report report = validatingService.getArchivedReport (collection);

! 					csForm.setReport(report);

  				}

  				return mapping.findForward ("validation.reports");

--- 519,531 ----
  				String collection = request.getParameter("collection");

  				if (collection != null && collection.trim().length() > 0) {

! 					ValidationReport report = (ValidationReport) validatingService.getArchivedReport (collection);

! 					prtln ("setting report in csForm");

! 					if (report instanceof ValidationReport)

! 						prtln ("  .. ValidationReport");

! 					else if (report instanceof Report)

! 						prtln ("  ... Report");

! 					else

! 						prtln ("  .. unknown");

! 					csForm.setValidationReport(report);

  				}

  				return mapping.findForward ("validation.reports");

***************
*** 570,574 ****
  		DcsSetInfo dcsSetInfo = SchemEditUtils.getDcsSetInfo(collection, rm);

  		csForm.setDcsSetInfo(dcsSetInfo);

! 		csForm.setReport(null);

  		csForm.setIsValidating(true);

  		String[] selectedStatuses = request.getParameterValues("sss");

--- 577,581 ----
  		DcsSetInfo dcsSetInfo = SchemEditUtils.getDcsSetInfo(collection, rm);

  		csForm.setDcsSetInfo(dcsSetInfo);

! 		csForm.setValidationReport(null);

  		csForm.setIsValidating(true);

  		String[] selectedStatuses = request.getParameterValues("sss");