- Timestamp:
- Aug 29, 2017, 10:52:39 AM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/prototype-v0/zoo-project/zoo-kernel/response_print.c
r839 r850 339 339 } 340 340 else{ 341 nc4 = xmlNewNode(ns_ows, BAD_CAST "Language");342 xmlAddChild(nc4,xmlNewText(BAD_CAST buff));343 341 if(dcount==0){ 344 342 if(vid==0){ 343 nc4 = xmlNewNode(ns_ows, BAD_CAST "Language"); 344 xmlAddChild(nc4,xmlNewText(BAD_CAST buff)); 345 345 xmlAddChild(nc2,nc4); 346 346 xmlAddChild(nc1,nc2); … … 867 867 } 868 868 }else{ 869 xmlNodePtr nc2 = xmlNewNode(ns_ows, BAD_CAST "AdditionalParameter"); 870 xmlNodePtr nc3 = xmlNewNode(ns_ows, BAD_CAST "Name"); 871 xmlAddChild(nc3,xmlNewText(BAD_CAST meta->name)); 872 xmlAddChild(nc2,nc3); 873 if(fromDb<0){ 874 char *mptr; 875 char* meta_values=strtok_r(meta->value,",",&mptr); 876 while(meta_values!=NULL){ 869 if(strncasecmp(meta->name,"length",6)!=0 && strncasecmp(meta->name,"fromDb",6)!=0){ 870 xmlNodePtr nc2 = xmlNewNode(ns_ows, BAD_CAST "AdditionalParameter"); 871 xmlNodePtr nc3 = xmlNewNode(ns_ows, BAD_CAST "Name"); 872 xmlAddChild(nc3,xmlNewText(BAD_CAST meta->name)); 873 xmlAddChild(nc2,nc3); 874 if(fromDb<0){ 875 char *mptr; 876 char* meta_values=strtok_r(meta->value,",",&mptr); 877 while(meta_values!=NULL){ 878 xmlNodePtr nc4 = xmlNewNode(ns_ows, BAD_CAST "Value"); 879 xmlAddChild(nc4,xmlNewText(BAD_CAST meta_values)); 880 xmlAddChild(nc2,nc4); 881 meta_values=strtok_r(NULL,",",&mptr); 882 } 883 }else{ 877 884 xmlNodePtr nc4 = xmlNewNode(ns_ows, BAD_CAST "Value"); 878 xmlAddChild(nc4,xmlNew Text(BAD_CAST meta_values));885 xmlAddChild(nc4,xmlNewCDataBlock(doc,BAD_CAST meta->value,strlen(meta->value))); 879 886 xmlAddChild(nc2,nc4); 880 meta_values=strtok_r(NULL,",",&mptr); 881 } 882 }else{ 883 xmlNodePtr nc4 = xmlNewNode(ns_ows, BAD_CAST "Value"); 884 xmlAddChild(nc4,xmlNewCDataBlock(doc,BAD_CAST meta->value,strlen(meta->value))); 885 xmlAddChild(nc2,nc4); 886 } 887 xmlAddChild(nc1,nc2); 887 } 888 xmlAddChild(nc1,nc2); 889 } 888 890 hasTitle=-1; 889 891 } … … 892 894 xmlAddChild(nc,nc1); 893 895 hasValue=1; 894 } 896 }else 897 free(ctitle); 895 898 } 896 899 if(oMeta!=NULL && hasValue<0 && nc1!=NULL){ … … 1404 1407 } 1405 1408 else 1406 xmlFree (nc9);1409 xmlFreeNode(nc9); 1407 1410 if(strcasecmp(tmp1->name,"uom")==0) 1408 1411 hasUOM1=true; … … 1601 1604 xmlAddChild(nc5,nc6); 1602 1605 else 1603 xmlFree (nc6);1606 xmlFreeNode(nc6); 1604 1607 } 1605 1608 else 1606 xmlFree (nc6);1609 xmlFreeNode(nc6); 1607 1610 } 1608 1611 tmp1=tmp1->next; … … 1631 1634 } 1632 1635 else{ 1636 xmlFreeNode(nc4); 1633 1637 xmlAddChild(nc3,nc5); 1634 1638 } 1635 1639 } 1636 1640 else 1637 if(datatype!=1) 1641 if(datatype!=1){ 1642 xmlFreeNode(nc4); 1638 1643 xmlAddChild(nc3,nc5); 1644 } 1639 1645 1640 1646 _tmp=_tmp->next; … … 1654 1660 } 1655 1661 else{ 1662 xmlFreeNode(nc4); 1656 1663 xmlAddChild(nc3,nc5); 1657 1664 } … … 1673 1680 } 1674 1681 if(e->child!=NULL && vid==0){ 1682 xmlFreeNode(nc3); 1675 1683 elements* children=dupElements(e->child); 1676 1684 elements* cursor=children; … … 1678 1686 char* tmp=strdup(cursor->name); 1679 1687 free(cursor->name); 1680 cursor->name=(char*)malloc((strlen( cursor->name)+strlen(e->name)+2)*sizeof(char));1688 cursor->name=(char*)malloc((strlen(tmp)+strlen(e->name)+2)*sizeof(char)); 1681 1689 sprintf(cursor->name,"%s.%s",e->name,tmp); 1682 1690 cursor=cursor->next;
Note: See TracChangeset
for help on using the changeset viewer.