Changeset 3727
- Timestamp:
- Sep 13, 2007, 3:32:57 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java
r3726 r3727 654 654 int exitValue = p.waitFor(); 655 655 656 progress.display(50, "Reading from error stream."); 656 657 for(int i = 0; errorStream.isAlive(); ++i) 657 658 { … … 682 683 { 683 684 //Copy files 684 // dc.deleteItem(stdin);685 progress.display(60, "Copying files to server."); 685 686 importFiles(dc, trans); 686 687 if (!deleteDir(getExecDirectory())) … … 688 689 response.setError("Could not remove execution directory: "+getExecDirectory().getAbsolutePath(), null); 689 690 } 690 } 691 691 stdout = File.getFile(dc, getPluginDirectory(dc), "stdout.txt", true); 692 } 693 692 694 //Import data 693 695 try 694 696 { 695 697 progress.display(70, "Importing data from plugin."); 696 importData(dc, trans);698 importData(dc, stdout, trans); 697 699 response.setDone(msg); 698 700 } … … 701 703 response.setError(ex.getMessage(), Arrays.asList(ex)); 702 704 return; 705 } 706 707 //Clean up 708 if (!Values.getBoolean(String.valueOf(configuration.getValue(leaveStdinParameter.getName())))) 709 { 710 dc.deleteItem(stdin); 711 } 712 if (!Values.getBoolean(String.valueOf(configuration.getValue(leaveStdoutParameter.getName())))) 713 { 714 dc.deleteItem(stdout); 703 715 } 704 716 } … … 1248 1260 @throws IOException if there is any error reading from stdou.txt 1249 1261 */ 1250 private int importData(DbControl dc, Transformation t)1262 private int importData(DbControl dc, File stdout, Transformation t) 1251 1263 throws IOException 1252 1264 { … … 1259 1271 HashMap<String, ExtraValueType> evtMap = new HashMap<String, ExtraValueType>(); 1260 1272 1261 File stdout = File.getFile(dc, getPluginDirectory(dc), "stdout.txt", true);1262 1273 FlatFileParser ffp = getInitializedFlatFileParser(stdout.getDownloadStream(0)); 1263 1274
Note: See TracChangeset
for help on using the changeset viewer.