Added setConnection() and setDataSource() utility functions to QgsDataSourceURI

git-svn-id: http://svn.osgeo.org/qgis/trunk@6891 c8812cc2-4d05-0410-92ff-de0c093fc19c

python/core/qgsdatasourceuri.sip

@@ -11,7 +11,32 @@ class QgsDataSourceURI
 #include <qgsdatasourceuri.h>
 %End
 
- public:
+public:
+
+  //! default constructor
+  QgsDataSourceURI();
+   
+  //! constructor which parses input URI
+  QgsDataSourceURI(QString uri);
+   
+  //! All in a single string
+  QString text() const;
+  
+  //! Set all connection related members at once
+  void setConnection(const QString& aHost,
+                     const QString& aPort,
+                     const QString& aDatabase,
+                     const QString& aUsername,
+                     const QString& aPassword);
+  
+  //! Set all data source related members at once
+  void setDataSource(const QString& aSchema,
+                     const QString& aTable,
+                     const QString& aGeometryColumn,
+                     const QString& aSql = QString());
+  
+  /* data */
+
   //! host name
   QString host;
   //! database name
@@ -30,7 +55,8 @@ class QgsDataSourceURI
   QString username;
   //! password
   QString password;
-  //! All in a single string
-  QString text();
+
+  //! whole connection info (host, db, port, name, pass)
+  QString connInfo;
 };
 

src/core/qgsdatasourceuri.cpp

@@ -152,3 +152,27 @@ QString QgsDataSourceURI::text() const
       " (" + geometryColumn + ")" +
       " sql=" + sql);
 }
+
+void QgsDataSourceURI::setConnection(const QString& aHost,
+                                     const QString& aPort,
+                                     const QString& aDatabase,
+                                     const QString& aUsername,
+                                     const QString& aPassword)
+{
+  host = aHost;
+  database = aDatabase;
+  port = aPort;
+  username = aUsername;
+  password = aPassword;
+}
+  
+void QgsDataSourceURI::setDataSource(const QString& aSchema,
+                                     const QString& aTable,
+                                     const QString& aGeometryColumn,
+                                     const QString& aSql)
+{
+  schema = aSchema;
+  table = aTable;
+  geometryColumn = aGeometryColumn;
+  sql = aSql;
+}

src/core/qgsdatasourceuri.h

@@ -43,6 +43,19 @@ public:
   //! All in a single string
   QString text() const;
   
+  //! Set all connection related members at once
+  void setConnection(const QString& aHost,
+                     const QString& aPort,
+                     const QString& aDatabase,
+                     const QString& aUsername,
+                     const QString& aPassword);
+  
+  //! Set all data source related members at once
+  void setDataSource(const QString& aSchema,
+                     const QString& aTable,
+                     const QString& aGeometryColumn,
+                     const QString& aSql = QString());
+  
   /* data */
 
   //! host name