From b403786167e3425c90c1d2e0ed15077a3e1155da Mon Sep 17 00:00:00 2001
From: "SEDModS (Marco)" <marco.molinaro@inaf.it>
Date: Fri, 15 Apr 2022 07:42:27 -0400
Subject: [PATCH] first vlkb.ia2 setup and port on ViaLactea group
---
.gitignore | 1 +
wsgi-scripts/hdf_query.py | 2 +-
wsgi-scripts/myapp.wsgi | 14 --------------
wsgi-scripts/query-server_d.py | 4 ++--
wsgi-scripts/wsgid.py | 2 +-
wsgi.conf | 7 ++-----
6 files changed, 7 insertions(+), 23 deletions(-)
create mode 100644 .gitignore
delete mode 100644 wsgi-scripts/myapp.wsgi
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dfc8249
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.h5
diff --git a/wsgi-scripts/hdf_query.py b/wsgi-scripts/hdf_query.py
index b2c2153..10db9f4 100644
--- a/wsgi-scripts/hdf_query.py
+++ b/wsgi-scripts/hdf_query.py
@@ -8,7 +8,7 @@ def query_out(parameters):
query1=parsequery.replace('%27', '')
query_final=unquote(query1)
- table=pd.read_hdf('/sed-data/vlkb_1.h5')
+ table=pd.read_hdf('/sed-data/sedmodels.h5')
myquery=table.query(query_final)
return myquery
diff --git a/wsgi-scripts/myapp.wsgi b/wsgi-scripts/myapp.wsgi
deleted file mode 100644
index 7188ded..0000000
--- a/wsgi-scripts/myapp.wsgi
+++ /dev/null
@@ -1,14 +0,0 @@
-# test mod_wsgi app
-
-def application(environ, start_response):
- status = '200 OK'
- output = b'Ciao Mondo!'
-
- getstring = environ['QUERY_STRING']
- output += getstring.encode('utf-8')
-
- response_headers = [('Content-type', 'text/plain'),
- ('Content-Length', str(len(output)))]
- start_response(status, response_headers)
-
- return [output]
diff --git a/wsgi-scripts/query-server_d.py b/wsgi-scripts/query-server_d.py
index 7b6f98c..f48e4b4 100644
--- a/wsgi-scripts/query-server_d.py
+++ b/wsgi-scripts/query-server_d.py
@@ -16,10 +16,10 @@ import pandas as pd
class QueryMaker(object):
- dataset=pd.read_hdf('vlkb_1.h5')
+ dataset=pd.read_hdf('/sed-data/sedmodels.h5')
def query_out(self, parameters):
- dataset=pd.read_hdf('vlkb_1.h5')
+ dataset=pd.read_hdf('/sed-data/sedmodels.h5')
parsequery=parameters.replace(' ', '')
query1=parsequery.replace('%27', '')
diff --git a/wsgi-scripts/wsgid.py b/wsgi-scripts/wsgid.py
index 88f507a..8c30b05 100644
--- a/wsgi-scripts/wsgid.py
+++ b/wsgi-scripts/wsgid.py
@@ -3,7 +3,7 @@ import sys
import pandas
sys.path.insert(0,"/var/www/html/")
-from parquet_query import query_out
+#from parquet_query import query_out
import Pyro4
def application(environ, start_response):
diff --git a/wsgi.conf b/wsgi.conf
index 9617c3d..1e5d1f6 100644
--- a/wsgi.conf
+++ b/wsgi.conf
@@ -4,14 +4,11 @@
# Configuration for various python/WSGI tests
- # Basic Hello World app alias - at least this one must work
- WSGIScriptAlias /myapp /var/www/wsgi-scripts/myapp.wsgi
-
# Plain SED models HDF5 query
- WSGIScriptAlias /sedsearch /var/www/wsgi-scripts/wsgi.py
+ WSGIScriptAlias /search /var/www/wsgi-scripts/wsgi.py
# Daemon based SED models HDF5 query
- # WSGIScriptAlias /seddeamon /var/www/wsgi-scripts/wsgid.py
+ WSGIScriptAlias /searchd /var/www/wsgi-scripts/wsgid.py
# Directory to deploy the python part into
<Directory /var/www/wsgi-scripts>
--
GitLab