comparison rdf/PluginRDFDescription.cpp @ 468:70b333085952

* complete switching the code to use CachedFile -- now to tidy & fix the
  remaining flaws...

 
 #include "PluginRDFIndexer.h"
 #include "SimpleSPARQLQuery.h"
 
 #include "data/fileio/FileSource.h"
+#include "data/fileio/CachedFile.h"
 
 #include "base/Profiler.h"
 
 #include "plugin/PluginIdentifier.h"
 
 #include <iostream>
 using std::cerr;
 using std::endl;
 
 PluginRDFDescription::PluginRDFDescription(QString pluginId) :
-    m_source(0),
+//!!!    m_source(0),
     m_pluginId(pluginId),
     m_haveDescription(false)
 {
     PluginRDFIndexer *indexer = PluginRDFIndexer::getInstance();
     QString url = indexer->getDescriptionURLForPluginId(pluginId);

     }
 }
 
 PluginRDFDescription::~PluginRDFDescription()
 {
-    delete m_source;
+//!!!    delete m_source;
 }
 
 bool
 PluginRDFDescription::haveDescription() const
 {

     if (FileSource::isRemote(url) &&
         FileSource::canHandleScheme(url)) {
         
         //!!! persistent with expiry
 
+        CachedFile cf(url);
+        if (!cf.isOK()) {
+            return false;
+        }
+
+        local = QUrl::fromLocalFile(cf.getLocalFilename()).toString();
+/*!!!
         m_source = new FileSource(url, 0, FileSource::PersistentCache);
 
         if (!m_source->isAvailable()) {
             delete m_source;
             m_source = 0;
             return false;
         }
         m_source->waitForData();
         local = QUrl::fromLocalFile(m_source->getLocalFilename()).toString();
+*/
     }
     
     if (!indexMetadata(local, label)) success = false;
     if (!indexOutputs(local, label)) success = false;