Author: jkoster
Date: 2009-09-23 14:19:54 +0200 (Wed, 23 Sep 2009)
New Revision: 38806
Modified:
natmm/trunk/src/com/finalist/mmbase/util/LeoCMSCloudProvider.java
natmm/trunk/src/nl/mmatch/CSVReader.java
natmm/trunk/src/nl/mmatch/NatureReservesReader.java
Log:
NMCMS-590 - Remove unused imports; use static calls; remove unused variables.
Modified: natmm/trunk/src/com/finalist/mmbase/util/LeoCMSCloudProvider.java
===================================================================
--- natmm/trunk/src/com/finalist/mmbase/util/LeoCMSCloudProvider.java
2009-09-23 11:30:54 UTC (rev 38805)
+++ natmm/trunk/src/com/finalist/mmbase/util/LeoCMSCloudProvider.java
2009-09-23 12:19:54 UTC (rev 38806)
@@ -13,7 +13,6 @@
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Properties;
import org.apache.commons.logging.Log;
@@ -50,7 +49,6 @@
}
private void readConfiguration(){
- String cloudProviderClassName = null;
try {
properties = new Properties();
properties.load(getClass().getResourceAsStream(CONFIGURATION_RESOURCE_NAME));
Modified: natmm/trunk/src/nl/mmatch/CSVReader.java
===================================================================
--- natmm/trunk/src/nl/mmatch/CSVReader.java 2009-09-23 11:30:54 UTC (rev
38805)
+++ natmm/trunk/src/nl/mmatch/CSVReader.java 2009-09-23 12:19:54 UTC (rev
38806)
@@ -63,7 +63,6 @@
}
private Integer getDate(String thisDate, int defaultYear) {
- int thisDay = 1;
int thisMonth = 0;
int thisYear = defaultYear;
int pPos = thisDate.indexOf("+");
@@ -399,7 +398,6 @@
if(nextLine.indexOf("-----|")==-1) log.info("expecting -----| ...
on second line of " + orgFile);
Node thisNode = null;
- Node relatedNode = null;
String [] labels = { "DPIB015_SL", "OE_HOGER_N", "OE_KORT",
"OE_VOL_NM" };
String thisType = "afdelingen";
nextLine = dataFileReader.readLine();
@@ -407,7 +405,7 @@
nextLine += "|";
thisTree.clear();
int v = 0;
- while(nextLine!=null&&v<labels.length) {
+ while(v<labels.length) {
int cPos = nextLine.indexOf("|");
String value = "";
if(cPos>-1) {
@@ -431,7 +429,7 @@
thisNode.setValue("naam",thisTree.get("OE_VOL_NM"));
thisNode.commit();
thisTree.put(thisType,thisTree.get("OE_HOGER_N"));
- Node destination = relatedNodes(cloud, thisTree, thisNode,
thisType, "externid", "readmore", "", "",false);
+// Node destination = relatedNodes(cloud, thisTree, thisNode,
thisType, "externid", "readmore", "", "",false);
nextLine = dataFileReader.readLine();
}
dataFileReader.close();
@@ -440,7 +438,7 @@
log.info(thisTree);
log.info(logMessage);
}
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize() + " -
Organisational structure is read from: " + orgFile;
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() + su.jvmSize()
+ " - Organisational structure is read from: " + orgFile;
return logMessage;
}
@@ -601,7 +599,7 @@
entries++;
}
dataFileReader.close();
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize()
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() + su.jvmSize()
+ " - Number of NM employees loaded from: " + dataFile + " is " +
persons + " (number of entries is " + entries + ")"
+ "\n<br>Number of email addresses parsed: " + emails.size()
+ "\n<br>Number of persons for which no email address could be found:
" + noemails;
@@ -642,7 +640,6 @@
"FUNC_EXT", "KOSTEN", "K_OF_S_OMSCHRIJVING" };
int persons=0;
int entries=0;
- int noemails=0;
nextLine = dataFileReader.readLine();
while(nextLine!=null) {
thisPerson.clear();
@@ -711,7 +708,7 @@
entries++;
}
dataFileReader.close();
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize()
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() + su.jvmSize()
+ " - Number of NM vrijwilligers loaded from: " + dataFile + " is "
+ persons + " (number of entries is " + entries + ")";
} catch(Exception e) {
log.info(e);
@@ -904,7 +901,7 @@
}
dataFileReader.close();
application.setAttribute("zipCodeMap",zipCodeMap);
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize()
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() +
su.jvmSize()
+ " - Number of zipcodes loaded from: " + dataFile + " unzipped
from "
+ zipFile + " (lm=" + lastModifiedDate(zipFile) + ") is " +
zipcodes + " (number of errors " + errors + ")";
}
@@ -1010,7 +1007,7 @@
application.setAttribute("houseExtTable",houseExtTable);
application.setAttribute("lastNameTable",lastNameTable);
application.setAttribute("invLastNameTable",invLastNameTable);
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize()
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() +
su.jvmSize()
+ " - Number of persons loaded from: " + dataFile + " unzipped
from "
+ zipFile + " (lm=" + lastModifiedDate(zipFile) + ") is " +
persons + " (number of errors " + errors + ")";
}
@@ -1046,8 +1043,7 @@
// user.put("password","");
// Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase","name/password",user);
- MMBaseContext mc = new MMBaseContext();
- ServletContext application = mc.getServletContext();
+ ServletContext application = MMBaseContext.getServletContext();
String requestUrl = (String) application.getAttribute("request_url");
if(requestUrl==null) { requestUrl = "www.natuurmonumenten.nl"; }
@@ -1085,7 +1081,7 @@
int nodesMarked = 0;
int nodesDeleted = 0;
int numberOfEmptyDept = 0;
- String logMessage = "\n<br>" + su.getDateTimeString() +
su.jvmSize() + " - Started import for " + requestUrl;
+ String logMessage = "\n<br>" + ServerUtil.getDateTimeString() +
su.jvmSize() + " - Started import for " + requestUrl;
if(importType==FULL_IMPORT) {
@@ -1105,7 +1101,7 @@
nodesMarked +=
markNodesAndRelations(cloud,"afdelingen",departmentRelations,departmentFields);
TreeMap emails = getEmails(emailFile);
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize()
+ " - Emails are imported from: " + emailFile;
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() +
su.jvmSize() + " - Emails are imported from: " + emailFile;
logMessage += updateOrg(cloud,orgFile);
logMessage += updatePersons(cloud, emails, dataFile);
@@ -1116,7 +1112,7 @@
nodesDeleted +=
deleteNodesAndRelations(cloud,"afdelingen",departmentRelations,departmentFields);
numberOfEmptyDept = updateDepartments(cloud);
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize()
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() +
su.jvmSize()
+ " - Number of nodes and relations marked as inactive
before update: " + nodesMarked
+ "\n<br>Number of inactive nodes deleted: " + nodesDeleted
+ "\n<br>Number of departments without employees: " +
numberOfEmptyDept;
@@ -1137,7 +1133,7 @@
}
}
- logMessage += "\n<br>" + su.getDateTimeString() + su.jvmSize() + "
- Finished import";
+ logMessage += "\n<br>" + ServerUtil.getDateTimeString() +
su.jvmSize() + " - Finished import";
Node emailNode = cloud.getNodeManager("email").createNode();
emailNode.setValue("to", toEmailAddress);
@@ -1165,7 +1161,7 @@
private Thread getKicker(){
Thread kicker = Thread.currentThread();
if(kicker.getName().indexOf("CSVReaderThread")==-1) {
- kicker.setName("CSVReaderThread / " + su.getDateTimeString());
+ kicker.setName("CSVReaderThread / " +
ServerUtil.getDateTimeString());
kicker.setPriority(Thread.MIN_PRIORITY+1); // does this help ??
}
return kicker;
Modified: natmm/trunk/src/nl/mmatch/NatureReservesReader.java
===================================================================
--- natmm/trunk/src/nl/mmatch/NatureReservesReader.java 2009-09-23 11:30:54 UTC
(rev 38805)
+++ natmm/trunk/src/nl/mmatch/NatureReservesReader.java 2009-09-23 12:19:54 UTC
(rev 38806)
@@ -2,15 +2,10 @@
import java.util.*;
import java.io.*;
-import java.text.*;
-import java.util.zip.*;
-import javax.servlet.*;
import org.mmbase.bridge.*;
-import org.mmbase.module.core.*;
import org.mmbase.util.logging.*;
import com.finalist.mmbase.util.CloudFactory;
-import nl.leocms.evenementen.Evenement;
import nl.leocms.applications.NatMMConfig;
import nl.leocms.util.ApplicationHelper;
@@ -81,13 +76,10 @@
String toEmailAddress = NatMMConfig.getToEmailAddress();
String fromEmailAddress = NatMMConfig.getFromEmailAddress();
String root = NatMMConfig.getRootDir();
- String incoming = NatMMConfig.getIncomingDir();
- String temp = NatMMConfig.getTempDir();
String natureReservesFile = root + "Natuurgebieden.csv";
try {
-
log.info("Started import of: " + natureReservesFile);
String logMessage = "\n<br>Started import at " + new Date();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
