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

Timestamp:

Aug 14, 2020, 1:38:08 PM (4 years ago)

Author:

djay

Message:

Add LCO and DSCO multiple occurence in Ogr2Ogr service. Update ZOO-Kernel messages.po file.

Location:

trunk/zoo-project/zoo-services/ogr/ogr2ogr

Files:

• cgi-env/Ogr2Ogr.zcfg (modified) (1 diff)
• service.c (modified) (5 diffs)

trunk/zoo-project/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg

@@ -48 +48 @@
     </Supported>
    </LiteralData>
+  [LCO]
+   Title = Format of the output data
+   Abstract = Select the output format.
+   minOccurs = 0
+   maxOccurs = 1024
+   <LiteralData>
+    DataType = string
+    <Default />
+   </LiteralData>
+  [DSCO]
+   Title = Format of the output data
+   Abstract = Select the output format.
+   minOccurs = 0
+   maxOccurs = 1024
+   <LiteralData>
+    DataType = string
+    <Default />
+   </LiteralData>
  </DataInputs>
  <DataOutputs>

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

@@ -171 +171 @@
 
     tmpMap=NULL;
-    tmpMap=getMapFromMaps(inputs,"DSCO","value");
-    if(tmpMap!=NULL && strncasecmp(tmpMap->value,"NULL",4)!=0){
-          papszDSCO = CSLAddString(papszDSCO, tmpMap->value );
-    }
-
-    tmpMap=NULL;
-    tmpMap=getMapFromMaps(inputs,"LCO","value");
+    int length=1;
+    tmpMap=getMapFromMaps(inputs,"DSCO","length");
+    if(tmpMap!=NULL){
+            length=atoi(tmpMap->value);
+    }
+    maps* tmpMaps=getMaps(inputs,"DSCO");
+    for(int i=0;i<length;i++){
+        tmpMap=getMapArray(tmpMaps->content,"value",i);
+        //tmpMap=getMapFromMaps(inputs,"DSCO","value");
+        if(tmpMap!=NULL && strncasecmp(tmpMap->value,"NULL",4)!=0){
+              papszDSCO = CSLAddString(papszDSCO, tmpMap->value );
+        }
+    }
+
+    tmpMap=NULL;
+    length=1;
+    tmpMap=getMapFromMaps(inputs,"LCO","length");
+    if(tmpMap!=NULL){
+            length=atoi(tmpMap->value);
+    }
+    tmpMaps=getMaps(inputs,"LCO");
+    for(int i=0;i<length;i++){
+        tmpMap=getMapArray(tmpMaps->content,"value",i);
+    //tmpMap=getMapFromMaps(inputs,"LCO","value");
     if(tmpMap!=NULL && strncasecmp(tmpMap->value,"NULL",4)!=0){
           papszLCO = CSLAddString(papszLCO, tmpMap->value );
+    }
     }
 
@@ -368 +386 @@
    
     tmpMap=NULL;
+    tmpMap=getMapFromMaps(inputs,"InputDS","cache_file");
+    if(tmpMap!=NULL){
+            pszDataSource=strdup(tmpMap->value);
+    }else{
     tmpMap=getMapFromMaps(inputs,"InputDSN","value");
     if(tmpMap!=NULL && strncasecmp(tmpMap->value,"NULL",4)!=0){
@@ -384 +406 @@
         sprintf((char*)pszDataSource,"%s",tmpMap->value);       
       }
+    }
     }
 
@@ -844 +867 @@
           setMapInMaps(conf,"lenv","message","There was an error when running yoru SQL query.");
           if(pszDialect!=NULL)
-            free(pszDialect);
+            free((void*)pszDialect);
           return SERVICE_FAILED;
         }
     }
     if(pszDialect!=NULL)
-      free(pszDialect);
+      free((void*)pszDialect);
 
 /* -------------------------------------------------------------------- */
@@ -908 +931 @@
 
 #ifdef ZOO_SERVICE
+    tmpMap=getMapFromMaps(inputs,"InputDS","cache_file");
+    if(tmpMap==NULL)
     setMapInMaps(outputs,"OutputedDataSourceName","value",(char*)pszwebDestData);
+    else{
+         tmpMap=getMapFromMaps(inputs,"OutputDSN","value");
+         if(tmpMap!=NULL){ 
+                 map* tmpPath=getMapFromMaps(conf,"main","tmpPath");
+           pszDestDataSource=(char*)malloc(sizeof(char)*(strlen(tmpMap->value)+1));
+           sprintf((char*)pszDestDataSource,"%s",tmpMap->value/*,ext*/);
+           pszwebDestData=(char*)malloc(sizeof(char)*(strlen(tmpPath->value)+strlen(tmpMap->value)+4));
+           sprintf((char*)pszwebDestData,"%s/%s",tmpPath->value,tmpMap->value/*,ext*/);
+           setMapInMaps(outputs,"OutputedDataSourceName","generated_file",(char*)pszwebDestData);
+           setMapInMaps(outputs,"OutputedDataSourceName","mimeType","application/json");
+           setMapInMaps(outputs,"OutputedDataSourceName","value","none");
+        //setMapInMaps(outputs,"OutputedDataSourceName","storage",(char*)pszwebDestData);
+         }
+            
+    }
+    
     //outputs->content=createMap("value",(char*)pszwebDestData);
 #endif