update for EOFM-116, EOFM-117

?? ?

2008-06-12 f74be0cace55a2d65fa65329b521b50e0cef2c31

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java

@@ -71,7 +71,6 @@
    private static final String USEWKB = "USEWKB";

    private static final int FETCHSIZE = 30;
    private static final int BATCHSIZE = 25;
    private static final int COMMITSIZE = 20;

    class Pair
@@ -231,8 +230,7 @@
            throw new JobExecutionException("Cannot connect source postgreSQL database.");
        }

        Calendar cal = Calendar.getInstance();
        Date startTime = cal.getTime();
        long t1 = System.currentTimeMillis();
        try
        {
            logger.info("-- step:clearOutputDatabase --");
@@ -285,11 +283,11 @@
            }

            disconnect();
            Date endTime = cal.getTime();
            Date time = new Date(endTime.getTime() - startTime.getTime());
            long t2 = System.currentTimeMillis();
            // public static final String DATE_FORMAT_NOW = "yyyy-MM-dd HH:mm:ss";
            // SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
            logger.warn("use time = " + time);
            logger.warn("use time = " + ((int) ((t2 - t1) / 60000.0)) + " min - " +
            (((int) ((t2 - t1) % 60000.0)) / 1000) + " sec");
        } catch (SQLException e)
        {
            logger.warn(e.getMessage(), e);
@@ -651,9 +649,11 @@
            logger.debug("--- start dgnfile-" + dgnFile.toString() + " ---");
            try
            {
                convertContext.clearOutputDatabase();
                convertContext.setExecutionContext(context);
                String dgnPaths[] = StringUtils.splitToArray(dgnFile.toString(), File.separator);
                convertContext.setFilename(dgnPaths[dgnPaths.length - 1]);
                convertContext.startTransaction();

                FileInputStream fs = new FileInputStream(dgnFile);
                FileChannel fc = fs.getChannel();
@@ -786,6 +786,7 @@
                convertContext.setExecutionContext(context);
                String dgnPaths[] = StringUtils.splitToArray(dgnFile.toString(), File.separator);
                convertContext.setFilename(dgnPaths[dgnPaths.length - 1]);
                convertContext.startTransaction();

                FileInputStream fs = new FileInputStream(dgnFile);
                FileChannel fc = fs.getChannel();
@@ -962,6 +963,7 @@
                convertContext.setExecutionContext(context);
                String dgnPaths[] = StringUtils.splitToArray(dgnFile.toString(), File.separator);
                convertContext.setFilename(dgnPaths[dgnPaths.length - 1]);
                convertContext.startTransaction();

                FileInputStream fs = new FileInputStream(dgnFile);
                FileChannel fc = fs.getChannel();
@@ -1089,7 +1091,7 @@

        if (!pgProperties.containsKey(PostgisDataStoreFactory.MAXCONN.key))
        {
            pgProperties.put(PostgisDataStoreFactory.MAXCONN.key, "2");
            pgProperties.put(PostgisDataStoreFactory.MAXCONN.key, "10");
        }

        if (!pgProperties.containsKey(PostgisDataStoreFactory.MINCONN.key))
@@ -1116,4 +1118,5 @@
            throw new JobExecutionException(e.getMessage(), e);
        }
    }

}