Changeset 867 for branches

Timestamp:

Feb 25, 2018, 3:06:51 PM (7 years ago)

Author:

djay

Message:

Fix issue #163 and add support for extra cookie through definition of ecookie array map and the corresponding ecookie_lenght. This give the capability to return more than only a single Cookie.

Location:

branches/prototype-v0/zoo-project/zoo-kernel

Files:

• configure.ac (modified) (1 diff)
• request_parser.c (modified) (5 diffs)
• request_parser.h (modified) (1 diff)
• response_print.c (modified) (1 diff)
• service_internal_ms.c (modified) (2 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/configure.ac

@@ -112 +112 @@
 #============================================================================
 
-AC_ARG_WITH([gettext],
-    [AS_HELP_STRING([--with-gettext=PATH], [Specifies an alternative location for the openssl library])],
-    [GETTEXT_DIR="$withval"], [GETTEXT_DIR="/usr/"])
-GETTEXT_CFLAGS="-I$GETTEXT_DIR/include"
-GETTEXT_LDFLAGS="-L$GETTEXT_DIR/lib -lintl"
-CFLAGS_SAVE="$CFLAGS"
-CFLAGS="$GETTEXT_CFLAGS"
-LIBS_SAVE="$LIBS"
-LIBS="$GETTEXT_LDFLAGS"
-AM_GNU_GETTEXT([external], [], [])
-AC_CHECK_LIB(intl,
-                        [dgettext], [] , [AC_MSG_ERROR([could not find $i function in gettext library])])
+#AC_ARG_WITH([gettext],
+#    [AS_HELP_STRING([--with-gettext=PATH], [Specifies an alternative location for the openssl library])],
+#    [GETTEXT_DIR="$withval"], [GETTEXT_DIR="/usr/"])
+#GETTEXT_CFLAGS="-I$GETTEXT_DIR/include"
+#GETTEXT_LDFLAGS="-L$GETTEXT_DIR/lib -lintl"
+#CFLAGS_SAVE="$CFLAGS"
+#CFLAGS="$GETTEXT_CFLAGS"
+#LIBS_SAVE="$LIBS"
+#LIBS="$GETTEXT_LDFLAGS"
+#AM_GNU_GETTEXT([external], [], [])
+#AC_CHECK_LIB(intl,
+#                       [dgettext], [] , [AC_MSG_ERROR([could not find $i function in gettext library])])
 AC_SUBST([GETTEXT_CFLAGS])
 AC_SUBST([GETTEXT_LDFLAGS])

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

@@ -905 +905 @@
                   }
 
-
                   while (cur4 != NULL)
                     {
@@ -979 +978 @@
 
                       if (strcasecmp (test->value, "base64") != 0)
-                        { 
+                        {
                           xmlChar *mv = xmlNodeListGetString (doc,
                                                               cur4->xmlChildrenNode,
@@ -1007 +1006 @@
                                                              &buffersize,
                                                              "utf-8", 0);
+                                  xmlFreeDoc (doc1);
                                 }
                               else
@@ -1022 +1022 @@
                               addIntToMap (tmpmaps->content, "size",
                                            buffersize);
-                              xmlFreeDoc (doc1);
                             }else{
-                            xmlNodePtr cur5 = cur4->children;
-                            while (cur5 != NULL
-                                   && cur5->type != XML_CDATA_SECTION_NODE)
-                              cur5 = cur5->next;
-                            if (cur5 != NULL
-                                && cur5->type == XML_CDATA_SECTION_NODE){
-                              xmlFree(mv);
-                              mv=xmlStrdup(cur5->content);
+                            if(xmlStrcasecmp
+                               (cur4->name, BAD_CAST "BoundingBoxData") == 0){
+                              xmlDocPtr doc1 = xmlNewDoc(BAD_CAST "1.0");
+                              int buffersize;
+                              xmlDocSetRootElement(doc1,cur4);
+                              xmlDocDumpFormatMemoryEnc(doc1,&mv,
+                                                        &buffersize,
+                                                        "utf-8",0);
+                              addIntToMap (tmpmaps->content, "size",
+                                           buffersize);
+                              xmlParseBoundingBox(main_conf,&tmpmaps->content,doc1);
+                            }else{
+                              xmlNodePtr cur5 = cur4->children;
+                              while (cur5 != NULL
+                                     && cur5->type != XML_ELEMENT_NODE
+                                     && cur5->type != XML_CDATA_SECTION_NODE)
+                                cur5 = cur5->next;
+                              if (cur5 != NULL
+                                  && cur5->type != XML_CDATA_SECTION_NODE)
+                                {
+                                  xmlDocPtr doc1 = xmlNewDoc (BAD_CAST "1.0");
+                                  int buffersize;
+                                  xmlDocSetRootElement (doc1, cur5);
+                                  xmlDocDumpFormatMemoryEnc (doc1, &mv,
+                                                             &buffersize,
+                                                             "utf-8", 0);
+                                  addIntToMap (tmpmaps->content, "size",
+                                               buffersize);
+                                }
+                              else /*if (cur5 != NULL
+                                     && cur5->type == XML_CDATA_SECTION_NODE)*/{
+                                xmlFree(mv);
+                                mv=xmlStrdup(cur5->content);
+                              }
                             }
                           }
@@ -1102 +1127 @@
     }
   return 1;
+}
+
+/**
+ * Parse a BoundingBoxData node
+ *
+ * http://schemas.opengis.net/ows/1.1.0/owsCommon.xsd: BoundingBoxType
+ * 
+ * A map to store boundingbox information will contain:
+ *  - LowerCorner : double double (minimum within this bounding box)
+ *  - UpperCorner : double double (maximum within this bounding box)
+ *  - crs : URI (Reference to definition of the CRS)
+ *  - dimensions : int 
+ *
+ * @param main_conf the conf maps containing the main.cfg settings
+ * @param request_inputs the map storing KVP raw value 
+ * @param doc the xmlDocPtr containing the BoudingoxData node
+ * @return a map containing all the bounding box keys
+ */
+int xmlParseBoundingBox(maps** main_conf,map** current_input,xmlDocPtr doc){
+  xmlNode *root_element = xmlDocGetRootElement(doc);
+  for(xmlAttrPtr attr = root_element->properties; NULL != attr; attr = attr->next){
+    xmlChar *val = xmlGetProp (root_element, BAD_CAST attr->name);
+    addToMap(*current_input,(char*)attr->name,(char*)val);
+    xmlFree(val);
+    xmlNodePtr cur = root_element->children;
+    while(cur!=NULL && cur->type != XML_ELEMENT_NODE)
+      cur=cur->next;
+    while(cur!=NULL && cur->type==XML_ELEMENT_NODE){
+      xmlChar *val =
+        xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
+      addToMap(*current_input,(char*)cur->name,(char*)val);
+      cur=cur->next;
+      xmlFree(val);
+      while(cur!=NULL && cur->type != XML_ELEMENT_NODE)
+        cur=cur->next;
+    }
+  }
 }
 

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

@@ -44 +44 @@
   int kvpParseOutputs(maps**,map *,maps**);
   int xmlParseInputs(maps**,service*,maps**,xmlDocPtr,xmlNodeSet*,HINTERNET*);
+  int xmlParseBoundingBox(maps** main_conf,map** current_input,xmlDocPtr doc);
   int xmlParseOutputs(maps**,map**,maps**,xmlDocPtr,xmlNodePtr,bool);
   int xmlParseRequest(maps**,const char*,map**,service*,maps**,maps**,HINTERNET*);

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

@@ -2623 +2623 @@
   if(tmpSess!=NULL){
     map *_tmp=getMapFromMaps(m,"lenv","cookie");
+    maps *tmps=getMaps(m,"senv");
     char* sessId=NULL;
     if(_tmp!=NULL){
       printf("Set-Cookie: %s; HttpOnly\r\n",_tmp->value);
+      map *_tmp1=getMapFromMaps(m,"senv","ecookie_length");
+      if(_tmp1!=NULL){
+        int len=atoi(_tmp1->value);
+        int cnt=0;
+        for(cnt=0;cnt<len;cnt++){
+          map* _tmp2=getMapArray(tmps->content,"ecookie",cnt);
+          if(_tmp2!=NULL)
+            printf("Set-Cookie: %s; HttpOnly\r\n",_tmp->value);
+        }
+      }
       printf("P3P: CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\"\r\n");
       char session_file_path[100];

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

@@ -81 +81 @@
  */ 
 int getPublishedId(maps* elem){
-  map* myIndex=getMap(elem->content,"published_id");
-  if(myIndex!=NULL){
-    return atoi(myIndex->value);
+  if(elem!=NULL && elem->content!=NULL){
+    map* myIndex=getMap(elem->content,"published_id");
+    if(myIndex!=NULL){
+      return atoi(myIndex->value);
+    }
   }
   return 0;
 }
+
 /**
  * Add width and height keys to an output maps containing the maximum width
@@ -243 +246 @@
   else
     sprintf(layers,options[proto][3],layerName->value);
-  
+
   if(format==NULL || width==NULL || height==NULL || extent==NULL){
     char tmpStr[1024];