Changeset 917 for trunk/zoo-project/zoo-services/ogr

Timestamp:

May 7, 2019, 2:17:08 PM (6 years ago)

Author:

djay

Message:

Merge prototype-v0 branch in trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py (modified) (1 diff)
• zoo-project/zoo-services/ogr/base-vect-ops/service.c (modified) (1 diff)
• zoo-project/zoo-services/ogr/ogr2ogr/service.c (modified) (9 diffs)
• zoo-project/zoo-services/ogr/tindex (copied) (copied from branches/prototype-v0/zoo-project/zoo-services/ogr/tindex)

trunk/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py

@@ -95 +95 @@
 
 def extractInputs(conf,obj):
+    if obj.keys().count("cache_file"):
+        print >> sys.stderr,obj
+        geometry=[]
+        ds = osgeo.ogr.Open(obj["cache_file"])
+        lyr = ds.GetLayer(0)
+        feat = lyr.GetNextFeature()
+        while feat is not None:
+            geometry+=[feat.Clone()]
+            feat.Destroy()
+            feat = lyr.GetNextFeature()
+        ds.Destroy()
+        return geometry    
     if obj["mimeType"]=="application/json":
         return createLayerFromJson(conf,obj["value"])

trunk/zoo-project/zoo-services/ogr/base-vect-ops/service.c

@@ -473 +473 @@
           {
 
-            if( EQUAL(
+            if( 
 #if GDAL_VERSION_MAJOR >=2
-                      poR->GetDriver(iDriver)->GetDescription()
-#else
-                      poR->GetDriver(iDriver)->GetName()
-#endif
-                      ,oDriver1) )
+                EQUAL(poR->GetDriver(iDriver)->GetDescription(),oDriver1)
+#else
+                EQUAL(poR->GetDriver(iDriver)->GetName(),oDriver1)
+#endif
+                )
               {
                 poDriver = poR->GetDriver(iDriver);

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

@@ -96 +96 @@
 #endif
 {
+    char  *pszDialect = NULL;
     const char  *pszFormat = "ESRI Shapefile";
     const char  *pszDataSource = NULL;
@@ -155 +156 @@
       sprintf(serverAddress,"%s",tmpMap->value);
     }
-    
+
     tmpMap=NULL;
     char tmpurl[1024];
@@ -223 +224 @@
     if(tmpMap!=NULL && strncasecmp(tmpMap->value,"NULL",4)!=0){
       pszSQLStatement = tmpMap->value;
+    }
+
+    tmpMap=getMapFromMaps(inputs,"dialect","value");
+    if(tmpMap!=NULL){
+      pszDialect=strdup(tmpMap->value);
     }
 
@@ -360 +366 @@
           dfMaxSegmentLength = atof(tmpMap->value);
     }
-
-    /*tmpMap=NULL;
-    tmpMap=getMapFromMaps(inputs,"segmentize","value");
-    if(tmpMap!=NULL){
-          dfMaxSegmentLength = atof(tmpMap->value);
-    }*/
-
+   
     tmpMap=NULL;
     tmpMap=getMapFromMaps(inputs,"InputDSN","value");
@@ -825 +825 @@
         
         poResultSet = poDS->ExecuteSQL( pszSQLStatement, poSpatialFilter, 
-                                        NULL );
+                                        pszDialect );
 
         if( poResultSet != NULL )
@@ -841 +841 @@
             }
             poDS->ReleaseResultSet( poResultSet );
-        }
-    }
+        }else{
+          setMapInMaps(conf,"lenv","message","There was an error when running yoru SQL query.");
+          if(pszDialect!=NULL)
+            free(pszDialect);
+          return SERVICE_FAILED;
+        }
+    }
+    if(pszDialect!=NULL)
+      free(pszDialect);
 
 /* -------------------------------------------------------------------- */
@@ -901 +908 @@
 
 #ifdef ZOO_SERVICE
-    outputs->content=createMap("value",(char*)pszwebDestData);
+    setMapInMaps(outputs,"OutputedDataSourceName","value",(char*)pszwebDestData);
+    //outputs->content=createMap("value",(char*)pszwebDestData);
 #endif
 
@@ -930 +938 @@
     fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
 
-    OGRCleanupAll();
+    //OGRCleanupAll();
     fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
 
@@ -939 +947 @@
     
 #ifdef ZOO_SERVICE
+    //sleep(10);
     return SERVICE_SUCCEEDED;
 #else