Changeset 2435

Timestamp:

10/06/03 09:03:19 (5 years ago)

Author:

assefa

Message:

Use of namespace. Correct execption return.

Files:

• trunk/mapserver/mapgml.c (modified) (6 diffs)
• trunk/mapserver/mapows.h (modified) (2 diffs)
• trunk/mapserver/mapwfs.c (modified) (19 diffs)

trunk/mapserver/mapgml.c

@@ -429 +429 @@
-*/
-
-
+
+
-{
-  int status;
@@ -463 +464 @@
-      if(status != MS_SUCCESS) return(status);
-
-
-
-
+. (Note : there might be no attributs)
+//
+//
-
-      for(j=0; j<lp->resultcache->numresults; j++) 
@@ -482 +483 @@
-        // start this feature
-        fprintf(stream, "    <gml:featureMember>\n");
-
+
+
+
+
+
-
-        // write the bounding box
@@ -494 +499 @@
-#endif
-
-
+gml:
-
-        // write the feature geometry
@@ -506 +511 @@
-#endif
-
-
+gml:
-
-        // write the item/values
@@ -513 +518 @@
-          char *encoded_val;
-          encoded_val = msEncodeHTMLEntities(shape.values[k]);
-
-
+
+
+
+
+
+
+
-          free(encoded_val);
-        }
-
-        // end this feature
-
+
+
+
+
+
-        fprintf(stream, "    </gml:featureMember>\n");
-

trunk/mapserver/mapows.h

@@ -6 +6 @@
- **********************************************************************
- * $Log$
+ * Revision 1.18  2003/10/06 13:03:19  assefa
+ * Use of namespace. Correct execption return.
+ *
- * Revision 1.17  2003/09/19 21:54:19  assefa
- * Add support fot the Post request.
@@ -177 +180 @@
-
-#ifdef USE_WFS_SVR
-
+, char *
-#endif
-

trunk/mapserver/mapwfs.c

@@ -30 +30 @@
- **********************************************************************
- * $Log$
+ * Revision 1.24  2003/10/06 13:03:19  assefa
+ * Use of namespace. Correct execption return.
+ *
- * Revision 1.23  2003/09/30 15:56:40  assefa
- * Typenames may have namespaces.
@@ -125 +128 @@
-    printf("Content-type: text/xml%c%c",10,10);
-
-
-
+
+
+
+
+
-    /* Optional <Locator> element currently unused. */
-
-
-
-
-WFS_Exception
+//
+XML
+//
+Service
+ServiceExceptionReport
-
-    return MS_FAILURE; // so we can call 'return msWFSException();' anywhere
@@ -213 +219 @@
-const char *msWFSGetGeomElementName(mapObj *map, layerObj *lp)
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}
@@ -475 +483 @@
-    char **layers = NULL;
-    const char *myns_uri = NULL;
-
+
+
+
-
-    if(paramsObj->pszTypeName && numlayers == 0) 
@@ -484 +494 @@
-        //
-        layers = split(paramsObj->pszTypeName, ',', &numlayers);
+        if (numlayers > 0)
+        {
+            //strip namespace if there is one :ex TYPENAME=cdf:Other
+            tokens = split(layers[0], ':', &n);
+            if (tokens && n==2 && msGetLayerIndex(map, layers[0]) < 0)
+            {
+                pszNameSpace = strdup(tokens[0]);
+                msFreeCharArray(tokens, n);
+                for (i=0; i<numlayers; i++)
+                {
+                    tokens = split(layers[i], ':', &n);
+                    if (tokens && n==2)
+                    {
+                        free(layers[i]);
+                        layers[i] = strdup(tokens[1]);
+                    }
+                    if (tokens)
+                      msFreeCharArray(tokens, n);
+                }
+            }
+        }
-    } 
-    if (paramsObj->pszOutputFormat)
@@ -498 +529 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /*
-    ** DescribeFeatureType response
@@ -515 +559 @@
-    printf("<schema\n"
-           "   targetNamespace=\"%s\" \n"
-
+
+
-           "   xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n"
-           "   xmlns=\"http://www.w3.org/2001/XMLSchema\"\n"
-           "   xmlns:gml=\"http://www.opengis.net/gml\"\n"
-           "   elementFormDefault=\"qualified\" version=\"0.1\" >\n", 
-
+pszNameSpace, 
-
-    printf("\n"
-           "  <import namespace=\"http://www.opengis.net/gml\" \n"
-
+.1
-           msOWSGetSchemasLocation(map));
-
@@ -553 +598 @@
-            printf("\n"
-                   "  <element name=\"%s\" \n"
-myn
+%
-                   "           substitutionGroup=\"gml:_Feature\" />\n\n",
-
+pszNameSpace, 
-
-            printf("  <complexType name=\"%s_Type\">\n", lp->name);
@@ -562 +607 @@
-            printf("        <sequence>\n");
-
-
-
-
-
-
+
+
+
-
-            if (msLayerOpen(lp) == MS_SUCCESS)
@@ -601 +644 @@
-    if (layers)
-        msFreeCharArray(layers, numlayers);
+
+    if (pszNameSpace)
+      free(pszNameSpace);
-
-    return MS_SUCCESS;
@@ -624 +670 @@
-    int bFilterSet = 0;
-    int bBBOXSet = 0;
-
+ char *pszNameSpace = strdup("myns");
-    
-    // Default filter is map extents
@@ -650 +696 @@
-        layers = split(typename, ',', &numlayers);
-/* ==================================================================== */
- spaces (ex cdf:Other),
+spaces (ex cdf:Other), 
-/*      If that is the case extarct only the layer name.                */
-/* ==================================================================== */
@@ -662 +708 @@
-        }
-        tokens = split(layers[0], ':', &n);
-
-
+
+
+
-            msFreeCharArray(tokens, n);
-            for (i=0; i<numlayers; i++)
@@ -741 +788 @@
-        }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    //else if (strcasecmp(names[i], "PROPERTYNAME") == 0)
-    //{
@@ -1042 +1101 @@
-    printf("<wfs:FeatureCollection\n"
-           "   xmlns=\"%s\"\n"
-myn
+%
-           "   xmlns:wfs=\"http://www.opengis.net/wfs\"\n"
-           "   xmlns:gml=\"http://www.opengis.net/gml\"\n"
+           "   xmlns:ogc=\"http://www.opengis.net/ogc\"\n"
-           "   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-           "   xsi:schemaLocation=\"http://www.opengis.net/wfs %s/wfs/%s/WFS-basic.xsd \n"
-
-
-
+
+
+
+
-           myns_uri, script_url_encoded, paramsObj->pszVersion, typename);
-
@@ -1056 +1117 @@
-    **          contain mixed geometry types... how to deal with that???
-    */
-
+
+
-
-    /*
@@ -1065 +1127 @@
-    free(script_url);
-    free(script_url_encoded);
+    if (pszNameSpace)
+      free(pszNameSpace);
-
-    return MS_SUCCESS;
@@ -1263 +1327 @@
-                else if (strcasecmp(request->ParamNames[i], "FILTER") == 0)
-                  wfsparams->pszFilter = strdup(request->ParamValues[i]);
+                
+                else if (strcasecmp(request->ParamNames[i], "OUTPUTFORMAT") == 0)
+                  wfsparams->pszOutputFormat = strdup(request->ParamValues[i]);
-            }
-        }
@@ -1475 +1542 @@
-                wfsparams->pszRequest = strdup("DescribeFeatureType");
-
-
+
+
-                if (pszValue)
-                  wfsparams->pszVersion = strdup(pszValue);
-
-
+
+
-                if (pszValue)
-                  wfsparams->pszService = strdup(pszValue);
-
-
+
+
-                                                 NULL);
-                if (pszValue)
-                  wfsparams->pszOutputFormat = strdup(pszValue);
-
-Get
+Describe
-                if (psTypeName)
-                {