[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/suggest/resource ResourceEmailer.ja

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/suggest/resource
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv19611/resource

Modified Files:
	ResourceEmailer.java SuggestResourceHelper.java 
Log Message:
parameterized emailTo and emailFrom as init paramters. refactored helpers and emailer classes

Index: ResourceEmailer.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/suggest/resource/ResourceEmailer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ResourceEmailer.java	21 Mar 2008 21:33:31 -0000	1.3
--- ResourceEmailer.java	11 Jun 2008 22:53:08 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  
  import org.dlese.dpc.suggest.Emailer;
+ import org.dlese.dpc.suggest.SuggestHelper;
  import org.dlese.dpc.suggest.action.form.SuggestForm;
  import org.dlese.dpc.suggest.action.form.SuggestResourceForm;
***************
*** 40,45 ****
   *  Formats and sends email notifying of a newly suggested resource
   *
!  *@author    ostwald
!   $Id$
   */
  public class ResourceEmailer extends Emailer {
--- 41,45 ----
   *  Formats and sends email notifying of a newly suggested resource
   *
!  * @author    ostwald
   */
  public class ResourceEmailer extends Emailer {
***************
*** 47,55 ****
  	private static boolean debug = true;
  
  	/**
  	 *  Constructor for the ResourceEmailer object
  	 */
! 	public ResourceEmailer(String repositoryURL, String recId, String mailServer) {
! 		super (repositoryURL, recId, mailServer);
  	}
  
--- 47,59 ----
  	private static boolean debug = true;
  
+ 
  	/**
  	 *  Constructor for the ResourceEmailer object
+ 	 *
+ 	 * @param  recId   id of suggested record
+ 	 * @param  helper  SuggestResourceHelper instance
  	 */
! 	public ResourceEmailer(String recId, SuggestHelper helper) {
! 		super(recId, helper);
  	}
  
***************
*** 58,63 ****
  	 *  creates a comma delimitted display of the grade Range values
  	 *
! 	 *@param  gr  an array of grade Ranges values
! 	 *@return     comma delimited String
  	 */
  	private String gradeRangeStr(String[] gr) {
--- 62,67 ----
  	 *  creates a comma delimitted display of the grade Range values
  	 *
! 	 * @param  gr  an array of grade Ranges values
! 	 * @return     comma delimited String
  	 */
  	private String gradeRangeStr(String[] gr) {
***************
*** 75,95 ****
  	}
  
! 	protected String [] getMsgTo () {
! 		return new String[] {"ca...@li...", "os...@uc..."};
! 	}
! 	
! 	protected String getMsgFrom () {
! 		return "ca...@li...";
! 	}
! 	
! 	protected String getMsgSubject () {
  		return "Suggested URL (" + recId + ")";
  	}
! 	
! 	protected String getMsgBody (SuggestForm form) {
! 		
! 		SuggestResourceForm srf = (SuggestResourceForm)form;
! 		
! 		String manageLink = repositoryURL + "/view.do?id=" + recId;
  		String msgBody = "";
  		if (srf.getDupRecord() != null) {
--- 79,104 ----
  	}
  
! 
! 	/**
! 	 *  Gets the msgSubject attribute of the ResourceEmailer object
! 	 *
! 	 * @return    The msgSubject value
! 	 */
! 	protected String getMsgSubject() {
  		return "Suggested URL (" + recId + ")";
  	}
! 
! 
! 	/**
! 	 *  Gets the msgBody attribute of the ResourceEmailer object
! 	 *
! 	 * @param  form  NOT YET DOCUMENTED
! 	 * @return       The msgBody value
! 	 */
! 	protected String getMsgBody(SuggestForm form) {
! 
! 		SuggestResourceForm srf = (SuggestResourceForm) form;
! 
! 		String manageLink = helper.getViewBaseUrl() + "/view.do?id=" + recId;
  		String msgBody = "";
  		if (srf.getDupRecord() != null) {
***************
*** 114,138 ****
  		ValidatorResults validatorResults = srf.getValidatorResults();
  		if (validatorResults.hasSimilarUrls()) {
! 			msgBody += "\n\n" + similarUrlsReport (validatorResults);
  		}
  		return msgBody;
  	}
  
! 	private String similarUrlsReport (ValidatorResults vr) {
  		String report = "";
  		if (vr.getSimilarPrimaryUrls().size() > 0) {
  			report += "Records having similar Primary Urls";
! 			for (Iterator i=vr.getSimilarPrimaryUrls().iterator();i.hasNext();) {
  				DupSim sim = (DupSim) i.next();
  				report += "\n\t" + sim.getId() + ",  " + sim.getUrl();
! 				report += "\n\t\tview at: " + repositoryURL + "/view.do?id="+sim.getId();
  			}
  		}
  		if (vr.getSimilarMirrorUrls().size() > 0) {
  			report += "\n\nRecords having similar Mirror Urls";
! 			for (Iterator i=vr.getSimilarMirrorUrls().iterator();i.hasNext();) {
  				DupSim sim = (DupSim) i.next();
  				report += "\n\t" + sim.getId() + ",  " + sim.getUrl();
! 				report += "\n\t\tview at: " + repositoryURL + "/view.do?id="+sim.getId();
  			}
  		}
--- 123,155 ----
  		ValidatorResults validatorResults = srf.getValidatorResults();
  		if (validatorResults.hasSimilarUrls()) {
! 			msgBody += "\n\n" + similarUrlsReport(validatorResults);
  		}
  		return msgBody;
  	}
  
! 
! 	/**
! 	 *  NOT YET DOCUMENTED
! 	 *
! 	 * @param  vr  NOT YET DOCUMENTED
! 	 * @return     NOT YET DOCUMENTED
! 	 */
! 	private String similarUrlsReport(ValidatorResults vr) {
  		String report = "";
+ 		String repositoryURL = this.helper.getViewBaseUrl();
  		if (vr.getSimilarPrimaryUrls().size() > 0) {
  			report += "Records having similar Primary Urls";
! 			for (Iterator i = vr.getSimilarPrimaryUrls().iterator(); i.hasNext(); ) {
  				DupSim sim = (DupSim) i.next();
  				report += "\n\t" + sim.getId() + ",  " + sim.getUrl();
! 				report += "\n\t\tview at: " + repositoryURL + "/view.do?id=" + sim.getId();
  			}
  		}
  		if (vr.getSimilarMirrorUrls().size() > 0) {
  			report += "\n\nRecords having similar Mirror Urls";
! 			for (Iterator i = vr.getSimilarMirrorUrls().iterator(); i.hasNext(); ) {
  				DupSim sim = (DupSim) i.next();
  				report += "\n\t" + sim.getId() + ",  " + sim.getUrl();
! 				report += "\n\t\tview at: " + repositoryURL + "/view.do?id=" + sim.getId();
  			}
  		}
***************
*** 140,147 ****
  	}
  
  	/**
  	 *  The main program for the ResourceEmailer class
  	 *
! 	 *@param  args  The command line arguments
  	 */
  	public static void main(String[] args) {
--- 157,165 ----
  	}
  
+ 
  	/**
  	 *  The main program for the ResourceEmailer class
  	 *
! 	 * @param  args  The command line arguments
  	 */
  	public static void main(String[] args) {
***************
*** 172,176 ****
  	 *  Sets the debug attribute of the ResourceEmailer object
  	 *
! 	 *@param  db     The new debug value
  	 */
  	public static void setDebug(boolean db) {
--- 190,194 ----
  	 *  Sets the debug attribute of the ResourceEmailer object
  	 *
! 	 * @param  db  The new debug value
  	 */
  	public static void setDebug(boolean db) {
***************
*** 182,186 ****
  	 *  Print the string with trailing newline to std output
  	 *
! 	 *@param  s  string to print
  	 */
  	private static void prtln(String s) {
--- 200,204 ----
  	 *  Print the string with trailing newline to std output
  	 *
! 	 * @param  s  string to print
  	 */
  	private static void prtln(String s) {

Index: SuggestResourceHelper.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/suggest/resource/SuggestResourceHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SuggestResourceHelper.java	25 Sep 2007 22:47:37 -0000	1.1
--- SuggestResourceHelper.java	11 Jun 2008 22:53:08 -0000	1.2
***************
*** 49,53 ****
   *
   *@author    Jonathan Ostwald
-   $Id$
   */
  public class SuggestResourceHelper extends SuggestHelper {
--- 49,52 ----
***************
*** 118,121 ****
--- 117,121 ----
  		prtln("putRecordToDCS(): dcsStatus=" + dcsStatus + ", dcsStatusNote=" + dcsStatusNote);
  
+ 		String destCollection = this.getDestCollection();
  		if (destCollection == null || destCollection.trim().length() == 0) {
  			prtln("destCollection not specified, putRecordToDCS exiting ... ");
***************
*** 133,146 ****
  		// insert namespace info
  		String nameSpaceInfo = SuggestUtils.getNameSpaceInfo(schemaHelper);
- 		// prtln ("nameSpaceInfo: " + nameSpaceInfo);
  		String rootElementName = doc.getRootElement().getName();
- 		// prtln ("rootElementName: " + rootElementName);
  		Document adnDoc = Dom4jUtils.delocalizeXml(doc, rootElementName, nameSpaceInfo);
  
  		String newRecId = null;
  		try {
! 			newRecId = repositoryServiceClient.doPutRecord(adnDoc.asXML(), 
  														   "adn", 
! 														   destCollection, 
  														   dcsStatus, 
  														   dcsStatusNote);
--- 133,144 ----
  		// insert namespace info
  		String nameSpaceInfo = SuggestUtils.getNameSpaceInfo(schemaHelper);
  		String rootElementName = doc.getRootElement().getName();
  		Document adnDoc = Dom4jUtils.delocalizeXml(doc, rootElementName, nameSpaceInfo);
  
  		String newRecId = null;
  		try {
! 			newRecId = getRepositoryServiceClient().doPutRecord(adnDoc.asXML(), 
  														   "adn", 
! 														   getDestCollection(), 
  														   dcsStatus, 
  														   dcsStatusNote);
***************
*** 169,173 ****
  	private static void prtln(String s) {
  		if (debug) {
- 			// System.out.println("SuggestResourceHelper: " + s);
  			org.dlese.dpc.schemedit.SchemEditUtils.prtln (s, "SuggestResourceHelper");
  		}
--- 167,170 ----

[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/suggest/resource ResourceEmailer.ja

[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/suggest/resource ResourceEmailer.java, 1.3, 1.4, SuggestResourceHelper.java, 1.1, 1.2,