Changeset 864 for branches/prototype-v0

Timestamp:

Feb 5, 2018, 2:51:19 PM (7 years ago)

Author:

djay

Message:

Use memory=load for downloading body references.

Location:

branches/prototype-v0/zoo-project

Files:

• zoo-kernel/request_parser.c (modified) (2 diffs)
• zoo-kernel/ulinet.c (modified) (1 diff)
• zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py (modified) (1 diff)

branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c

@@ -779 +779 @@
                                   xmlGetProp (cur3, BAD_CAST "href");
                                 HINTERNET bInternet, res1, res;
+                                maps *tmpConf=createMaps("main");
+                                tmpConf->content=createMap("memory","load");
                                 bInternet = InternetOpen (
 #ifndef WIN32
@@ -797 +799 @@
                                                    INTERNET_FLAG_NO_CACHE_WRITE,
                                                    0,
-                                                   *main_conf);
+                                                   tmpConf);
                                 processDownloads (&bInternet);
+                                freeMaps(&tmpConf);
+                                free(tmpConf);
                                 char *tmp =
                                   (char *)

branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

@@ -503 +503 @@
       else
         sprintf(filename,"/%s/ZOO_Cache%s", tmpPath->value,tmpUuid);
-      fprintf(stderr," *** %s %d %s",__FILE__,__LINE__,filename);
-      fflush(stderr);
       free(tmpUuid);
       hInternet->ihandle[hInternet->nb].filename=strdup(filename);

branches/prototype-v0/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py

@@ -99 +99 @@
         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)
+        lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
         while feat is not None: