Update of /cvsroot/fura/FuraSrc/IGAgent/parametricSweepPlugin/src
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/IGAgent/parametricSweepPlugin/src
Modified Files:
FileTransfer.cpp ParametricSweepJob.cpp Partitioner.cpp
Log Message:
cvssync-20080903232636
Index: ParametricSweepJob.cpp
===================================================================
RCS file: /cvsroot/fura/FuraSrc/IGAgent/parametricSweepPlugin/src/ParametricSweepJob.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParametricSweepJob.cpp 22 Aug 2008 22:15:01 -0000 1.5
--- ParametricSweepJob.cpp 3 Sep 2008 21:27:13 -0000 1.6
***************
*** 579,587 ****
// TOLOG(9, "ParametricSweepJob::startProcess: returning to base dir");
- if (!FileManager::changeDir(baseDir.c_str())) {
- TOLOG(-1, "ParametricSweepJob::startProcess: Unable to change to: " <<
- baseDir.c_str());
- }
-
// Initialize the execution status
executionStatus = AssignmentStatus::STATUS_IN_PROCESS;
--- 579,582 ----
***************
*** 678,682 ****
string taskID = task->basicTaskData->taskId;
! string outbase(OUTDIR);
outbase += '/';
outbase += taskID;
--- 673,677 ----
string taskID = task->basicTaskData->taskId;
! string outbase(baseDir + '/' + OUTDIR);
outbase += '/';
outbase += taskID;
***************
*** 688,693 ****
FileManager::changeDir(currentDir);
-
-
string taskbase(REPOS_TASK);
taskbase += '/';
--- 683,686 ----
***************
*** 709,713 ****
vector<string> inputDirs;
vector<bool> recruseDirs;
! inputDirs.push_back(OUTDIR);
recruseDirs.push_back(false); //not recursive to avoid renaming problems
TOLOG(7, "Filter[OUTDIR]: " << OUTDIR << " (false)");
--- 702,706 ----
vector<string> inputDirs;
vector<bool> recruseDirs;
! inputDirs.push_back(baseDir + '/' + OUTDIR);
recruseDirs.push_back(false); //not recursive to avoid renaming problems
TOLOG(7, "Filter[OUTDIR]: " << OUTDIR << " (false)");
Index: Partitioner.cpp
===================================================================
RCS file: /cvsroot/fura/FuraSrc/IGAgent/parametricSweepPlugin/src/Partitioner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Partitioner.cpp 22 Aug 2008 22:15:02 -0000 1.4
--- Partitioner.cpp 3 Sep 2008 21:27:13 -0000 1.5
***************
*** 158,164 ****
int elementNumber = rangeHandlers.size();
for(int i = 0; i < elementNumber; i++) {
! if (rangeHandlers[i]->isIteratedInResource()) {
! labelsList.push_back(rangeHandlers[i]->getLabel());
! }
}
--- 158,162 ----
int elementNumber = rangeHandlers.size();
for(int i = 0; i < elementNumber; i++) {
! labelsList.push_back(rangeHandlers[i]->getLabel());
}
Index: FileTransfer.cpp
===================================================================
RCS file: /cvsroot/fura/FuraSrc/IGAgent/parametricSweepPlugin/src/FileTransfer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileTransfer.cpp 22 Aug 2008 22:15:01 -0000 1.4
--- FileTransfer.cpp 3 Sep 2008 21:27:13 -0000 1.5
***************
*** 422,426 ****
if(fileNumber < 1) {
! TOLOG(6, "ParametricSweepCommunication::sendFiles: returning. No files");
ActivityLauncher::exitThreadSafely(thd, activityInput, 1);
return NULL;
--- 422,426 ----
if(fileNumber < 1) {
! TOLOG(4, "ParametricSweepCommunication::sendFiles: returning. No files");
ActivityLauncher::exitThreadSafely(thd, activityInput, 1);
return NULL;
|