Changeset 33 for trunk

Timestamp:

Sep 27, 2010, 10:24:50 PM (14 years ago)

Author:

djay

Message:

Python is optional again...

Location:

trunk/zoo-kernel

Files:

• service_internal.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (6 diffs)

trunk/zoo-kernel/service_internal.c

@@ -1546 +1546 @@
         map * errormap = createMap("text","Unable to fetch any result");
         addToMap(errormap,"code", "InternalError");
-        fprintf(stderr,"DISPLAY ERROR MESSAGE !!!\n");
         printExceptionReportResponse(m,errormap);
         freeMap(&errormap);
@@ -1591 +1590 @@
       errormap = createMap("text",tmp);      
       addToMap(errormap,"code", "InternalError");
-      fprintf(stderr,"DISPLAY ERROR MSG !!!!\n");
       printExceptionReportResponse(m,errormap);
       freeMap(&errormap);

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
@@ -1607 +1610 @@
       }
     }
-    else{
+    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
@@ -1626 +1631 @@
           else
 #endif
-
-
+            
+            
 #ifdef USE_PERL
           if(strncasecmp(r_inputs->value,"PERL",4)==0){
@@ -1648 +1653 @@
                 return(-1);
               }
-    }
-  }
+  } 
   else{
 
@@ -1829 +1833 @@
           exit(1);
         }
-      } else{
-        if(strncasecmp(r_inputs->value,"PYTHON",6)==0){
+      }
+      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
           if(strncasecmp(r_inputs->value,"JAVA",4)==0){
             eres=zoo_java_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
-          }
+            }
           else
 #endif
@@ -1850 +1855 @@
               
 #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){
-                eres=zoo_js_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
+              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
-                {
-                  char tmpv[1024];
-                  sprintf(tmpv,"Programming Language (%s) set in ZCFG file is not currently supported by ZOO Kernel.\n",r_inputs->value);
-                  map* tmps=createMap("text",tmpv);
-                  printExceptionReportResponse(m,tmps);
-                  return -1;
+#ifdef USE_JS
+                if(strncasecmp(r_inputs->value,"JS",2)==0){
+                  eres=zoo_js_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
                 }
-      }
+                else
+#endif
+                  {
+                    char tmpv[1024];
+                    sprintf(tmpv,"Programming Language (%s) set in ZCFG file is not currently supported by ZOO Kernel.\n",r_inputs->value);
+                    map* tmps=createMap("text",tmpv);
+                    printExceptionReportResponse(m,tmps);
+                    return -1;
+                  }
+      
   
     } else {