@@ -46,8 +46,8 @@ public class FileAnalyzer { typeConverter.registerConverter(new FileVersionValueConverter()); ObjectMapping fileInfoMapping = new ObjectMapping(FileInfo.class); - fileInfoMapping.field("10", "version", FileVersionValueConverter.class); - fileInfoMapping.field("9", "type", FileTypeValueConverter.class); + fileInfoMapping.field("File Identifier Code", "version", FileVersionValueConverter.class); + fileInfoMapping.field("File Identifier Name", "type", FileTypeValueConverter.class); objectMappingStore.add(fileInfoMapping); } @@ -64,7 +64,8 @@ public class FileAnalyzer { applyToParser(parser); ParseResult result = parser.parse(reader); if (result.getRecords().size() > 0) { - return (FileInfo) result.getRecords().get(0); + FileInfo info = (FileInfo) result.getRecords().get(0); + return info; } } catch (IOException e) { throw new RuntimeException(e); commonline-file/src/main/java/commonline/file/FileAnalyzer.java @@ -75,6 +75,7 @@ public class LoadFilesWorker extends SwingWorker<Void, Void> { consoleManager.println("Parsing..."); RecordParserImpl parser = (RecordParserImpl) parserRegistry.get(fileInfo); parser.setRecordFactoryResolver(recordFactoryResolver); + parser.setRecordFieldParser(fieldParser); parser.setObjectMapper(new ObjectMapper() { public void mapOnTo(Object parsedFields, Object domain) throws ObjectMappingException { CommonLineRecord record = (CommonLineRecord) domain; commonline-query-file/src/main/java/commonline/query/gui/LoadFilesWorker.java d3dd94db4a41a6e5aaba95c891ea9191a8ab1c35 Dan Dudley born2snipe@gmail.com http://github.com/born2snipe/common-line/commit/f19034c2931a9f67b601c9f93dc87ca373b96042 f19034c2931a9f67b601c9f93dc87ca373b96042 2009-06-02T18:31:49-07:00 2009-06-02T18:31:49-07:00 fixed the query tool 0750b506906869a334b4dc8bc5497c50dfc3e82d Dan Dudley born2snipe@gmail.com