Skip to content

Commit 297e6cf

Browse files
author
Thierry Lacour
committed
Fix component/stream vob location assumption
1 parent 0d94f84 commit 297e6cf

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class CcucmSource implements MigrationSource {
2424
CoolSnapshotView migrationView
2525
CoolStream migrationStream
2626

27-
CoolVob vob
27+
CoolVob streamVob
28+
CoolVob componentVob
2829
CoolComponent component
2930
CoolStream stream
3031
CoolStream parentStream
@@ -33,16 +34,18 @@ class CcucmSource implements MigrationSource {
3334

3435
@Override
3536
void prepare() {
36-
String vobName = CcucmStringHelper.parseName(options.stream).vob
3737
String componentName = CcucmStringHelper.parseName(options.component).tag
38-
String streamName = CcucmStringHelper.parseName(options.stream).tag
38+
String componentVobName = CcucmStringHelper.parseName(options.component).vob
39+
componentVob = Cool.findPVob(componentVobName)
40+
component = Cool.findComponent(componentName, componentVob)
3941

40-
vob = Cool.findPVob(vobName)
41-
component = Cool.findComponent(componentName, vob)
42-
stream = Cool.findStream(streamName, vob)
42+
String streamName = CcucmStringHelper.parseName(options.stream).tag
43+
String streamVobName = CcucmStringHelper.parseName(options.stream).vob
44+
streamVob = Cool.findPVob(streamVobName)
45+
stream = Cool.findStream(streamName, streamVob)
4346

4447
if (options.migrationProject) {
45-
CoolProject targetProject = CoolProject.get(options.migrationProject, vob).load()
48+
CoolProject targetProject = CoolProject.get(options.migrationProject, streamVob).load()
4649
parentStream = targetProject.integrationStream
4750
} else {
4851
parentStream = stream

0 commit comments

Comments
 (0)