|
From: <tr...@us...> - 2003-07-19 15:32:31
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple In directory sc8-pr-cvs1:/tmp/cvs-serv13778/modules/core/src/com/babeldoc/core/journal/simple Modified Files: SimpleJournal.java Log Message: Removed ostermiller utils from babeldoc Index: SimpleJournal.java =================================================================== RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple/SimpleJournal.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SimpleJournal.java 27 Jun 2003 02:19:58 -0000 1.5 --- SimpleJournal.java 19 Jul 2003 15:32:27 -0000 1.6 *************** *** 66,72 **** package com.babeldoc.core.journal.simple; - import com.Ostermiller.util.CSVParser; - import com.Ostermiller.util.CSVPrinter; - import com.babeldoc.core.I18n; import com.babeldoc.core.LogService; --- 66,69 ---- *************** *** 76,79 **** --- 73,78 ---- import com.babeldoc.core.journal.query.QueryTicket; import com.babeldoc.core.pipeline.PipelineDocument; + import com.mindprod.csv.CSVWriter; + import com.mindprod.csv.CSVReader; import java.io.*; *************** *** 136,140 **** /** Configuration stuff */ private static FileWriter logWriter; ! private static CSVPrinter logPrinter; private static String logFile; private static int logMaxSize = 1024 * 1024; --- 135,139 ---- /** Configuration stuff */ private static FileWriter logWriter; ! private static CSVWriter logPrinter; private static String logFile; private static int logMaxSize = 1024 * 1024; *************** *** 152,156 **** CONFIG_NAME, JOURNAL_LOGFILE)); logWriter = new FileWriter(logFile, true); ! logPrinter = new CSVPrinter(logWriter); trackerDir = com.babeldoc.core.VariableProcessor.expandString(ConfigService.getString( CONFIG_NAME, JOURNAL_DIR)); --- 151,155 ---- CONFIG_NAME, JOURNAL_LOGFILE)); logWriter = new FileWriter(logFile, true); ! logPrinter = new CSVWriter(logWriter); trackerDir = com.babeldoc.core.VariableProcessor.expandString(ConfigService.getString( CONFIG_NAME, JOURNAL_DIR)); *************** *** 184,192 **** try { ! CSVParser parser = new CSVParser(new FileReader(logFile)); String[] values; String tickval = Long.toString(((JournalTicket) parent).getValue()); ! while ((values = parser.getLine()) != null) { // Value in the journal for this ticket? if (values[2].equals(JournalOperation.forkTicket.toString()) && --- 183,191 ---- try { ! CSVReader csvReader = new CSVReader(new FileReader(logFile)); String[] values; String tickval = Long.toString(((JournalTicket) parent).getValue()); ! while ((values = csvReader.getAllFieldsInLine()) != null) { // Value in the journal for this ticket? if (values[2].equals(JournalOperation.forkTicket.toString()) && *************** *** 217,224 **** try { ! CSVParser parser = new CSVParser(new FileReader(logFile)); String[] values; ! while ((values = parser.getLine()) != null) { // Value in the journal for this ticket? if (ticket.equals(values[0])) { --- 216,223 ---- try { ! CSVReader csvReader = new CSVReader(new FileReader(logFile)); String[] values; ! while ((values = csvReader.getAllFieldsInLine()) != null) { // Value in the journal for this ticket? if (ticket.equals(values[0])) { *************** *** 261,265 **** try { ! File directory = getLogDirectory(ticket); File logop = makeTicketDocumentFile(ticket, step); ois = new ObjectInputStream(new FileInputStream(logop)); --- 260,264 ---- try { ! // File directory = getLogDirectory(ticket); File logop = makeTicketDocumentFile(ticket, step); ois = new ObjectInputStream(new FileInputStream(logop)); *************** *** 329,333 **** try { ! CSVParser parser = new CSVParser(new FileReader(logFile)); String[] values; int index = 0; --- 328,332 ---- try { ! CSVReader csvReader = new CSVReader(new FileReader(logFile)); String[] values; int index = 0; *************** *** 335,339 **** boolean found; ! while (((values = parser.getLine()) != null) && (count < jQuery.getNumResults())) { // Value in the journal for this ticket? --- 334,338 ---- boolean found; ! while (((values = csvReader.getAllFieldsInLine()) != null) && (count < jQuery.getNumResults())) { // Value in the journal for this ticket? *************** *** 475,483 **** if (operation.equals(JournalOperation.updateStatus)) { ! logPrinter.println(new String[] { ticket.getId(), Integer.toString( ! index), operation.toString(), Long.toString(new Date().getTime()), otherStr, pstageName, addnl }); } else { ! logPrinter.println(new String[] { ticket.getId(), Integer.toString( ! index), operation.toString(), Long.toString(new Date().getTime()), otherStr, pstageName, NULL }); } } --- 474,492 ---- if (operation.equals(JournalOperation.updateStatus)) { ! logPrinter.put(ticket.getId()); ! logPrinter.put(Integer.toString(index)); ! logPrinter.put(operation.toString()); ! logPrinter.put(Long.toString(new Date().getTime())); ! logPrinter.put(otherStr); ! logPrinter.put(pstageName); ! logPrinter.put(addnl); } else { ! logPrinter.put(ticket.getId()); ! logPrinter.put(Integer.toString(index)); ! logPrinter.put(operation.toString()); ! logPrinter.put(Long.toString(new Date().getTime())); ! logPrinter.put(otherStr); ! logPrinter.put(pstageName); ! logPrinter.put(NULL); } } *************** *** 501,505 **** log.renameTo(new File(fileName)); logWriter = new FileWriter(logFile, true); ! logPrinter = new CSVPrinter(logWriter); } } --- 510,514 ---- log.renameTo(new File(fileName)); logWriter = new FileWriter(logFile, true); ! logPrinter = new CSVWriter(logWriter); } } |