Changes in trunk/zoo-kernel/zoo_service_loader.c [20:30]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-kernel/zoo_service_loader.c
r20 r30 44 44 #include "service.h" 45 45 #include "service_internal.h" 46 47 48 #ifdef USE_PYTHON 46 49 #include "service_internal_python.h" 50 #endif 47 51 48 52 #ifdef USE_JAVA … … 57 61 #include "service_internal_js.h" 58 62 #endif 63 64 #ifdef USE_PERL 65 #include "service_internal_perl.h" 66 #endif 67 59 68 60 69 … … 173 182 freeMaps(&m); 174 183 free(m); 184 freeMap(&request_inputs); 185 free(request_inputs); 175 186 return 1; 176 187 } … … 183 194 freeMaps(&m); 184 195 free(m); 196 freeMap(&request_inputs); 197 free(request_inputs); 185 198 free(REQUEST); 186 199 return 1; … … 1575 1588 } 1576 1589 else{ 1590 #ifdef USE_PYTHON 1577 1591 if(strncasecmp(r_inputs->value,"PYTHON",6)==0){ 1578 1592 eres=zoo_python_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format); 1579 1593 } 1580 1594 else 1595 #endif 1581 1596 1582 1597 #ifdef USE_JAVA … … 1593 1608 else 1594 1609 #endif 1595 1610 1611 1612 #ifdef USE_PERL 1613 if(strncasecmp(r_inputs->value,"PERL",4)==0){ 1614 eres=zoo_perl_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format); 1615 } 1616 else 1617 #endif 1618 1596 1619 #ifdef USE_JS 1597 1620 if(strncasecmp(r_inputs->value,"JS",2)==0){ … … 1787 1810 } 1788 1811 } else{ 1812 1813 #ifdef USE_PYTHON 1789 1814 if(strncasecmp(r_inputs->value,"PYTHON",6)==0){ 1790 1815 eres=zoo_python_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format); 1791 1816 } 1792 1817 else 1818 #endif 1793 1819 1794 1820 #ifdef USE_JAVA … … 1806 1832 #endif 1807 1833 1834 #ifdef USE_PERL 1835 if(strncasecmp(r_inputs->value,"PERL",4)==0){ 1836 eres=zoo_perl_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format); 1837 } 1838 else 1839 #endif 1808 1840 #ifdef USE_JS 1809 1841 if(strncasecmp(r_inputs->value,"JS",2)==0){ … … 1841 1873 cpid,m,eres); 1842 1874 1875 //if(getpid()==cpid){ 1843 1876 freeService(&s1); 1844 1877 free(s1); 1845 1878 freeMaps(&m); 1846 1879 free(m); 1880 freeMaps(&tmpmaps); 1881 free(tmpmaps); 1847 1882 1848 1883 freeMaps(&request_input_real_format); 1849 1884 free(request_input_real_format); 1850 1885 1886 //freeMap(&request_inputs); 1887 //free(request_inputs); 1888 1851 1889 /* The following is requested but get issue using with Python support :/ */ 1852 /*freeMaps(&request_output_real_format); 1853 free(request_output_real_format);*/ 1890 /* freeMaps(&request_output_real_format); 1891 free(request_output_real_format); 1892 */ 1854 1893 1855 1894 free(REQUEST); … … 1860 1899 fflush(stderr); 1861 1900 #endif 1901 //} 1862 1902 1863 1903 return 0;
Note: See TracChangeset
for help on using the changeset viewer.