Changeset 790 for trunk/zoo-project/zoo-services/ogr/ogr2ogr

Timestamp:

Dec 19, 2016, 6:01:06 PM (8 years ago)

Author:

djay

Message:

Add support for nested inputs and outputs.

File:

• trunk/zoo-project/zoo-services/ogr/ogr2ogr/service.c (modified) (2 diffs)

trunk/zoo-project/zoo-services/ogr/ogr2ogr/service.c

@@ -591 +591 @@
 /* -------------------------------------------------------------------- */
 #if GDAL_VERSION_MAJOR >= 2
-      GDALDataset *poDS;
+      GDALDataset *poDS
+        = (GDALDataset*) GDALOpenEx( pszDataSource,
+                                     GDAL_OF_READONLY | GDAL_OF_VECTOR,
+                                     NULL, NULL, NULL );
       GDALDataset *poODS;
       GDALDriverManager* poR=GetGDALDriverManager();
       GDALDriver          *poDriver = NULL;
 #else
-      OGRDataSource* poDS;
+      OGRDataSource* poDS
+        = OGRSFDriverRegistrar::Open( pszDataSource, FALSE );
       OGRDataSource *poODS;
       OGRSFDriverRegistrar    *poR = OGRSFDriverRegistrar::GetRegistrar();
@@ -737 +741 @@
         if( poODS == NULL )
         {
+          poODS = 
+#if GDAL_VERSION_MAJOR >= 2
+            (GDALDataset*) GDALOpenEx( pszDestDataSource,
+                                       GDAL_OF_UPDATE | GDAL_OF_VECTOR,
+                                       NULL, NULL, NULL )
+#else
+            OGRSFDriverRegistrar::Open( pszDestDataSource, TRUE )
+#endif
+            ;
+          if( poODS == NULL )
+            {
+              fprintf( stderr, "FAILURE:\n"
+                       "Unable to open existing output datasource `%s'.\n",
+                       pszDestDataSource );
+#ifdef ZOO_SERVICE
+              char tmp[1024];
+              sprintf(tmp,"Unable to open existing output datasource `%s'.",pszDestDataSource);
+              setMapInMaps(conf,"lenv","message",tmp);
+              return SERVICE_FAILED;
+#else
+              exit( 1 );
+#endif
+
             fprintf( stderr,  "%s driver failed to create %s\n", 
                     pszFormat, pszDestDataSource );
-#ifdef ZOO_SERVICE
-            char tmp[1024];
-            sprintf(tmp,"%s driver failed to create %s",pszFormat, pszDestDataSource);
-            setMapInMaps(conf,"lenv","message",tmp);
-            return SERVICE_FAILED;
-#else
-            exit( 1 );
-#endif
+            }
         }
     }