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

Timestamp:

Jan 11, 2013, 3:43:44 PM (12 years ago)

Author:

djay

Message:

Fix issue in OGR python services, thanks to Farkas to point this issue. Update Java support to handle properly the error messages coming from the JVM. Fix segfault when ZCFG file doesn't exist.

File:

• trunk/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py (modified) (3 diffs)

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

@@ -163 +163 @@
         i+=1
     outputResult(conf,outputs["Result"],rgeometries)
-    return zoo.SUCCEEDED
+    return zoo.SERVICE_SUCCEEDED
 
 def ConvexHullPy(conf,inputs,outputs):
@@ -177 +177 @@
         i+=1
     outputResult(conf,outputs["Result"],rgeometries)
-    return zoo.SUCCEEDED
+    return zoo.SERVICE_SUCCEEDED
 
 
@@ -201 +201 @@
         j=0
         while j < len(geometry2):
-            tres=geometry1[i].Union(geometry2[j])
-            if not(tres.IsEmpty()):
-                rgeometries+=[tres]
+            tmp=geometry1[j].Clone()
+            resg=geometry2[i].GetGeometryRef()
+            resg=resg.Union(geometry1[i].GetGeometryRef())
+            tmp.SetGeometryDirectly(resg)
+            if not(resg.IsEmpty()):
+                rgeometries+=[tmp]
             j+=1
         geometry1[i].Destroy()