Fix for the problem where the attribute table of delimited text layer…

…s just showed the visible features git-svn-id: http://svn.osgeo.org/qgis/trunk@5714 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 21, 2006 · a0cfe97 · a0cfe97
1 parent fdd9cee
commit a0cfe97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
@@ -525,10 +525,6 @@ void QgsDelimitedTextProvider::select(QgsRect * rect, bool useIntersect)
   // We store the rect and use it in getNextFeature to determine if the
   // feature falls in the selection area
   mSelectionRectangle = new QgsRect((*rect));
-  // Select implies an upcoming feature read so we reset the data source
-  reset();
-  // Reset the feature id to 0
-  mFid = 0;
 }
 
 
@@ -628,6 +624,11 @@ void QgsDelimitedTextProvider::reset()
   // the header record
   mStream->seek(0);
   mStream->readLine();
+  //reset any spatial filters
+  if(mSelectionRectangle && mExtent)
+    {
+      *mSelectionRectangle = *mExtent;
+    }
 }
 
 QString QgsDelimitedTextProvider::minValue(int position)

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1027,6 +1027,9 @@ bool QgsOgrProvider::addFeature(QgsFeature* f)
       }
   }
 
+  //todo: choose i such that it doesn't get larger than fdef->GetFieldCount()
+  //todo: only add the attribute if it has the same name as fdef->GetFieldDefn(i)->GetNameRef()
+
   //add possible attribute information
   for(int i=0;i<f->attributeMap().size();++i)
   {