Changeset 863 for branches/prototype-v0/zoo-project/zoo-services

Timestamp:

Feb 5, 2018, 1:19:13 PM (7 years ago)

Author:

djay

Message:

Change the default ZOO-Kernel behavior, if an input has been passed by reference, the ZOO-Service will receive a cache_file map rather than the value field which was usually returned, same for array value apply. To use the previous behavior, one can add "memory=load" to the main section of the main.cfg file. Update ZOO-Services for using this new field if available.

Location:

branches/prototype-v0/zoo-project/zoo-services

Files:

• cgal/cgal_service.c (modified) (1 diff)
• ogr/base-vect-ops-py/cgi-env/ogr_sp.py (modified) (1 diff)
• ogr/ogr2ogr/service.c (modified) (1 diff)

branches/prototype-v0/zoo-project/zoo-services/cgal/cgal_service.c

@@ -26 +26 @@
 int parseInput(maps* conf,maps* inputs, std::vector<Pointz>* points,char* filename){
   map* tmpm=NULL;
-  tmpm=getMapFromMaps(inputs,"InputPoints","value");
-  VSILFILE *ifile=VSIFileFromMemBuffer(filename,(GByte*)tmpm->value,strlen(tmpm->value),FALSE);
-  VSIFCloseL(ifile);
+  tmpm=getMapFromMaps(inputs,"InputPoints","cache_file");
 #if GDAL_VERSION_MAJOR >= 2
-  GDALDataset *ipoDS =
-    (GDALDataset*) GDALOpenEx( filename,
-                               GDAL_OF_READONLY | GDAL_OF_VECTOR,
-                               NULL, NULL, NULL );
+  GDALDataset *ipoDS;
 #else
-  OGRDataSource* ipoDS = OGRSFDriverRegistrar::Open(filename,FALSE);
+  OGRDataSource* ipoDS;
 #endif
+  if(tmpm==NULL){
+    tmpm=getMapFromMaps(inputs,"InputPoints","value");
+    VSILFILE *ifile=VSIFileFromMemBuffer(filename,(GByte*)tmpm->value,strlen(tmpm->value),FALSE);
+    VSIFCloseL(ifile);
+#if GDAL_VERSION_MAJOR >= 2
+  ipoDS = (GDALDataset*) GDALOpenEx( filename,
+                                     GDAL_OF_READONLY | GDAL_OF_VECTOR,
+                                     NULL, NULL, NULL );
+#else
+  ipoDS = OGRSFDriverRegistrar::Open(filename,FALSE);
+#endif
+  }else
+#if GDAL_VERSION_MAJOR >= 2
+    ipoDS = (GDALDataset*) GDALOpenEx( tmpm->value,
+                                       GDAL_OF_READONLY | GDAL_OF_VECTOR,
+                                       NULL, NULL, NULL );
+#else
+    ipoDS = OGRSFDriverRegistrar::Open(tmpm->value,FALSE);
+#endif
+    
   if( ipoDS == NULL )
     {

branches/prototype-v0/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"])
+        if sql is not None:
+            if sql.count("from")==0:
+                layerName=ds.GetLayerByIndex(0).GetName()
+                sql+=" from "+layerName
+            lyr=ds.ExecuteSQL( sql, None, None )
+        else:
+            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"])

branches/prototype-v0/zoo-project/zoo-services/ogr/ogr2ogr/service.c

@@ -366 +366 @@
           dfMaxSegmentLength = atof(tmpMap->value);
     }
-
-    /*tmpMap=NULL;
-    tmpMap=getMapFromMaps(inputs,"segmentize","value");
-    if(tmpMap!=NULL){
-          dfMaxSegmentLength = atof(tmpMap->value);
-    }*/
-
    
     tmpMap=NULL;