NAS-2650 and NAS-2649 fixing typo and deleting commented code

netarchivesuite · Feb 17, 2018 · eb8d231 · eb8d231
1 parent de1de7c
commit eb8d231
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/...ster/harvest-scheduler/src/main/java/dk/netarkivet/harvester/scheduler/JobDispatcher.java b/...ster/harvest-scheduler/src/main/java/dk/netarkivet/harvester/scheduler/JobDispatcher.java
@@ -216,12 +216,8 @@ public void doOneCrawl(Job job, String origHarvestName, String origHarvestDesc,
         if (usingWarcAsArchiveFormat()) {
         	log.info("As we're using WARC as archiveFormat WarcInfoMetadata is now added to the template");
         	HeritrixTemplate ht = job.getOrderXMLdoc();
-            //if (job.getContinuationOf() == null ) {
                 ht.insertWarcInfoMetadata(job, origHarvestName, origHarvestDesc, origHarvestSchedule,
                         Settings.get(HarvesterSettings.PERFORMER));
-            //} else {
-            //    log.info("Job is a continuation of " + job.getContinuationOf() + " so no need to replace WarcInfoMetadata");
-            //}
             job.setOrderXMLDoc(ht);
         } else {
         	log.info("As we're using ARC as archiveFormat no WarcInfoMetadata was added to the template");

diff --git a/...er/harvester-core/src/main/java/dk/netarkivet/harvester/datamodel/H1HeritrixTemplate.java b/...er/harvester-core/src/main/java/dk/netarkivet/harvester/datamodel/H1HeritrixTemplate.java
@@ -870,7 +870,7 @@ public void insertWarcInfoMetadata(Job ajob, String origHarvestdefinitionName,
         metadataItem.addText(origHarvestdefinitionName);
 
         metadataItem = metadataMap.addElement("string");
-        metadataItem.addAttribute("name", HARVESTINFO_ORIGHARVESTDEFINITIONNCOMMENTS);
+        metadataItem.addAttribute("name", HARVESTINFO_ORIGHARVESTDEFINITIONCOMMENTS);
         metadataItem.addText(origHarvestdefinitionComments);
 
         /* optional schedule-name, only for selective harvests. */

diff --git a/...er/harvester-core/src/main/java/dk/netarkivet/harvester/datamodel/H3HeritrixTemplate.java b/...er/harvester-core/src/main/java/dk/netarkivet/harvester/datamodel/H3HeritrixTemplate.java
@@ -651,7 +651,7 @@ public void insertWarcInfoMetadata(Job ajob, String origHarvestdefinitionName,
 
 		if(StringUtils.isNotEmpty(origHarvestdefinitionComments)) {
 			sb.append(startMetadataEntry);
-			sb.append(HARVESTINFO_ORIGHARVESTDEFINITIONNCOMMENTS + valuePart + 
+			sb.append(HARVESTINFO_ORIGHARVESTDEFINITIONCOMMENTS + valuePart + 
 				origHarvestdefinitionComments + endMetadataEntry);
 		}
 

diff --git a/...ster/harvester-core/src/main/java/dk/netarkivet/harvester/datamodel/HeritrixTemplate.java b/...ster/harvester-core/src/main/java/dk/netarkivet/harvester/datamodel/HeritrixTemplate.java
@@ -52,7 +52,7 @@ public abstract class HeritrixTemplate implements Serializable {
 	protected static final String HARVESTINFO_ORDERXMLUPDATEDATE = "harvestInfo.templateLastUpdateDate";
 	protected static final String HARVESTINFO_ORDERXMLDESCRIPTION = "harvestInfo.templateDescription";
 	protected static final String HARVESTINFO_ORIGHARVESTDEFINITIONNAME = "harvestInfo.origHarvestDefinitionName";
-	protected static final String HARVESTINFO_ORIGHARVESTDEFINITIONNCOMMENTS = "harvestInfo.origHarvestDefinitionComments";
+	protected static final String HARVESTINFO_ORIGHARVESTDEFINITIONCOMMENTS = "harvestInfo.origHarvestDefinitionComments";
 	protected static final String HARVESTINFO_SCHEDULENAME = "harvestInfo.scheduleName";
 	protected static final String HARVESTINFO_HARVESTFILENAMEPREFIX = "harvestInfo.harvestFilenamePrefix";
 	protected static final String HARVESTINFO_JOBSUBMITDATE = "harvestInfo.jobSubmitDate";