diff rdf/RDFFeatureWriter.cpp @ 730:27c861cce97b dataquay

Further fixes for Dataquay compatibility

--- a/rdf/RDFFeatureWriter.cpp	Sat May 19 18:57:52 2012 +0100
+++ b/rdf/RDFFeatureWriter.cpp	Mon May 21 14:33:35 2012 +0100
@@ -174,7 +174,8 @@
         m_startedStreamTransforms[stream].end()) {
         m_startedStreamTransforms[stream].insert(transform);
         writeLocalFeatureTypes
-            (stream, transform, output, m_rdfDescriptions[pluginId]);
+            (stream, transform, output, m_rdfDescriptions[pluginId],
+             summaryType);
     }
 
     if (m_singleFileName != "" || m_stdout) {
@@ -397,7 +398,8 @@
 RDFFeatureWriter::writeLocalFeatureTypes(QTextStream *sptr,
                                          const Transform &transform,
                                          const Plugin::OutputDescriptor &od,
-                                         PluginRDFDescription &desc)
+                                         PluginRDFDescription &desc, 
+                                         std::string summaryType)
 {
     QString outputId = od.identifier.c_str();
     QTextStream &stream = *sptr;
@@ -412,7 +414,8 @@
 
     //!!! bin names, extents and so on can be written out using e.g. vamp:bin_names ( "a" "b" "c" ) 
 
-    if (desc.getOutputDisposition(outputId) == 
+    if (summaryType == "" &&
+        desc.getOutputDisposition(outputId) == 
         PluginRDFDescription::OutputDense) {
 
         // no feature events, so may need signal type but won't need
@@ -476,7 +479,7 @@
     if (needEventType && m_fixedEventTypeURI == "") {
 
         QString uri;
-        if (m_syntheticEventTypeURIs.find(transform) !=
+        if (m_syntheticEventTypeURIs.find(transform) ==
             m_syntheticEventTypeURIs.end()) {
             uri = m_syntheticEventTypeURIs[transform];
         } else {