Changes in trunk/zoo-kernel/zoo_service_loader.c [20:30]

File:

• trunk/zoo-kernel/zoo_service_loader.c (modified) (10 diffs)

trunk/zoo-kernel/zoo_service_loader.c

@@ -44 +44 @@
 #include "service.h"
 #include "service_internal.h"
+
+
+#ifdef USE_PYTHON
 #include "service_internal_python.h"
+#endif
 
 #ifdef USE_JAVA
@@ -57 +61 @@
 #include "service_internal_js.h"
 #endif
+
+#ifdef USE_PERL
+#include "service_internal_perl.h"
+#endif
+
 
 
@@ -173 +182 @@
     freeMaps(&m);
     free(m);
+    freeMap(&request_inputs);
+    free(request_inputs);
     return 1;
   }
@@ -183 +194 @@
       freeMaps(&m);
       free(m);
+      freeMap(&request_inputs);
+      free(request_inputs);
       free(REQUEST);
       return 1;
@@ -1575 +1588 @@
     }
     else{
+#ifdef USE_PYTHON
       if(strncasecmp(r_inputs->value,"PYTHON",6)==0){
         eres=zoo_python_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
       }
       else
+#endif
         
 #ifdef USE_JAVA
@@ -1593 +1608 @@
           else
 #endif
-          
+
+
+#ifdef USE_PERL
+          if(strncasecmp(r_inputs->value,"PERL",4)==0){
+            eres=zoo_perl_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
+          }
+          else
+#endif
+
 #ifdef USE_JS
             if(strncasecmp(r_inputs->value,"JS",2)==0){
@@ -1787 +1810 @@
         }
       } else{
+
+#ifdef USE_PYTHON
         if(strncasecmp(r_inputs->value,"PYTHON",6)==0){
           eres=zoo_python_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
         }
         else
+#endif
 
 #ifdef USE_JAVA
@@ -1806 +1832 @@
 #endif
               
+#ifdef USE_PERL
+          if(strncasecmp(r_inputs->value,"PERL",4)==0){
+            eres=zoo_perl_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
+          }
+          else
+#endif
 #ifdef USE_JS
               if(strncasecmp(r_inputs->value,"JS",2)==0){
@@ -1841 +1873 @@
                    cpid,m,eres);
 
+  //if(getpid()==cpid){
   freeService(&s1);
   free(s1);
   freeMaps(&m);
   free(m);
+  freeMaps(&tmpmaps);
+  free(tmpmaps);
   
   freeMaps(&request_input_real_format);
   free(request_input_real_format);
-
+  
+  //freeMap(&request_inputs);
+  //free(request_inputs);
+    
   /* The following is requested but get issue using with Python support :/ */
-  /*freeMaps(&request_output_real_format);
-  free(request_output_real_format);*/
+  /* freeMaps(&request_output_real_format);
+     free(request_output_real_format);
+  */
   
   free(REQUEST);
@@ -1860 +1899 @@
   fflush(stderr);
 #endif
+    //}
 
   return 0;