Changeset 703 for trunk/zoo-project/zoo-kernel

Timestamp:

Jun 30, 2015, 2:06:42 PM (9 years ago)

Author:

djay

Message:

Add SVN Admin status in COMMITERS.

Location:

trunk/zoo-project/zoo-kernel

Files:

• request_parser.c (modified) (4 diffs)
• service_internal.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/request_parser.c

@@ -952 +952 @@
                                   xmlDocDumpFormatMemoryEnc (doc1, &mv,
                                                              &buffersize,
-                                                             "utf-8", 1);
-                                  char size[1024];
-                                  sprintf (size, "%d", buffersize);
-                                  addToMap (tmpmaps->content, "size",
-                                            size);
+                                                             "utf-8", 0);
+                                  addIntToMap (tmpmaps->content, "size",
+                                               buffersize);
                                   xmlFreeDoc (doc1);
                                 }
@@ -967 +965 @@
                                     xmlDocDumpFormatMemoryEnc (doc1, &mv,
                                                                &buffersize,
-                                                               "utf-8", 1);
-                                    char size[1024];
-                                    sprintf (size, "%d", buffersize);
-                                    addToMap (tmpmaps->content, "size",
-                                              size);
+                                                               "utf-8", 0);
+                                    addIntToMap(tmpmaps->content, "size",buffersize);
                                     xmlFreeDoc (doc2);
                                     xmlFreeDoc (doc1);
@@ -990 +985 @@
                             {
                               addToMap (tmpmaps->content, "value",
-                                        (char *) mv);
+                                        (char*) mv);
                               xmlFree (mv);
+                              dumpMap(tmpmaps->content);
                             }
                         }
                       else
                         {
+                          fprintf(stderr,"DEBUG %s %d \n",__FILE__,__LINE__);
                           xmlChar *tmp = xmlNodeListGetRawString (doc,
                                                                   cur4->xmlChildrenNode,
@@ -1003 +1000 @@
                           xmlFree (tmp);
                         }
+
                       cur4 = cur4->next;
                     }

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -23 +23 @@
  */
 
-#include "service_internal.h"
 #ifdef USE_MS
 #include "service_internal_ms.h"
@@ -29 +28 @@
 #include "cpl_vsi.h"
 #endif
+#include "service_internal.h"
 
 #ifndef TRUE

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -2192 +2192 @@
       char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char));
       fread (tmps1, flen, 1, f2);
+      char *pchr=strrchr(tmps1,'>');
+      flen=strlen(tmps1)-strlen(pchr)+1;
+      tmps1[flen]=0;
       fwrite (tmps1, 1, flen, f3);
       fclose (f2);