TerribleDev/Fortran-docker-mvc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove sql

Browse Source
This commit is contained in:
Tommy Parnell
2017-02-22 10:52:58 -05:00
parent a7037b9e92
commit 9a8c5a8949
4 changed files with 5 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -3,13 +3,14 @@ FROM ubuntu:trusty
# update Ubuntu
RUN apt-get update
RUN apt-get install -y gfortran make sqlite3 libsqlite3-dev nginx libfcgi-dev spawn-fcgi make
RUN apt-get install -y gfortran make sqlite3 libsqlite3-dev nginx libfcgi-dev spawn-fcgi sqlite3
WORKDIR /fortran-machine
RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf
ADD . .
RUN make
ADD nginx.conf /etc/nginx/sites-enabled/default

54
fortran_fcgi.f90
View File

@@ -12,7 +12,6 @@ program test_fcgi
use fcgi_protocol
use jade
use marsupial
implicit none
@@ -99,59 +98,6 @@ contains
templatefile = 'template/test.jade'
call jadefile(templatefile, unitNo)
case ('/search')
! tags which contain multiple templates must be written around them
! in the fortran controller
write(unitNo,AFORMAT) '<div class="container">'
! header
templatefile = 'template/search.jade'
call jadefile(templatefile, unitNo)
pagevars(1,1) = 'name'
pagevars(2,1) = 'latinName'
pagevars(3,1) = 'wikiLink'
pagevars(4,1) = 'description'
query = ''
call cgi_get( dict, 'q', query)
call getOneMarsupial(query, pagevars(1,2), pagevars(2,2), pagevars(3,2), pagevars(4,2))
if (len(trim(pagevars(1,2))) == 0) then
write(unitNo,AFORMAT) '<p>No results in this database :-(</p>'
else
! template with string
templatefile = 'template/result.jade'
call jadetemplate(templatefile, unitNo, pagevars)
endif
! close .container
write(unitNo,AFORMAT) '</div>'
case ('/all')
write(unitNo,AFORMAT) '<div class="container">'
templatefile = 'template/search.jade'
call jadefile(templatefile, unitNo)
pagevars(1,1) = 'name'
pagevars(2,1) = 'latinName'
pagevars(3,1) = 'wikiLink'
pagevars(4,1) = 'description'
call getAllMarsupials(names, latinNames, wikiLinks, descriptions)
i = 1
do
pagevars(1,2) = names(i)
pagevars(2,2) = latinNames(i)
pagevars(3,2) = wikiLinks(i)
pagevars(4,2) = descriptions(i)
if (len(trim(pagevars(1,2))) == 0 .or. i == 5) then
exit
else
! template with string
templatefile = 'template/result.jade'
call jadetemplate(templatefile, unitNo, pagevars)
i = i + 1
endif
enddo
write(unitNo,AFORMAT) '</div>'
case DEFAULT
! your 404 page

21
makefile
View File

@@ -1,29 +1,19 @@
# vim: noexpandtab: tabstop=4:
FLIBS=flibs-0.9/flibs/src
LIBSQLITE3=$(shell find /usr -name libsqlite3.a -print -quit)
FORTRAN=gfortran
FORTRANFLAGS=-ldl -lfcgi -pthread -Wl,-rpath -Wl,/usr/lib
ifndef $(LIBSQLITE3)
FORTRANFLAGS=-ldl -lfcgi -lsqlite3 -pthread -Wl,-rpath -Wl,/usr/lib
endif
OBJECTS = \
marsupial.o \
jade.o \
string_helpers.o \
fsqlite.o \
cgi_protocol.o \
fcgi_protocol.o \
csqlite.o
fcgi_protocol.o
fortran_fcgi: fortran_fcgi.f90 $(OBJECTS)
$(FORTRAN) -o $@ $^ $(LIBSQLITE3) $(FORTRANFLAGS)
marsupial.o: marsupial.f90 string_helpers.o fsqlite.o
$(FORTRAN) -c $<
$(FORTRAN) -o $@ $^ $(FORTRANFLAGS)
jade.o: jade.f90 string_helpers.o
$(FORTRAN) -c $<
@@ -31,19 +21,12 @@ jade.o: jade.f90 string_helpers.o
string_helpers.o: string_helpers.f90
$(FORTRAN) -c $<
fsqlite.o: $(FLIBS)/sqlite/fsqlite.f90
$(FORTRAN) -c $<
cgi_protocol.o: $(FLIBS)/cgi/cgi_protocol.f90
$(FORTRAN) -c $<
fcgi_protocol.o: $(FLIBS)/cgi/fcgi_protocol.f90
$(FORTRAN) -c $<
csqlite.o: $(FLIBS)/sqlite/csqlite.c
cd $(FLIBS)/sqlite && make csqlite.o >/dev/null
cp $(FLIBS)/sqlite/csqlite.o .
clean:
rm -f -v fortran_fcgi *.o *.mod $(FLIBS)/sqlite/*.o

2
start.sh
View File

@@ -1,3 +1,3 @@
#!/bin/bash
spawn-fcgi -a 127.0.0.1 -p 9000 ./fortran_fcgi
spawn-fcgi -a 127.0.0.1 -p 9000 /fortran-machine/fortran_fcgi
nginx