Commit 0033b2e4 authored by jan.koester's avatar jan.koester
Browse files

include sqlite to options

parent eb4b19b3

src/blogi.cpp

+6 −2
Original line number Diff line number Diff line
@@ -51,14 +51,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#include "conf.h"



#include "blogi.h"

#include "pgsql.cpp"



#include "pgsql.cpp"

#include "sqlite.cpp"



blogi::Blogi::Blogi(netplus::socket *serversocket) : event(serversocket){



    PlgArgs = new PluginArgs;

    PlgArgs->config=Config::getInstance();

    if(strcmp(PlgArgs->config->getdbdriver(),"pgsql")==0)

        PlgArgs->database= new Postgresql(PlgArgs->config->getdbopts());

    else if(strcmp(PlgArgs->config->getdbdriver(),"sqlite")==0)

        PlgArgs->database= new SQLite(PlgArgs->config->getdbopts());

    PlgArgs->session= new Session();

    PlgArgs->auth=new Auth(PlgArgs->database,PlgArgs->session);

    PlgArgs->edit=new Editor(PlgArgs->config);

src/conf.cpp

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,12 @@ size_t blogi::Config::getplgdirs(){ 
    return 0;

}



const char * blogi::Config::getdbopts(){

    if(_PlsConfig->getKey("/BLOGI/DATABASE/DRIVER"))

        return _PlsConfig->getValue(_PlsConfig->getKey("/BLOGI/DATABASE/DRIVER"),0);

    return nullptr;

}



const char * blogi::Config::getdbopts(){

    if(_PlsConfig->getKey("/BLOGI/DATABASE/CONNECTION"))

        return _PlsConfig->getValue(_PlsConfig->getKey("/BLOGI/DATABASE/CONNECTION"),0);

src/conf.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ namespace blogi { 
        const char* getplgdir(size_t el);

        size_t      getplgdirs();



        const char* getdbdriver();

        const char* getdbopts();



        const char *getlpdomain();

src/database/sqlite.cpp

+2 −2
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ namespace blogi { 
            for(int i = 0; i < rcount; ++i ){

                for(int ii=0; ii < res.columns; ++ii){

                    if(!res.firstRow){

                       res.firstRow = new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep));

                       res.firstRow = new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep,ii));

                       lastdat=res.firstRow;

                    }else{

                       lastdat->nextData=new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep));

                       lastdat->nextData=new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep,ii));

                       lastdat=lastdat->nextData;

                    }

                }