- Android fixes

- null pointers
This commit is contained in:
Vitor Santos Costa
2018-06-22 23:55:50 +01:00
parent 58136ead22
commit 81b165d3dc
21 changed files with 171 additions and 166 deletions

View File

@@ -72,7 +72,7 @@ foreach (driver ${MYDDAS_DBMS})
cpp_driver(MYDDAS_YAP ${driver} myddas_driver.ypp)
endforeach ()
#list (APPEND MYDDAS_YAP ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite3/test.yap ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite3/chinook.db)
list (APPEND MYDDAS_YAP ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite3/test.yap ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite3/chinook.db)
add_to_group(MYDDAS_YAP pl_library )
add_custom_target(plmyddas ALL DEPENDS ${MYDDAS_YAP} )

View File

@@ -1,5 +1,6 @@
:- compile(library(myddas)).
:- compile(library(maplist)).
:- use_module(library(myddas)).
main :-
init,
@@ -11,19 +12,27 @@ main_ :-
main_ .
init :-
db_open(sqlite3, '/data/user/0/pt.up.yap.yapdroid/files/Yap/chinook.db', _, _),
db_open(sqlite3, '/assets/Yap/chinook.db', _, _),
writeln('chinook has landed'),
start_low_level_trace,
db_open(sqlite3, '/data/user/0/pt.up.yap.yapdroid/files/Yap/chinook.db', _, _),
writeln('chinook has landed').
go :-
stop_low_level_trace,
db_import('Artist', artist),
writeln(('Artist -> artist')),
db_import('Album', album),
db_import('Track', track).
writeln(('Album -> album')),
db_import('Track', track),
writeln(('Track -> track')).
go :-
db_get_attributes_types(album,Als),
format('~w -> ~w~n',[album,Als]),
db_get_attributes_types(track,Ts),
db_get_attributes_types(artist,As),
writeln(As:Als:Ts).
format('~w -> ~w~n',[track,Ts]),
db_get_attributes_types(artist,As),
format('~w -> ~w~n',[artist,As]).
go :-
db_number_of_fields(album,Als),
db_number_of_fields(track,Ts),
@@ -31,11 +40,13 @@ go :-
writeln(As:Als:Ts).
go :-
db_describe(album, Desc), writeln(Desc) ;
db_describe(track, Desc), writeln(Desc) ;
db_describe(artist, Desc), writeln(Desc).
db_describe(album, Desc), writeln(album:Desc).
go :-
db_show_tables(Desc), writeln(Desc).
db_describe(track, Desc), writeln(track:Desc).
go :-
db_describe(artist, Desc), writeln(artist:Desc).
go :-
db_show_tables(Desc), writeln(tables:Desc).
go :-
db_show_tables(table(T)),
db_describe(T,tableinfo(FieldID,Type,Null,Primary,Default,'')),

View File

@@ -61,6 +61,7 @@ and_put(int sno, int ch) {
buff0 += ch;
if (ch=='\n' || buff0.length() == 128) { //buff0+= '\0';
streamerInstance->display(buff0);
buff0.clear();
}
return ch;
}

View File

@@ -14,6 +14,14 @@
%include std_string.i
%include std_vector.i
#if __ANDROID__
%include "arrays_java.i";
// %inline %{
static YAPTerm Temp[1];
// %}
// %typemap(javapackage) std::vector<YAPTerm> "pt.up.yap.YAPTerm"
//%template(VectorOfTerm) std::vector<YAPTerm>;
#endif
%feature("novaluewrapper") std::vector<Term>;
@@ -34,10 +42,6 @@ class YAPEngine;
#if __ANDROID__
#endif
#ifdef SWIGPYTHON
#include <py4yap.h>
@@ -60,10 +64,6 @@ class YAPEngine;
return NULL;
}
#endif
#ifdef SWIGJAVA0
%typemap(javapackage) std::vector<YAPTerm> "pt.up.yap.YAPTerm"
%template(VectorOfTerm) std::vector<YAPTerm>;
#endif
}
%}