Mercurial > hg > sonic-annotator

changeset 130:65dabaebe604

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support plugin version in RDF transforms, and bail out in Sonic Annotator if it doesn't match
author Chris Cannam
date Fri, 10 Oct 2014 15:24:28 +0100
parents 7a7a46d4bd3c
children 0b431a9c5498
files .hgsubstate runner/FeatureExtractionManager.cpp
diffstat 2 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Oct 10 15:00:47 2014 +0100
+++ b/.hgsubstate	Fri Oct 10 15:24:28 2014 +0100
@@ -1,2 +1,2 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-60e2927b1475b752d14615da9516d893332878a3 svcore
+8c9c425b4958a0a6d013fd98a5e1b2f9dbcfdae5 svcore
--- a/runner/FeatureExtractionManager.cpp	Fri Oct 10 15:00:47 2014 +0100
+++ b/runner/FeatureExtractionManager.cpp	Fri Oct 10 15:24:28 2014 +0100
@@ -340,6 +340,19 @@
             }
         }
 
+        if (transform.getPluginVersion() != "") {
+            if (QString("%1").arg(plugin->getPluginVersion())
+                != transform.getPluginVersion()) {
+                cerr << "ERROR: Transform specifies version "
+                     << transform.getPluginVersion()
+                     << " of plugin \"" << plugin->getIdentifier()
+                     << "\", but installed plugin is version "
+                     << plugin->getPluginVersion()
+                     << endl;
+                return false;
+            }
+        }
+
         if (transform.getOutput() == "") {
             transform.setOutput
                 (plugin->getOutputDescriptors()[0].identifier.c_str());