gistfile1.txt

Index: plugins/input/ogr/ogr_datasource.cpp
===================================================================
--- plugins/input/ogr/ogr_datasource.cpp	(revision 2378)
+++ plugins/input/ogr/ogr_datasource.cpp	(working copy)
@@ -59,21 +59,30 @@
    : datasource(params),
      extent_(),
      type_(datasource::Vector),
-     desc_(*params.get<std::string>("type"), *params.get<std::string>("encoding","utf-8")),
+     desc_(*params.get<std::string>("type"), *params_.get<std::string>("encoding","utf-8")),
      indexed_(false)
 {
    OGRRegisterAll();
 
-   boost::optional<std::string> file = params.get<std::string>("file");
-   if (!file) throw datasource_exception("missing <file> parameter");
+   boost::optional<std::string> file = params_.get<std::string>("file");
+   boost::optional<std::string> string = params_.get<std::string>("string");
+   
+   if (!file && !string) throw datasource_exception("missing <file> or <string> parameter");
 
    multiple_geometries_ = *params_.get<mapnik::boolean>("multiple_geometries",false);
 
-   boost::optional<std::string> base = params_.get<std::string>("base");
-   if (base)
-      dataset_name_ = *base + "/" + *file;
-   else
-      dataset_name_ = *file;
+   if (string)
+   {
+       dataset_name_ = *string;
+   }
+   else if (file)
+   {
+       boost::optional<std::string> base = params_.get<std::string>("base");
+       if (base)
+          dataset_name_ = *base + "/" + *file;
+       else
+          dataset_name_ = *file;
+   }
       
    if (bind)
    {