[mapserver-commits] r8510 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-02-06 15:30:43 -0500 (Fri, 06 Feb 2009)
New Revision: 8510

Modified:
   trunk/mapserver/mapogcsos.c
Log:
correct CompositePhenomenon output for om:Measurement #2880

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2009-02-06 15:07:08 UTC (rev 8509)
+++ trunk/mapserver/mapogcsos.c	2009-02-06 20:30:43 UTC (rev 8510)
@@ -708,9 +708,10 @@
                                                     msOWSLookupMetadata(&(lp->metadata), "S", 
                                                                         "observedProperty_id"));
 
-            if (lpfirst && msLayerOpen(lpfirst) == MS_SUCCESS && 
-                msLayerGetItems(lpfirst) == MS_SUCCESS)
-            {   
+            if (lp != lpfirst)
+              status = msLayerOpen(lpfirst);
+            if (status == MS_SUCCESS && msLayerGetItems(lpfirst) == MS_SUCCESS)
+            {           
                 for(i=0; i<lpfirst->numitems; i++) 
                 {
                     if (strcasecmp(lpfirst->items[i], pszValue) == 0)
@@ -732,7 +733,8 @@
                         msFree(pszValueShape);
                 }
                 /*else should we generate a warning !*/
-                msLayerClose(lpfirst);
+                if (lp != lpfirst)
+                  msLayerClose(lpfirst);
             }
                 
         }