Changeset 957 for trunk/zoo-project/zoo-kernel/request_parser.c
- Timestamp:
- Feb 6, 2020, 3:12:42 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/request_parser.c
r946 r957 416 416 while (pToken != NULL) 417 417 { 418 outputs_as_text[i] =418 /* outputs_as_text[i] = 419 419 (char *) malloc ((strlen (pToken) + 1) * sizeof (char)); 420 420 if (outputs_as_text[i] == NULL) … … 427 427 pToken); 428 428 pToken = strtok (NULL, ";"); 429 i++; 429 i++; */ 430 431 // knut : rewrite above fragment to enable parsing of mimetype;subtype strings in key-value pairs: 432 433 char* _token = zStrdup(pToken); 434 pToken = strtok (NULL, ";"); 435 436 if (pToken != NULL && strncmp(pToken, "subtype=", 8) == 0) 437 { 438 size_t _length = strlen(pToken) + strlen(_token) + 2; 439 outputs_as_text[i] = (char *) malloc(_length * sizeof (char)); 440 snprintf(outputs_as_text[i], _length, "%s;%s", _token, pToken); 441 pToken = strtok (NULL, ";"); 442 } 443 else 444 { 445 outputs_as_text[i] = (char *) malloc((strlen(_token) + 1) * sizeof (char)); 446 snprintf (outputs_as_text[i], strlen(_token) + 1, "%s", _token); 447 } 448 free(_token); 449 i++; 430 450 } 431 451 for (j = 0; j < i; j++) … … 862 882 for (l = 0; l < 3; l++){ 863 883 xmlChar *val = 864 xmlGetProp (cur4, BAD_CAST coms[l]); 884 //xmlGetProp (cur4, BAD_CAST coms[l]); 885 xmlGetProp (cur2, BAD_CAST coms[l]); // knut : get attributes from the Data xml element, not it's children (the content) 865 886 if (val != NULL && strlen ((char *) val) > 0){ 866 887 if (tmpmaps->content != NULL)
Note: See TracChangeset
for help on using the changeset viewer.