- Timestamp:
- Jan 22, 2017, 5:56:53 PM (7 years ago)
- Location:
- branches/branch-1.6
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/branch-1.6
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk merged eligible /trunk/branches/branch-1.6 802-806
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/branch-1.6/zoo-project/zoo-kernel/server_internal.c
r798 r807 791 791 * check for useMapServer presence 792 792 */ 793 map* tmpCheck=getMap(tmpIoType->content,"useMapServer"); 794 if(tmpCheck!=NULL){ 795 // Get the default value 796 tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL); 797 tmpCheck=getMap(tmpMaps->content,"mimeType"); 798 addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value); 799 map* cursor=tmpIoType->content; 800 while(cursor!=NULL){ 801 addToMap(tmpMaps->content,cursor->name,cursor->value); 802 cursor=cursor->next; 803 } 793 if(tmpIoType!=NULL){ 794 map* tmpCheck=getMap(tmpIoType->content,"useMapServer"); 795 if(tmpCheck!=NULL){ 796 // Get the default value 797 tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL); 798 tmpCheck=getMap(tmpMaps->content,"mimeType"); 799 addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value); 800 map* cursor=tmpIoType->content; 801 while(cursor!=NULL){ 802 addToMap(tmpMaps->content,cursor->name,cursor->value); 803 cursor=cursor->next; 804 } 804 805 805 cursor=tmpInputs->content; 806 while(cursor!=NULL){ 807 if(strcasecmp(cursor->name,"Title")==0 || 808 strcasecmp(cursor->name,"Abstract")==0) 809 addToMap(tmpMaps->content,cursor->name,cursor->value); 810 cursor=cursor->next; 806 cursor=tmpInputs->content; 807 while(cursor!=NULL){ 808 if(strcasecmp(cursor->name,"Title")==0 || 809 strcasecmp(cursor->name,"Abstract")==0) 810 addToMap(tmpMaps->content,cursor->name,cursor->value); 811 cursor=cursor->next; 812 } 811 813 } 812 814 }
Note: See TracChangeset
for help on using the changeset viewer.