comparison data/fileio/FileSource.cpp @ 461:2019d89ebcf9

* Some work on querying and cacheing plugin RDF from a central index

 }
 
 void
 FileSource::cleanup()
 {
+    if (m_done) {
+        delete m_localFile; // does not actually delete the file
+        m_localFile = 0;
+    }
     m_done = true;
     if (m_http) {
         QHttp *h = m_http;
         m_http = 0;
         h->abort();

         QFtp *f = m_ftp;
         m_ftp = 0;
         f->abort();
         f->deleteLater();
     }
-    delete m_localFile; // does not actually delete the file
-    m_localFile = 0;
+    if (m_localFile) {
+        delete m_localFile; // does not actually delete the file
+        m_localFile = 0;
+    }
 }
 
 bool
 FileSource::isRemote(QString fileOrUrl)
 {

         }
     }
 
     if (error) {
 #ifdef DEBUG_FILE_SOURCE
-        std::cerr << "FileSource::done: error is " << error << ", deleting cache file" << std::endl;
+        std::cerr << "FileSource::done: error is " << error << " (\"" 
+                  << m_errorString.toStdString() << "\"), deleting cache file" << std::endl;
 #endif
         deleteCacheFile();
     }
 
     m_ok = !error;

     QDir dir(getPersistentCacheDirectory());
 
     QString filename =
         QString::fromLocal8Bit
         (QCryptographicHash::hash(url.toString().toLocal8Bit(),
-                                  QCryptographicHash::Sha1).toBase64());
+                                  QCryptographicHash::Sha1).toHex());
 
     return dir.filePath(filename);
 }
 
 bool