From: Andrea Zagli Date: Wed, 27 Jan 2016 17:29:01 +0000 (+0100) Subject: Hello world. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=bd38ddf2e828e94d21b177fce3d2224a11dffc04;p=bcity%2Ffe Hello world. --- diff --git a/.gitignore b/.gitignore index f6fc41f..9e267da 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,5 @@ intltool-* Rules-quot *.exe *.csv -src/bcity_fe \ No newline at end of file +src/bcity_fe +data/bcity_fe/conf \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 05fc204..d92f217 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = doc po src +SUBDIRS = data doc po src ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 0883731..0198b21 100644 --- a/configure.ac +++ b/configure.ac @@ -78,8 +78,12 @@ AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes]) # Output files AC_CONFIG_FILES([ Makefile + data/Makefile + data/bcity_fe/Makefile + data/bcity_fe/ctpl/Makefile doc/Makefile doc/bcity_fe/Makefile + doc/bcity_fe/db/Makefile doc/bcity_fe/examples/Makefile po/Makefile.in src/Makefile diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..550fc97 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = bcity_fe diff --git a/data/bcity_fe/Makefile.am b/data/bcity_fe/Makefile.am new file mode 100644 index 0000000..c909be9 --- /dev/null +++ b/data/bcity_fe/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = ctpl diff --git a/data/bcity_fe/ctpl/Makefile.am b/data/bcity_fe/ctpl/Makefile.am new file mode 100644 index 0000000..36db9a1 --- /dev/null +++ b/data/bcity_fe/ctpl/Makefile.am @@ -0,0 +1,7 @@ +ctpldir = $(datadir)/$(PACKAGE)/ctpl + +ctpl_DATA = \ + template.ctpl \ + index_index.ctpl + +EXTRA_DIST = diff --git a/data/bcity_fe/ctpl/index_index.ctpl b/data/bcity_fe/ctpl/index_index.ctpl new file mode 100644 index 0000000..1b781d1 --- /dev/null +++ b/data/bcity_fe/ctpl/index_index.ctpl @@ -0,0 +1,3 @@ +

B-City

+ +

Hello world!!!

\ No newline at end of file diff --git a/data/bcity_fe/ctpl/template.ctpl b/data/bcity_fe/ctpl/template.ctpl new file mode 100644 index 0000000..dd977e5 --- /dev/null +++ b/data/bcity_fe/ctpl/template.ctpl @@ -0,0 +1,34 @@ + + + + + + + + B-City + + + + + + + + + + + + {head} + + + + + + +

+ {body} +

+ + diff --git a/doc/bcity_fe/Makefile.am b/doc/bcity_fe/Makefile.am index aee2d7b..fa58b33 100644 --- a/doc/bcity_fe/Makefile.am +++ b/doc/bcity_fe/Makefile.am @@ -1 +1 @@ -SUBDIRS = examples +SUBDIRS = db examples diff --git a/doc/bcity_fe/db/Makefile.am b/doc/bcity_fe/db/Makefile.am new file mode 100644 index 0000000..2baf5e0 --- /dev/null +++ b/doc/bcity_fe/db/Makefile.am @@ -0,0 +1,6 @@ +bcity_fe_dbdir = $(docdir)/db + +bcity_fe_db_DATA = \ + bcity_fe.sql + +EXTRA_DIST = $(bcity_fe_db_DATA) diff --git a/doc/bcity_fe/db/bcity_fe.sql b/doc/bcity_fe/db/bcity_fe.sql new file mode 100644 index 0000000..3fa46c1 --- /dev/null +++ b/doc/bcity_fe/db/bcity_fe.sql @@ -0,0 +1,19 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 9.5.0 +-- Dumped by pg_dump version 9.5.0 + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SET check_function_bodies = false; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- PostgreSQL database dump complete +-- + diff --git a/doc/bcity_fe/examples/bcity_fe.conf b/doc/bcity_fe/examples/bcity_fe.conf index d012bf7..5bc008f 100644 --- a/doc/bcity_fe/examples/bcity_fe.conf +++ b/doc/bcity_fe/examples/bcity_fe.conf @@ -1,2 +1,6 @@ +[ZAKAUTHE] +plugin=/usr/local/lib/libzakautke/plugins/libzakauthedb.so +cnc_string=PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=bcity;SEARCHPATH=zakauthedb + [DB] cnc_string=PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=bcity diff --git a/src/.htaccess b/src/.htaccess new file mode 100644 index 0000000..2640e00 --- /dev/null +++ b/src/.htaccess @@ -0,0 +1,7 @@ + + RewriteEngine On + #RewriteCond %{REQUEST_FILENAME} !-d + #RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^bcity_fe$ bcity_fe?_url=/ [QSA,END] + RewriteRule ^bcity_fe/(.*)$ bcity_fe?_url=/$1 [QSA,END] + diff --git a/src/Makefile.am b/src/Makefile.am index 12b191a..851a65c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,11 @@ -imagesdir = $(datadir)/$(PACKAGE)/images +configdir = $(datadir)/$(PACKAGE)/conf ctpldir = $(datadir)/$(PACKAGE)/ctpl +imagesdir = $(datadir)/$(PACKAGE)/images AM_CPPFLAGS = $(BCITYFE_CFLAGS) \ - -DIMAGESDIR=\""$(imagesdir)"\" \ - -DCTPLDIR=\""$(ctpldir)"\" + -DCONFIGDIR=\""$(configdir)"\" \ + -DCTPLDIR=\""$(ctpldir)"\" \ + -DIMAGESDIR=\""$(imagesdir)"\" LIBS = $(BCITYFE_LIBS) \ -export-dynamic @@ -13,4 +15,6 @@ bin_PROGRAMS = bcity_fe bcity_fe_SOURCES = \ commons.c \ commons.h \ + index.c \ + index.h \ main.c diff --git a/src/commons.h b/src/commons.h index 9027f24..0c5bd72 100644 --- a/src/commons.h +++ b/src/commons.h @@ -24,13 +24,17 @@ #include #endif +#include #include #include typedef struct { - gchar *imagesdir; + gchar *configdir; gchar *ctpldir; + gchar *imagesdir; + + GKeyFile *config; GdaEx *gdaex; gulong hid_main_on_before_execute; diff --git a/src/index.c b/src/index.c new file mode 100644 index 0000000..fbc95b3 --- /dev/null +++ b/src/index.c @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2015 Andrea Zagli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include + +#include "index.h" + +void +index_index (GMatchInfo *minfo, gpointer user_data) +{ + CtplEnviron *env; + + gchar *filename; + gchar *content; + + Commons *commons = (Commons *)user_data; + + filename = g_build_filename (commons->ctpldir, "index_index.ctpl", NULL); + content = get_ctpl_filled (filename, NULL); + g_free (filename); + + env = ctpl_environ_new (); + ctpl_environ_push_string (env, "head", ""); + ctpl_environ_push_string (env, "body", content); + + filename = g_build_filename (commons->ctpldir, "template.ctpl", NULL); + g_string_printf (commons->out, "%s", + get_ctpl_filled (filename, env)); + g_free (filename); + + g_free (content); +} diff --git a/src/index.h b/src/index.h new file mode 100644 index 0000000..07c7cb6 --- /dev/null +++ b/src/index.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2016 Andrea Zagli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __INDEX_H__ +#define __INDEX_H__ + + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include "commons.h" + + +void index_index (GMatchInfo *minfo, gpointer user_data); + + +#endif /* __INDEX_H__ */ diff --git a/src/main.c b/src/main.c index 0f0a54f..268cad4 100644 --- a/src/main.c +++ b/src/main.c @@ -22,13 +22,11 @@ #include -#include - #include #include -#include #include "commons.h" +#include "index.h" int main (int argc, char *argv[]) @@ -37,39 +35,39 @@ main (int argc, char *argv[]) gchar *cnc_string; - gchar *sql; - GdaDataModel *dm; - - gint i; - Commons *commons; - GKeyFile *config; ZakCgiUrl *zcgi_url; GString *header; + gchar *filename; + gda_init (); /* inizializzazione commons */ commons = (Commons *)g_new0 (Commons, 1); + commons->configdir = g_strdup (CONFIGDIR); + commons->ctpldir = g_strdup (CTPLDIR); + commons->imagesdir = g_strdup (IMAGESDIR); + /* leggo la configurazione dal file */ error = NULL; - config = g_key_file_new (); - if (!g_key_file_load_from_file (config, "../app/conf/bcity_fe.conf", G_KEY_FILE_NONE, &error)) + commons->config = g_key_file_new (); + filename = g_build_filename (commons->configdir, "bcity_fe.conf", NULL); + if (!g_key_file_load_from_file (commons->config, filename, G_KEY_FILE_NONE, &error)) { - g_error ("Impossibile caricare il file di configurazione specificato: %s\n%s", argv[1], + g_error ("Impossibile caricare il file di configurazione specificato: %s\n%s", filename, error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + g_free (filename); return 0; } - - commons->imagesdir = g_strdup (IMAGESDIR); - commons->ctpldir = g_strdup (CTPLDIR); + g_free (filename); /* leggo la stringa di connessione al db */ error = NULL; - cnc_string = g_key_file_get_value (config, "DB", "cnc_string", &error); + cnc_string = g_key_file_get_value (commons->config, "DB", "cnc_string", &error); if (cnc_string == NULL) { g_warning ("Impossibile leggere la stringa di connessione dal file di configurazione: %s.", @@ -93,16 +91,9 @@ main (int argc, char *argv[]) /* Routing */ zcgi_url = zak_cgi_url_new (commons->zcgi_main); - /* zak_cgi_url_connect (zcgi_url, "/index/index", (ZakCgiUrlConnectedFunction)index_index, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/index/login", (ZakCgiUrlConnectedFunction)index_login, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/index/loginret", (ZakCgiUrlConnectedFunction)index_loginret, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/richiesta/elenco", (ZakCgiUrlConnectedFunction)richiesta_elenco, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/richiesta/new", (ZakCgiUrlConnectedFunction)richiesta_new, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/richiesta/save", (ZakCgiUrlConnectedFunction)richiesta_save, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/richiesta/costo/(?[1-9][0-9]*)/(?[1-9][0-9]*)/(?[1-9][0-9]*)", (ZakCgiUrlConnectedFunction)richiesta_costo, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/richiedente/edit", (ZakCgiUrlConnectedFunction)richiedente_edit, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/foglio_particella/exists/(?[a-zA-Z0-9]+)/(?[a-zA-Z0-9]+)", (ZakCgiUrlConnectedFunction)foglio_particella_exists, commons); */ - /* zak_cgi_url_connect (zcgi_url, "/ricercacitta", (ZakCgiUrlConnectedFunction)ricerca_citta, commons); */ + zak_cgi_url_connect (zcgi_url, "/", (ZakCgiUrlConnectedFunction)index_index, commons); + zak_cgi_url_connect (zcgi_url, "/index[/]?", (ZakCgiUrlConnectedFunction)index_index, commons); + zak_cgi_url_connect (zcgi_url, "/index/index", (ZakCgiUrlConnectedFunction)index_index, commons); zak_cgi_url_dispatch (zcgi_url);