Merge branch 'master' of github.com:qgis/Quantum-GIS

mhugent · mhugent · commit 047d3939fc7f · 2012-11-30T13:24:54.000+01:00
diff --git a/python/plugins/db_manager/dlg_import_vector.py b/python/plugins/db_manager/dlg_import_vector.py
@@ -63,8 +63,9 @@ def __init__(self, inLayer, outDb, outUri, parent=None):
 
 		pk = self.outUri.keyColumn()
 		self.editPrimaryKey.setText(pk if pk != "" else self.default_pk)
-		geom = self.outUri.geometryColumn()
-		self.editGeomColumn.setText(geom if geom != "" else self.default_geom)
+		if self.inLayer.hasGeometryType():
+			geom = self.outUri.geometryColumn()
+			self.editGeomColumn.setText(geom if geom != "" else self.default_geom)
 
 		inCrs = self.inLayer.crs()
 		srid = inCrs.postgisSrid() if inCrs.isValid() else 4236
@@ -76,10 +77,11 @@ def __init__(self, inLayer, outDb, outUri, parent=None):
 
 	def checkSupports(self):
 		allowSpatial = self.db.connector.hasSpatialSupport()
-		self.chkGeomColumn.setEnabled(allowSpatial and self.inLayer.hasGeometryType())
-		self.chkSourceSrid.setEnabled(allowSpatial)
-		self.chkTargetSrid.setEnabled(allowSpatial)
-		self.chkSpatialIndex.setEnabled(allowSpatial)
+		hasGeomType = self.inLayer.hasGeometryType()
+		self.chkGeomColumn.setEnabled(allowSpatial and hasGeomType)
+		self.chkSourceSrid.setEnabled(allowSpatial and hasGeomType)
+		self.chkTargetSrid.setEnabled(allowSpatial and hasGeomType)
+		self.chkSpatialIndex.setEnabled(allowSpatial and hasGeomType)
 	
 		
 	def populateSchemas(self):
@@ -174,8 +176,11 @@ def importLayer(self):
 		# get pk and geom field names from the source layer or use the 
 		# ones defined by the user
 		pk = self.outUri.keyColumn() if not self.chkPrimaryKey.isChecked() else self.editPrimaryKey.text()
-		geom = self.outUri.geometryColumn() if not self.chkGeomColumn.isChecked() else self.editGeomColumn.text()
-		geom = geom if geom != "" else self.default_geom
+		if self.inLayer.hasGeometryType():
+			geom = self.outUri.geometryColumn() if not self.chkGeomColumn.isChecked() else self.editGeomColumn.text()
+			geom = geom if geom != "" else self.default_geom
+		else:
+			geom = QString()
 		
 		self.outUri.setDataSource( schema, table, geom, QString(), pk )
 		uri = self.outUri.uri()
diff --git a/src/core/qgsvectorlayerimport.cpp b/src/core/qgsvectorlayerimport.cpp
@@ -121,11 +121,12 @@ bool QgsVectorLayerImport::addFeature( QgsFeature& feat )
   const QgsAttributeMap &attrs = feat.attributeMap();
 
   QgsFeature newFeat;
-  newFeat.setGeometry( *feat.geometry() );
+  if ( feat.geometry() )
+    newFeat.setGeometry( *feat.geometry() );
 
   for ( QgsAttributeMap::const_iterator it = attrs.begin(); it != attrs.end(); it++ )
   {
-    // add only mapped attributes (un-mapped ones are not present in the
+    // add only mapped attributes (un-mapped ones will not be present in the
     // destination layer)
     if ( mOldToNewAttrIdx.contains( it.key() ) )
     {
diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
@@ -1168,6 +1168,9 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
       typeName = actionElem.attribute( "typeName" );
     }
 
+    if ( typeName.contains( ":" ) )
+      typeName = typeName.section( ":", 1, 1 );
+
     QDomNodeList typeNameList = mDocElem.elementsByTagName( typeName );
     if ( typeNameList.count() == 0 )
     {
@@ -1424,13 +1427,12 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
             }
             // Add the feature to th layer
             // and store it to put it's Feature Id in the response
-            layer->addFeature( *f, true );
-            inFeatList << *f;
+            inFeatList.append( *f );
           }
         }
       }
       // Commit the changes of the insert elements
-      if ( !layer->commitChanges() )
+      if ( !provider->addFeatures( inFeatList ) )
       {
         QDomElement trElem = doc.createElement( "TransactionResult" );
         QDomElement stElem = doc.createElement( "Status" );
@@ -1444,6 +1446,13 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
         trElem.appendChild( locElem );
 
         QDomElement mesElem = doc.createElement( "Message" );
+        QStringList mesErrors;
+        mesErrors << QString( "ERROR: %n feature(s) not added.").arg(inFeatList.size());
+        if ( provider->hasErrors() )
+        {
+          mesErrors << "\n  Provider errors:" << provider->errors();
+          provider->clearErrors();
+        }
         mesElem.appendChild( doc.createTextNode( layer->commitErrors().join( "\n  " ) ) );
         trElem.appendChild( mesElem );
 
@@ -1460,16 +1469,14 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
   // Put the Feature Ids of the inserted feature
   if ( insertResults.size() > 0 )
   {
-    QDomElement irsElem = doc.createElement( "InsertResults" );
     foreach (const QString &fidStr, insertResults)
     {
       QDomElement irElem = doc.createElement( "InsertResult" );
       QDomElement fiElem = doc.createElement( "ogc:FeatureId" );
       fiElem.setAttribute( "fid", fidStr );
       irElem.appendChild( fiElem );
-      irsElem.appendChild( irElem );
+      respElem.appendChild( irElem );
     }
-    respElem.appendChild( irsElem );
   }
 
   // Set the transaction reposne for success

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,12 @@ bool QgsVectorLayerImport::addFeature( QgsFeature& feat )`
`121`	`121`	`const QgsAttributeMap &attrs = feat.attributeMap();`
`122`	`122`
`123`	`123`	`QgsFeature newFeat;`
`124`		`- newFeat.setGeometry( *feat.geometry() );`
	`124`	`+ if ( feat.geometry() )`
	`125`	`+ newFeat.setGeometry( *feat.geometry() );`
`125`	`126`
`126`	`127`	`for ( QgsAttributeMap::const_iterator it = attrs.begin(); it != attrs.end(); it++ )`
`127`	`128`	`{`
`128`		`- // add only mapped attributes (un-mapped ones are not present in the`
	`129`	`+ // add only mapped attributes (un-mapped ones will not be present in the`
`129`	`130`	`// destination layer)`
`130`	`131`	`if ( mOldToNewAttrIdx.contains( it.key() ) )`
`131`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1168,6 +1168,9 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )`
`1168`	`1168`	`typeName = actionElem.attribute( "typeName" );`
`1169`	`1169`	`}`
`1170`	`1170`
	`1171`	`+ if ( typeName.contains( ":" ) )`
	`1172`	`+ typeName = typeName.section( ":", 1, 1 );`
	`1173`	`+`
`1171`	`1174`	`QDomNodeList typeNameList = mDocElem.elementsByTagName( typeName );`
`1172`	`1175`	`if ( typeNameList.count() == 0 )`
`1173`	`1176`	`{`
`@@ -1424,13 +1427,12 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )`
`1424`	`1427`	`}`
`1425`	`1428`	`// Add the feature to th layer`
`1426`	`1429`	`// and store it to put it's Feature Id in the response`
`1427`		`- layer->addFeature( *f, true );`
`1428`		`- inFeatList << *f;`
	`1430`	`+ inFeatList.append( *f );`
`1429`	`1431`	`}`
`1430`	`1432`	`}`
`1431`	`1433`	`}`
`1432`	`1434`	`// Commit the changes of the insert elements`
`1433`		`- if ( !layer->commitChanges() )`
	`1435`	`+ if ( !provider->addFeatures( inFeatList ) )`
`1434`	`1436`	`{`
`1435`	`1437`	`QDomElement trElem = doc.createElement( "TransactionResult" );`
`1436`	`1438`	`QDomElement stElem = doc.createElement( "Status" );`
`@@ -1444,6 +1446,13 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )`
`1444`	`1446`	`trElem.appendChild( locElem );`
`1445`	`1447`
`1446`	`1448`	`QDomElement mesElem = doc.createElement( "Message" );`
	`1449`	`+ QStringList mesErrors;`
	`1450`	`+ mesErrors << QString( "ERROR: %n feature(s) not added.").arg(inFeatList.size());`
	`1451`	`+ if ( provider->hasErrors() )`
	`1452`	`+ {`
	`1453`	`+ mesErrors << "\n Provider errors:" << provider->errors();`
	`1454`	`+ provider->clearErrors();`
	`1455`	`+ }`
`1447`	`1456`	`mesElem.appendChild( doc.createTextNode( layer->commitErrors().join( "\n " ) ) );`
`1448`	`1457`	`trElem.appendChild( mesElem );`
`1449`	`1458`
`@@ -1460,16 +1469,14 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )`
`1460`	`1469`	`// Put the Feature Ids of the inserted feature`
`1461`	`1470`	`if ( insertResults.size() > 0 )`
`1462`	`1471`	`{`
`1463`		`- QDomElement irsElem = doc.createElement( "InsertResults" );`
`1464`	`1472`	`foreach (const QString &fidStr, insertResults)`
`1465`	`1473`	`{`
`1466`	`1474`	`QDomElement irElem = doc.createElement( "InsertResult" );`
`1467`	`1475`	`QDomElement fiElem = doc.createElement( "ogc:FeatureId" );`
`1468`	`1476`	`fiElem.setAttribute( "fid", fidStr );`
`1469`	`1477`	`irElem.appendChild( fiElem );`
`1470`		`- irsElem.appendChild( irElem );`
	`1478`	`+ respElem.appendChild( irElem );`
`1471`	`1479`	`}`
`1472`		`- respElem.appendChild( irsElem );`
`1473`	`1480`	`}`
`1474`	`1481`
`1475`	`1482`	`// Set the transaction reposne for success`