Changeset 968 for trunk/zoo-project


Ignore:
Timestamp:
Dec 18, 2020, 7:11:27 PM (19 months ago)
Author:
djay
Message:

Add websocketd container to docker-compose and make the OGC API - Processes and it basic UI available.

Location:
trunk/zoo-project
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/configure.ac

    r967 r968  
    542542
    543543AC_ARG_WITH([r],
    544         [AS_HELP_STRING([--with-r=PATH], [To enable python support or Specifies an alternative directory for R installation,  disabled by default])],
     544        [AS_HELP_STRING([--with-r=PATH], [To enable R support or Specifies an alternative directory for R installation,  disabled by default])],
    545545        [R_PATH="$withval"; R_ENABLED="-DUSE_R"], [R_ENABLED=""])
    546546
     
    605605        fi
    606606
     607        echo $PYTHONCONFIG
    607608        # Extract the linker and include flags
    608609        PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
  • trunk/zoo-project/zoo-services/utils/open-api/cgi-env/service.py

    r962 r968  
    2828def display(conf,inputs,outputs):
    2929    config = configparser.ConfigParser()
    30     config.read(conf["lenv"]["cwd"]+'/oas.cfg')
     30    config.read(conf["lenv"]["cwd"]+'/oas.cfg',"utf-8")
    3131    nameSpace = {'conf': conf,'inputs': inputs, 'outputs': outputs,"openapi": config}
    3232    t = Template(file=conf["main"]["templatesPath"]+"/index.html",searchList=nameSpace)
  • trunk/zoo-project/zoo-services/utils/open-api/server/publish.py

    r962 r968  
    1414
    1515from urllib import parse
     16
    1617try:
    17         params=parse.parse_qs(os.environ["QUERY_STRING"])
    18         r = redis.Redis(host='localhost', port=6379, db=0)
    19         print(params)
    20         r.publish(params["jobid"][0],data)
     18    params=parse.parse_qs(os.environ["QUERY_STRING"])
     19    r=None
     20    if "ZOO_REDIS_HOST" in os.environ:
     21        r = redis.Redis(host=os.environ["ZOO_REDIS_HOST"], port=6379, db=0)
     22    else:
     23        r = redis.Redis(host='redis', port=6379, db=0)
     24    print(params)
     25    r.publish(params["jobid"][0],data)
    2126except Exception as e:
    2227        print(e)
  • trunk/zoo-project/zoo-services/utils/open-api/server/subscriber.py

    r962 r968  
    1111import redis
    1212import json
     13import os
    1314
    1415mThreads=[]
    15 r = redis.Redis(host='localhost', port=6379, db=0)
     16r=None
     17
     18if "ZOO_REDIS_HOST" in os.environ:
     19    r = redis.Redis(host=os.environ["ZOO_REDIS_HOST"], port=6379, db=0)
     20else:
     21    r = redis.Redis(host='redis', port=6379, db=0)
    1622
    1723def send(t):
     
    5965
    6066t0.join()
    61 for i in range(len(mThreads)):
    62     mThreads[i].join()
     67#for i in range(len(mThreads)):
     68#    mThreads[i].join()
  • trunk/zoo-project/zoo-services/utils/open-api/static/openapi.js

    r967 r968  
    108108    for(var i=0;i < System["JSON_STR"]["outputs"].length;i++){
    109109        var cOutput={};
     110        console.log($('input[name="oapi_ioAsArray"]').val()=="true");
    110111        if($('input[name="oapi_ioAsArray"]').val()=="true")
    111             cOutputs={"id": System["JSON_STR"]["outputs"][i]["id"]};
     112            cOutput={"id": System["JSON_STR"]["outputs"][i]["id"]};
    112113        var cName=System["JSON_STR"]["outputs"][i]["id"].replace(/\./g,"_");
    113114        if(System["JSON_STR"]["outputs"][i]["output"]["formats"]){
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