# HG changeset patch
# User Christophe Rhodes
# Date 1254933945 0
# Node ID 521438145bd775c38efd14a2834372daae07451c
# Parent  87b81f959706b309ccf2a2c19203021b29544a26
More changes related to strict/tolerant URL parsing:

* when selecting an output file name for a given input filename:
  - parse the url in StrictMode;
  - also, use completeBaseName() rather than baseName()
* when writing out a file:/// URL to the audio:
  - parse the url in StrictMode.

diff -r 87b81f959706 -r 521438145bd7 rdf/RDFFeatureWriter.cpp
--- a/rdf/RDFFeatureWriter.cpp	Wed Oct 07 13:10:49 2009 +0000
+++ b/rdf/RDFFeatureWriter.cpp	Wed Oct 07 16:45:45 2009 +0000
@@ -300,7 +300,7 @@
      * Describe signal we're analysing (AudioFile, Signal, TimeLine, etc.)
      */
     
-    QUrl url(trackId);
+    QUrl url(trackId, QUrl::StrictMode);
     QString scheme = url.scheme().toLower();
     bool local = (scheme == "" || scheme == "file" || scheme.length() == 1);
 
diff -r 87b81f959706 -r 521438145bd7 transform/FileFeatureWriter.cpp
--- a/transform/FileFeatureWriter.cpp	Wed Oct 07 13:10:49 2009 +0000
+++ b/transform/FileFeatureWriter.cpp	Wed Oct 07 16:45:45 2009 +0000
@@ -167,7 +167,7 @@
 
     if (m_stdout) return "";
     
-    QUrl url(trackId);
+    QUrl url(trackId, QUrl::StrictMode);
     QString scheme = url.scheme().toLower();
     bool local = (scheme == "" || scheme == "file" || scheme.length() == 1);
 
@@ -176,7 +176,7 @@
     if (infilename == "") {
         infilename = url.path();
     }
-    basename = QFileInfo(infilename).baseName();
+    basename = QFileInfo(infilename).completeBaseName();
     if (scheme.length() == 1) {
         infilename = scheme + ":" + infilename; // DOS drive!
     }