Changeset 33


Ignore:
Timestamp:
Sep 27, 2010, 10:24:50 PM (9 years ago)
Author:
djay
Message:

Python is optional again...

Location:
trunk/zoo-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-kernel/service_internal.c

    r32 r33  
    15461546        map * errormap = createMap("text","Unable to fetch any result");
    15471547        addToMap(errormap,"code", "InternalError");
    1548         fprintf(stderr,"DISPLAY ERROR MESSAGE !!!\n");
    15491548        printExceptionReportResponse(m,errormap);
    15501549        freeMap(&errormap);
     
    15911590      errormap = createMap("text",tmp);     
    15921591      addToMap(errormap,"code", "InternalError");
    1593       fprintf(stderr,"DISPLAY ERROR MSG !!!!\n");
    15941592      printExceptionReportResponse(m,errormap);
    15951593      freeMap(&errormap);
  • trunk/zoo-kernel/zoo_service_loader.c

    r32 r33  
    4444#include "service.h"
    4545#include "service_internal.h"
     46
     47#ifdef USE_PYTHON
    4648#include "service_internal_python.h"
     49#endif
    4750
    4851#ifdef USE_JAVA
     
    16071610      }
    16081611    }
    1609     else{
     1612    else
     1613#ifdef USE_PYTHON
    16101614      if(strncasecmp(r_inputs->value,"PYTHON",6)==0){
    16111615        eres=zoo_python_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
    16121616      }
    16131617      else
     1618#endif
    16141619       
    16151620#ifdef USE_JAVA
     
    16261631          else
    16271632#endif
    1628 
    1629 
     1633           
     1634           
    16301635#ifdef USE_PERL
    16311636          if(strncasecmp(r_inputs->value,"PERL",4)==0){
     
    16481653                return(-1);
    16491654              }
    1650     }
    1651   }
     1655  }
    16521656  else{
    16531657
     
    18291833          exit(1);
    18301834        }
    1831       } else{
    1832         if(strncasecmp(r_inputs->value,"PYTHON",6)==0){
     1835      }
     1836      else
     1837#ifdef USE_PYTHON
     1838        if(strncasecmp(r_inputs->value,"PYTHON",6)==0)
    18331839          eres=zoo_python_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
    1834         }
    18351840        else
    1836 
     1841#endif
    18371842#ifdef USE_JAVA
    18381843          if(strncasecmp(r_inputs->value,"JAVA",4)==0){
    18391844            eres=zoo_java_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
    1840           }
     1845            }
    18411846          else
    18421847#endif
     
    18501855             
    18511856#ifdef USE_PERL
    1852           if(strncasecmp(r_inputs->value,"PERL",4)==0){
    1853             eres=zoo_perl_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
    1854           }
    1855           else
    1856 #endif
    1857 #ifdef USE_JS
    1858               if(strncasecmp(r_inputs->value,"JS",2)==0){
    1859                 eres=zoo_js_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
     1857              if(strncasecmp(r_inputs->value,"PERL",4)==0){
     1858                eres=zoo_perl_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
    18601859              }
    18611860              else
    18621861#endif
    1863                 {
    1864                   char tmpv[1024];
    1865                   sprintf(tmpv,"Programming Language (%s) set in ZCFG file is not currently supported by ZOO Kernel.\n",r_inputs->value);
    1866                   map* tmps=createMap("text",tmpv);
    1867                   printExceptionReportResponse(m,tmps);
    1868                   return -1;
     1862#ifdef USE_JS
     1863                if(strncasecmp(r_inputs->value,"JS",2)==0){
     1864                  eres=zoo_js_support(&m,request_inputs,s1,&request_input_real_format,&request_output_real_format);
    18691865                }
    1870       }
     1866                else
     1867#endif
     1868                  {
     1869                    char tmpv[1024];
     1870                    sprintf(tmpv,"Programming Language (%s) set in ZCFG file is not currently supported by ZOO Kernel.\n",r_inputs->value);
     1871                    map* tmps=createMap("text",tmpv);
     1872                    printExceptionReportResponse(m,tmps);
     1873                    return -1;
     1874                  }
     1875     
    18711876 
    18721877    } else {
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png