From 297e6cf3554196e72ceba7eac4a652ee94214490 Mon Sep 17 00:00:00 2001
From: Thierry Lacour <thi@praqma.net>
Date: Wed, 5 Feb 2020 10:21:28 +0100
Subject: [PATCH] Fix component/stream vob location assumption

---
 .../migration/sources/ccucm/CcucmSource.groovy  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy b/src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy
index 176a628..9f79822 100644
--- a/src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy
+++ b/src/main/groovy/togit/migration/sources/ccucm/CcucmSource.groovy
@@ -24,7 +24,8 @@ class CcucmSource implements MigrationSource {
     CoolSnapshotView migrationView
     CoolStream migrationStream
 
-    CoolVob vob
+    CoolVob streamVob
+    CoolVob componentVob
     CoolComponent component
     CoolStream stream
     CoolStream parentStream
@@ -33,16 +34,18 @@ class CcucmSource implements MigrationSource {
 
     @Override
     void prepare() {
-        String vobName = CcucmStringHelper.parseName(options.stream).vob
         String componentName = CcucmStringHelper.parseName(options.component).tag
-        String streamName = CcucmStringHelper.parseName(options.stream).tag
+        String componentVobName = CcucmStringHelper.parseName(options.component).vob
+        componentVob = Cool.findPVob(componentVobName)
+        component = Cool.findComponent(componentName, componentVob)
 
-        vob = Cool.findPVob(vobName)
-        component = Cool.findComponent(componentName, vob)
-        stream = Cool.findStream(streamName, vob)
+        String streamName = CcucmStringHelper.parseName(options.stream).tag
+        String streamVobName = CcucmStringHelper.parseName(options.stream).vob
+        streamVob = Cool.findPVob(streamVobName)
+        stream = Cool.findStream(streamName, streamVob)
 
         if (options.migrationProject) {
-            CoolProject targetProject = CoolProject.get(options.migrationProject, vob).load()
+            CoolProject targetProject = CoolProject.get(options.migrationProject, streamVob).load()
             parentStream = targetProject.integrationStream
         } else {
             parentStream = stream