isValid() function for the wfs provider

mhugent · mhugent · commit dde9fa67d0b5 · 2006-11-06T14:14:52.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6054 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -36,18 +36,18 @@ static const QString TEXT_PROVIDER_DESCRIPTION = "WFS data provider";
 static const QString WFS_NAMESPACE = "http://www.opengis.net/wfs";
 static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
 
-QgsWFSProvider::QgsWFSProvider(const QString& uri): QgsVectorDataProvider(uri), mUseIntersect(false), mSourceSRS(0), mSelectedFeatures(0), mFeatureCount(0)
+QgsWFSProvider::QgsWFSProvider(const QString& uri): QgsVectorDataProvider(uri), mUseIntersect(false), mSourceSRS(0), mSelectedFeatures(0), mFeatureCount(0), mValid(true)
 {
   if(getFeature(uri) == 0)
     {
-      //provider valid
+      mValid = true;
+      //set spatial filter to the whole extent
+      select(&mExtent, false);
     }
   else
     {
-      //provider invalid
+      mValid = false;
     }
-  //set spatial filter to the whole extent
-  select(&mExtent, false);
 }
 
 QgsWFSProvider::~QgsWFSProvider()
@@ -233,7 +233,7 @@ QgsRect* QgsWFSProvider::extent()
 
 bool QgsWFSProvider::isValid()
 {
-  return true;
+  return mValid;
 }
 
 void QgsWFSProvider::select(QgsRect *mbr, bool useIntersect)
diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h
@@ -99,6 +99,8 @@ class QgsWFSProvider: public QgsVectorDataProvider
    The position in the vector is equal to the position of an attribute in the layers attribute vector*/
   std::vector< std::pair<QString, QString> > mMinMaxCash;
   int mFeatureCount;
+  /**Flag if provider is valid*/
+  bool mValid;
 
   /**Goes through all the features and their attributes and populates mMinMaxCash with entries*/
   void fillMinMaxCash();

Original file line number	Diff line number	Diff line change
`@@ -36,18 +36,18 @@ static const QString TEXT_PROVIDER_DESCRIPTION = "WFS data provider";`
`36`	`36`	`static const QString WFS_NAMESPACE = "http://www.opengis.net/wfs";`
`37`	`37`	`static const QString GML_NAMESPACE = "http://www.opengis.net/gml";`
`38`	`38`
`39`		`-QgsWFSProvider::QgsWFSProvider(const QString& uri): QgsVectorDataProvider(uri), mUseIntersect(false), mSourceSRS(0), mSelectedFeatures(0), mFeatureCount(0)`
	`39`	`+QgsWFSProvider::QgsWFSProvider(const QString& uri): QgsVectorDataProvider(uri), mUseIntersect(false), mSourceSRS(0), mSelectedFeatures(0), mFeatureCount(0), mValid(true)`
`40`	`40`	`{`
`41`	`41`	`if(getFeature(uri) == 0)`
`42`	`42`	`{`
`43`		`- //provider valid`
	`43`	`+ mValid = true;`
	`44`	`+ //set spatial filter to the whole extent`
	`45`	`+ select(&mExtent, false);`
`44`	`46`	`}`
`45`	`47`	`else`
`46`	`48`	`{`
`47`		`- //provider invalid`
	`49`	`+ mValid = false;`
`48`	`50`	`}`
`49`		`- //set spatial filter to the whole extent`
`50`		`- select(&mExtent, false);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`QgsWFSProvider::~QgsWFSProvider()`
`@@ -233,7 +233,7 @@ QgsRect* QgsWFSProvider::extent()`
`233`	`233`
`234`	`234`	`bool QgsWFSProvider::isValid()`
`235`	`235`	`{`
`236`		`- return true;`
	`236`	`+ return mValid;`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`void QgsWFSProvider::select(QgsRect *mbr, bool useIntersect)`