add dependencies for --prov-mode of [preston review]

globalbioticinteractions · Dec 24, 2024 · d059ef5 · d059ef5
1 parent 8f51cc5
commit d059ef5
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 13 deletions.
diff --git a/src/main/java/org/globalbioticinteractions/elton/cmd/CmdReview.java b/src/main/java/org/globalbioticinteractions/elton/cmd/CmdReview.java
@@ -34,6 +34,7 @@
 import org.globalbioticinteractions.elton.Elton;
 import org.globalbioticinteractions.elton.store.AccessLogger;
 import org.globalbioticinteractions.elton.store.ActivityListener;
+import org.globalbioticinteractions.elton.store.LocalPathToHashIRI;
 import org.globalbioticinteractions.elton.util.DatasetRegistryUtil;
 import org.globalbioticinteractions.elton.util.NodeFactoryNull;
 import org.globalbioticinteractions.elton.util.ProgressCursorFactory;
@@ -111,20 +112,34 @@ public void doRun() {
 
             InputStreamFactory factory = createInputStreamFactory();
 
-            ActivityListener dereferenceListener =
+            ActivityListener activityListener =
                     getEnableProvMode()
                             ? getActivityListenerWithProv()
                             : new AccessLogger(DatasetRegistryUtil.NAMESPACE_LOCAL, getProvDir());
 
             PrintStream dataOut = getDataSink(getStdout());
+
+
+
             for (URI localNamespace : localNamespaces) {
+
+                DatasetRegistryUtil.ResourceServiceListening resourceServiceLocalAndRemote
+                        = new DatasetRegistryUtil.ResourceServiceListening(
+                        getActivityIdFactory(),
+                        activityListener,
+                        getActivityContext(),
+                        new ResourceServiceLocalAndRemote(factory, new File(getDataDir())),
+                        new LocalPathToHashIRI(new File(getDataDir()))
+                );
+
+
                 DatasetRegistry registryLocal = DatasetRegistryUtil.forLocalDir(
                         localNamespace,
-                        new ResourceServiceLocalAndRemote(factory, new File(getDataDir())),
+                        resourceServiceLocalAndRemote,
                         getContentPathFactory(),
                         getDataDir(),
                         getProvDir(),
-                        dereferenceListener,
+                        activityListener,
                         getActivityContext(),
                         getActivityIdFactory()
                 );
@@ -137,7 +152,12 @@ public void doRun() {
                 );
             }
 
-            reviewCachedOrRemote(remoteNamespaces, factory, dataOut);
+            reviewCachedOrRemote(
+                    remoteNamespaces,
+                    factory,
+                    dataOut,
+                    activityListener
+            );
 
         } catch (StudyImporterException e) {
             throw new RuntimeException(e);
@@ -151,16 +171,27 @@ public String getDescription() {
 
     private void reviewCachedOrRemote(List<String> namespaces,
                                       InputStreamFactory inputStreamFactory,
-                                      PrintStream dataOut) throws StudyImporterException {
+                                      PrintStream dataOut, ActivityListener activityListener) throws StudyImporterException {
         for (String namespace : namespaces) {
+
+            DatasetRegistryUtil.ResourceServiceListening resourceServiceLocal
+                    = new DatasetRegistryUtil.ResourceServiceListening(
+                    getActivityIdFactory(),
+                    activityListener,
+                    getActivityContext(),
+                    new ResourceServiceLocal(inputStreamFactory),
+                    new LocalPathToHashIRI(new File(getDataDir()))
+            );
+
+            DatasetRegistry registry = DatasetRegistryUtil.forCache(
+                    getDataDir(),
+                    getProvDir(),
+                    resourceServiceLocal,
+                    getContentPathFactory(),
+                    getProvenancePathFactory()
+            );
             review(namespace,
-                    DatasetRegistryUtil.forCache(
-                            getDataDir(),
-                            getProvDir(),
-                            new ResourceServiceLocal(inputStreamFactory),
-                            getContentPathFactory(),
-                            getProvenancePathFactory()
-                    ),
+                    registry,
                     inputStreamFactory,
                     shouldSkipHeader(),
                     dataOut

diff --git a/src/main/java/org/globalbioticinteractions/elton/util/DatasetRegistryUtil.java b/src/main/java/org/globalbioticinteractions/elton/util/DatasetRegistryUtil.java
@@ -155,7 +155,7 @@ private static DatasetRegistry forCacheOrLocalDir(String dataDir,
         return registry;
     }
 
-    private static class ResourceServiceListening implements ResourceService {
+    public static class ResourceServiceListening implements ResourceService {
         private final Supplier<IRI> activityIdFactory;
         private final ActivityListener activityListener;
         private final ActivityContext ctx;