Update cache

qgis · Nov 20, 2014 · d663599 · d663599
1 parent 4a4dc6b
commit d663599
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 33 deletions.
diff --git a/src/mapserver/qgsconfigcache.cpp b/src/mapserver/qgsconfigcache.cpp
@@ -42,26 +42,24 @@ QgsConfigCache::~QgsConfigCache()
 
 QgsServerProjectParser* QgsConfigCache::serverConfiguration( const QString& filePath )
 {
-  QgsServerProjectParser* p = mServerConfigCache.object( filePath );
-  if ( !p )
+  QDomDocument* doc = xmlDocument( filePath );
+  if ( !doc )
   {
-    QDomDocument* doc = xmlDocument( filePath );
-    if ( !doc )
-    {
-      return 0;
-    }
-    p = new QgsServerProjectParser( doc, filePath );
-    mServerConfigCache.insert( filePath, p );
-    mFileSystemWatcher.addPath( filePath );
+    return 0;
   }
-  return p;
+  return new QgsServerProjectParser( doc, filePath );
 }
 
 QgsWCSProjectParser* QgsConfigCache::wcsConfiguration( const QString& filePath )
 {
   QgsWCSProjectParser* p = mWCSConfigCache.object( filePath );
   if ( !p )
   {
+    QDomDocument* doc = xmlDocument( filePath );
+    if ( !doc )
+    {
+      return 0;
+    }
     p = new QgsWCSProjectParser( filePath );
     mWCSConfigCache.insert( filePath, p );
     mFileSystemWatcher.addPath( filePath );
@@ -76,6 +74,11 @@ QgsWFSProjectParser* QgsConfigCache::wfsConfiguration( const QString& filePath )
   QgsWFSProjectParser* p = mWFSConfigCache.object( filePath );
   if ( !p )
   {
+    QDomDocument* doc = xmlDocument( filePath );
+    if ( !doc )
+    {
+      return 0;
+    }
     p = new QgsWFSProjectParser( filePath );
     mWFSConfigCache.insert( filePath, p );
     mFileSystemWatcher.addPath( filePath );
@@ -117,12 +120,6 @@ QgsWMSConfigParser* QgsConfigCache::wmsConfiguration( const QString& filePath, c
 
 QDomDocument* QgsConfigCache::xmlDocument( const QString& filePath )
 {
-  // first get cache
-  QDomDocument* xmlDoc = mXmlDocumentCache.object( filePath );
-  if ( xmlDoc )
-    return xmlDoc;
-
-  // i it's first access
   //first open file
   QFile configFile( filePath );
   if ( !configFile.exists() )
@@ -136,26 +133,31 @@ QDomDocument* QgsConfigCache::xmlDocument( const QString& filePath )
     QgsMessageLog::logMessage( "Error, cannot open configuration file '" + filePath + "'", "Server", QgsMessageLog::CRITICAL );
     return 0;
   }
-
-  //then create xml document
-  xmlDoc = new QDomDocument();
-  QString errorMsg;
-  int line, column;
-  if ( !xmlDoc->setContent( &configFile, true, &errorMsg, &line, &column ) )
+
+  // first get cache
+  QDomDocument* xmlDoc = mXmlDocumentCache.object( filePath );
+  if ( !xmlDoc )
   {
-    QgsMessageLog::logMessage( "Error parsing file '" + filePath +
-                               QString( "': parse error %1 at row %2, column %3" ).arg( errorMsg ).arg( line ).arg( column ), "Server", QgsMessageLog::CRITICAL );
-    delete xmlDoc;
-    return 0;
+    //then create xml document
+	xmlDoc = new QDomDocument();
+	QString errorMsg;
+	int line, column;
+	if ( !xmlDoc->setContent( &configFile, true, &errorMsg, &line, &column ) )
+	{
+	  QgsMessageLog::logMessage( "Error parsing file '" + filePath +
+		  					     QString( "': parse error %1 at row %2, column %3" ).arg( errorMsg ).arg( line ).arg( column ), "Server", QgsMessageLog::CRITICAL );
+	  delete xmlDoc;
+	  return 0;
+	}
+    mXmlDocumentCache.insert( filePath, xmlDoc );
+    mFileSystemWatcher.addPath( filePath );
   }
-  mXmlDocumentCache.insert( filePath, xmlDoc );
   return xmlDoc;
 }
 
 void QgsConfigCache::removeChangedEntry( const QString& path )
 {
   mXmlDocumentCache.remove( path );
-  mServerConfigCache.remove( path );
   mWMSConfigCache.remove( path );
   mWFSConfigCache.remove( path );
   mWCSConfigCache.remove( path );

diff --git a/src/mapserver/qgsconfigcache.h b/src/mapserver/qgsconfigcache.h
@@ -53,7 +53,6 @@ class QgsConfigCache: public QObject
     QDomDocument* xmlDocument( const QString& filePath );
 
     QCache<QString, QDomDocument> mXmlDocumentCache;
-    QCache<QString, QgsServerProjectParser> mServerConfigCache;
     QCache<QString, QgsWMSConfigParser> mWMSConfigCache;
     QCache<QString, QgsWFSProjectParser> mWFSConfigCache;
     QCache<QString, QgsWCSProjectParser> mWCSConfigCache;

diff --git a/src/mapserver/qgswcsprojectparser.cpp b/src/mapserver/qgswcsprojectparser.cpp
@@ -16,13 +16,14 @@
  ***************************************************************************/
 
 #include "qgswcsprojectparser.h"
+#include "qgsconfigcache.h"
 #include "qgsconfigparserutils.h"
 #include "qgsconfigcache.h"
 #include "qgsrasterlayer.h"
 
 QgsWCSProjectParser::QgsWCSProjectParser( const QString& filePath )
 {
-	QgsServerProjectParser* mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
+  mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
 }
 
 QgsWCSProjectParser::~QgsWCSProjectParser()

diff --git a/src/mapserver/qgswfsprojectparser.cpp b/src/mapserver/qgswfsprojectparser.cpp
@@ -16,14 +16,15 @@
  ***************************************************************************/
 
 #include "qgswfsprojectparser.h"
+#include "qgsconfigcache.h"
 #include "qgsconfigparserutils.h"
 #include "qgsconfigcache.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsvectordataprovider.h"
 
 QgsWFSProjectParser::QgsWFSProjectParser( const QString& filePath )
 {
-  QgsServerProjectParser* mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
+  mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
 }
 
 QgsWFSProjectParser::~QgsWFSProjectParser()

diff --git a/src/mapserver/qgswmsprojectparser.cpp b/src/mapserver/qgswmsprojectparser.cpp
@@ -42,7 +42,7 @@
 QgsWMSProjectParser::QgsWMSProjectParser( const QString& filePath )
     : QgsWMSConfigParser()
 {
-  QgsServerProjectParser* mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
+  mProjectParser = QgsConfigCache::instance()->serverConfiguration( filePath );
   mLegendLayerFont.fromString( mProjectParser->firstComposerLegendElement().attribute( "layerFont" ) );
   mLegendItemFont.fromString( mProjectParser->firstComposerLegendElement().attribute( "itemFont" ) );
   createTextAnnotationItems();