- Timestamp:
- 2005-07-27T16:41:22+12:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java
r10049 r10332 316 316 /** ************************** Private Data Members ***************************/ 317 317 318 private File collect_c onfig_file;318 private File collect_cfg_file; 319 319 320 320 /** ************************** Public Methods ***************************/ 321 321 322 public CollectionConfiguration(File collect_c onfig_file) {322 public CollectionConfiguration(File collect_cfg_file) { 323 323 this.self = this; 324 this.collect_c onfig_file = collect_config_file;324 this.collect_cfg_file = collect_cfg_file; 325 325 // If collect_cfg is xml we can load it straight away 326 String collect_config_name = collect_c onfig_file.getName();326 String collect_config_name = collect_cfg_file.getName(); 327 327 if(collect_config_name.equals(COLLECTCONFIGURATION_XML)) { 328 document = XMLTools.parseXMLFile(collect_c onfig_file);328 document = XMLTools.parseXMLFile(collect_cfg_file); 329 329 } 330 330 // Otherwise if this is a legacy collect.cfg file then read in the template and send to magic parser 331 331 else if(collect_config_name.equals(COLLECT_CFG)) { 332 332 document = XMLTools.parseXMLFile("xml/CollectionConfig.xml", true); 333 parse(collect_c onfig_file);333 parse(collect_cfg_file); 334 334 } 335 335 } … … 368 368 369 369 public File getFile() { 370 return collect_c onfig_file;370 return collect_cfg_file; 371 371 } 372 372 … … 456 456 457 457 public void save(boolean force_xml) { 458 if(collect_c onfig_file.exists()) {459 File original_file = new File(collect_c onfig_file.getParentFile(), COLLECT_CFG);460 File backup_file = new File(collect_c onfig_file.getParentFile(), "collect.bak");458 if(collect_cfg_file.exists()) { 459 File original_file = new File(collect_cfg_file.getParentFile(), COLLECT_CFG); 460 File backup_file = new File(collect_cfg_file.getParentFile(), "collect.bak"); 461 461 if(backup_file.exists()) { 462 462 backup_file.delete(); … … 466 466 } 467 467 } 468 if(force_xml || collect_c onfig_file.getName().equals(COLLECTCONFIGURATION_XML)) {468 if(force_xml || collect_cfg_file.getName().equals(COLLECTCONFIGURATION_XML)) { 469 469 ///ystem.err.println("Writing XML"); 470 XMLTools.writeXMLFile(new File(collect_c onfig_file.getParentFile(), COLLECTCONFIGURATION_XML), document);470 XMLTools.writeXMLFile(new File(collect_cfg_file.getParentFile(), COLLECTCONFIGURATION_XML), document); 471 471 } 472 472 else { 473 473 ///ystem.err.println("Writing text"); 474 474 try { 475 OutputStream ostream = new FileOutputStream(collect_c onfig_file);475 OutputStream ostream = new FileOutputStream(collect_cfg_file); 476 476 Writer file_writer = new OutputStreamWriter(ostream, ENCODING); 477 //FileWriter file_writer = new FileWriter(collect_c onfig_file, false);477 //FileWriter file_writer = new FileWriter(collect_cfg_file, false); 478 478 BufferedWriter buffered_writer = new BufferedWriter(file_writer); 479 479 Element collect_config_element = document.getDocumentElement(); … … 834 834 /** Parse a collect.cfg into a DOM model representation. 835 835 * note we are ignoring 2.39 compatibility now. */ 836 private void parse(File collect_c onfig_file) {836 private void parse(File collect_cfg_file) { 837 837 try { 838 838 839 839 Element collect_cfg_element = document.getDocumentElement(); 840 840 // Read in the file one command at a time. 841 InputStream istream = new FileInputStream(collect_c onfig_file);841 InputStream istream = new FileInputStream(collect_cfg_file); 842 842 Reader in_reader = new InputStreamReader(istream, ENCODING); 843 843 BufferedReader in = new BufferedReader(in_reader);
Note:
See TracChangeset
for help on using the changeset viewer.