Changeset 49

Timestamp:

Dec 10, 2010, 11:26:13 AM (14 years ago)

Author:

nmarco

Message:

I Correct the path to the output data: now refers to the url path (tmpUrl) of the web service, instead to the server path (tmpPath)

File:

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

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

@@ -79 +79 @@
     const char  *pszDataSource = NULL;
     const char  *pszDestDataSource = NULL;
+    const char  *pszwebDestData = NULL;
     char        **papszLayers = NULL;
     char        **papszDSCO = NULL, **papszLCO = NULL;
@@ -123 +124 @@
     if(tmpMap!=NULL){
       sprintf(tempPath,"%s",tmpMap->value);
+    }
+    
+    tmpMap=NULL;
+    char serverAddress[1024];
+    tmpMap=getMapFromMaps(conf,"main","serverAddress");
+    if(tmpMap!=NULL){
+      sprintf(serverAddress,"%s",tmpMap->value);
+    }
+    
+    tmpMap=NULL;
+    char tmpurl[1024];
+    tmpMap=getMapFromMaps(conf,"main","tmpurl");
+    if(tmpMap!=NULL){
+      sprintf(tmpurl,"%s",tmpMap->value);
     }
 
@@ -341 +356 @@
       pszDestDataSource=(char*)malloc(sizeof(char)*(strlen(tempPath)+strlen(tmpMap->value)+4));
       sprintf((char*)pszDestDataSource,"%s/%s",tempPath,tmpMap->value/*,ext*/);
+      pszwebDestData=(char*)malloc(sizeof(char)*(strlen(serverAddress)+strlen(tmpurl)+strlen(tmpMap->value)+4));
+      sprintf((char*)pszwebDestData,"%s%s/%s",serverAddress,tmpurl,tmpMap->value/*,ext*/);
     }
 
@@ -811 +828 @@
         outputs=(maps*)malloc(sizeof(maps*));
     outputs->name="GeneratedFile";
-    outputs->content=createMap("value",(char*)pszDestDataSource);
+    outputs->content=createMap("value",(char*)pszwebDestData);
     addMapToMap(&outputs->content,createMap("dataType","string"));
     outputs->next=NULL;