Merge branch 'dev' of github.com:terminusdb/terminus-server into dev

library/api.pl

@@ -47,37 +47,37 @@
 :- use_module(library(http/http_authenticate)).
 
 % Load capabilities library
-:- use_module(library(capabilities)).
+:- use_module(capabilities).
 
 % woql libraries
-:- use_module(library(woql_compile)).
+:- use_module(woql_compile).
 
 % Default utils
-:- use_module(library(utils)).
+:- use_module(utils).
 
 % Database utils
-:- use_module(library(database_utils)).
+:- use_module(database_utils).
 
 % Database construction utils
-:- use_module(library(database)).
+:- use_module(database).
 
 % Frame and document processing
-:- use_module(library(frame)).
+:- use_module(frame).
 
 % JSON manipulation
-:- use_module(library(jsonld)).
+:- use_module(jsonld).
 
 % JSON Queries
-:- use_module(library(json_woql)).
+:- use_module(json_woql).
 
 % File processing
-:- use_module(library(file_utils), [terminus_path/1]).
+:- use_module(file_utils, [terminus_path/1]).
 
 % Validation
-:- use_module(library(validate)).
+:- use_module(validate).
 
 % Dumping turtle
-:- use_module(library(turtle_utils)).
+:- use_module(turtle_utils).
 
 %%%%%%%%%%%%% API Paths %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

library/capabilities.pl

@@ -38,14 +38,14 @@
 
 :- use_module(config(config),[]).
 :- use_module(library(crypto)).
-:- use_module(library(utils)).
-:- use_module(library(file_utils)).
-:- use_module(library(triplestore)).
-:- use_module(library(frame)).
-:- use_module(library(jsonld)).
-:- use_module(library(database)).
-:- use_module(library(database_utils)).
-:- use_module(library(sdk)).
+:- use_module(utils).
+:- use_module(file_utils).
+:- use_module(triplestore).
+:- use_module(frame).
+:- use_module(jsonld).
+:- use_module(database).
+:- use_module(database_utils).
+:- use_module(sdk).
 :- op(1050, xfx, =>).
 
 /**

library/casting.pl

@@ -26,9 +26,9 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(utils)).
-:- use_module(library(prefixes)).
-:- use_module(library(speculative_parse)).
+:- use_module(utils).
+:- use_module(prefixes).
+:- use_module(speculative_parse).
 
 :- use_module(library(apply)).
 :- use_module(library(yall)).

library/database.pl

@@ -174,7 +174,7 @@
                      DB_Resource, terminus:id, literal(type(_,Database_Name)))),
             Database_Names),
 
-    maplist(string_to_atom, Database_Names, Database_Atomised),
+    maplist(atom_string, Database_Atomised, Database_Names),
     exclude(terminus_database_name, Database_Atomised, Database_Atoms).
 
 database_record_list(Databases) :-

library/database_utils.pl

@@ -31,11 +31,11 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(file_utils)).
-:- use_module(library(triplestore)).
-:- use_module(library(utils)).
-:- use_module(library(database)).
-:- use_module(library(expansions)).
+:- use_module(file_utils).
+:- use_module(triplestore).
+:- use_module(utils).
+:- use_module(database).
+:- use_module(expansions).
 
 /*
  * database_exists(DB_URI) is semidet.

library/expansions.pl

@@ -23,7 +23,7 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(global_prefixes)).
+:- use_module(global_prefixes).
 
 % xrdf/5
 user:goal_expansion(xrdf(DB,G,A,Y,Z),xrdf(DB,G,X,Y,Z)) :-

library/file_utils.pl

@@ -146,7 +146,7 @@
  */
 excluded_file(File) :-
     % emacs files
-    atom_concat('.#', _, File).
+    sub_atom(File, 0, _, _, '.#').
 excluded_file(File) :-
     % current directory and parent directory
     member(File, ['.','..']).

library/frame.pl

@@ -54,19 +54,19 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(utils)).
-:- use_module(library(base_type)).
-:- use_module(library(triplestore)).
-:- use_module(library(validate_schema), except([document/2])).
-:- use_module(library(validate_instance)).
-:- use_module(library(inference)).
-:- use_module(library(database)).
-:- use_module(library(schema), []).
-:- use_module(library(types)).
-:- use_module(library(frame_types)).
-:- use_module(library(jsonld)).
-:- use_module(library(prefixes)).
-:- use_module(library(expansions)).
+:- use_module(utils).
+:- use_module(base_type).
+:- use_module(triplestore).
+:- use_module(validate_schema, except([document/2])).
+:- use_module(validate_instance).
+:- use_module(inference).
+:- use_module(database).
+:- use_module(schema, []).
+:- use_module(types).
+:- use_module(frame_types).
+:- use_module(jsonld).
+:- use_module(prefixes).
+:- use_module(expansions).
 
 :- use_module(library(apply)).
 :- use_module(library(yall)).

library/inference.pl

@@ -25,10 +25,10 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(database)).
-:- use_module(library(validate_schema)).
-:- use_module(library(triplestore)).
-:- use_module(library(expansions)).
+:- use_module(database).
+:- use_module(validate_schema).
+:- use_module(triplestore).
+:- use_module(expansions).
 
 /**
  * runChain(?X,?P:list(uri),?Y,+Instance:atom,+Database:database is nondet.

library/json_woql.pl

@@ -27,8 +27,8 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(utils)).
-:- use_module(library(jsonld)).
+:- use_module(utils).
+:- use_module(jsonld).
 
 :- use_module(library(apply)).
 :- use_module(library(yall)).
@@ -212,7 +212,7 @@
         WOQL = not(WQ)
     ;   _{'http://terminusdb.com/woql#as' : [ S, V ] } :< JSON
     ->  (   _{'@value' : WS} :< S
-        ->  string_to_atom(WS,WA),
+        ->  atom_string(WA,WS),
             json_to_woql_ast(V,WV),
             WOQL = as(WA,WV)
         ;   throw(http_reply(not_found(_{'@type' : 'vio:WOQLSyntaxError',
@@ -228,11 +228,11 @@
     ->  WOQL = '@'(V,L)
     ;   _{'http://terminusdb.com/woql#value' : V, '@type' : T } :< JSON
     ->  json_to_woql_ast(V,VE),
-        string_to_atom(T,TE),
+        atom_string(TE,T),
         WOQL = '^^'(VE,TE)
     ;   _{'http://terminusdb.com/woql#value' : V, '@lang' : L } :< JSON
     ->  json_to_woql_ast(V,VE),
-        string_to_atom(L,LE),
+        atom_string(LE,L),
         WOQL = '@'(VE,LE)
     ;   _{'@id' : ID } :< JSON
     ->  json_to_woql_ast(ID,WOQL)
@@ -258,7 +258,7 @@
                                  'terminus:status' : 'terminus:failure'}))).
 
 is_json_var(A) :-
-    atom_concat('http://terminusdb.com/woql/variable/',_,A).
+    sub_atom(A, 0, _, _, 'http://terminusdb.com/woql/variable/').
 
 json_to_woql_arith(JSON,WOQL) :-
     is_dict(JSON),

library/jsonld.pl

@@ -36,11 +36,11 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 :- use_module(library(pairs)).
-:- use_module(library(utils)).
+:- use_module(utils).
 :- use_module(library(http/json)).
 % Currently a bug in groundedness checking.
 %:- use_module(library(mavis)).
-:- use_module(library(database)).
+:- use_module(database).
 
 % efficiency
 :- use_module(library(apply)).
@@ -234,7 +234,7 @@
     ->  (   is_dict(R)
         ->  Key = Key_Candidate,
             Value = R
-        ;   string_to_atom(R,Key),
+        ;   atom_string(Key,R),
             Value = _{})
     ;   Key = Key_Candidate,
         Value = _{}).

library/literals.pl

@@ -147,4 +147,4 @@
     ->  (   atom(O)
         ->  atom_string(O,S)
         ;   O = S)
-    ;   string_to_atom(S,O)).
+    ;   atom_string(O,S)).

library/prefixes.pl

@@ -38,8 +38,8 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 % Import global definitions
-:- use_module(library(global_prefixes)).
-:- reexport(library(global_prefixes)).
+:- use_module(global_prefixes).
+:- reexport(global_prefixes).
 
 % Use prolog persistency for prefix management.
 % We could use the DB itself but this gets a bit too metacircular!
@@ -48,15 +48,15 @@
 % Set up the database style
 :- persistent prefix(collection:atom,prefix:atom,uri:atom).
 
-:- use_module(library(file_utils)).
-:- use_module(library(utils)).
+:- use_module(file_utils).
+:- use_module(utils).
 
 % JSON manipulation
 :- use_module(library(http/json)).
 
-:- use_module(library(jsonld)).
+:- use_module(jsonld).
 
-:- use_module(library(database), [
+:- use_module(database, [
                   database_name_list/1,
                   terminus_database_name/1
               ]).

library/relationships.pl

@@ -28,10 +28,10 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(utils)).
-:- use_module(library(validate_schema)).
-:- use_module(library(database)).
-:- use_module(library(triplestore)).
+:- use_module(utils).
+:- use_module(validate_schema).
+:- use_module(database).
+:- use_module(triplestore).
 :- use_module(library(semweb/rdf_db)).
 
 relationship_source_property(Relationship,Property,Database) :-

library/schema.pl

@@ -28,12 +28,12 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(prefixes), [global_prefix_expand/2]).
-:- use_module(library(database)).
-:- use_module(library(triplestore)).
-:- use_module(library(schema_definitions)).
-:- use_module(library(schema_util)).
-:- use_module(library(utils)).
+:- use_module(prefixes, [global_prefix_expand/2]).
+:- use_module(database).
+:- use_module(triplestore).
+:- use_module(schema_definitions).
+:- use_module(schema_util).
+:- use_module(utils).
 
 :- reexport(schema_util).
 

library/schema_util.pl

@@ -31,10 +31,10 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
-:- use_module(library(utils), [intersperse/3]).
-:- use_module(library(database)).
-:- use_module(library(types)).
-:- use_module(library(schema_definitions)).
+:- use_module(utils, [intersperse/3]).
+:- use_module(database).
+:- use_module(types).
+:- use_module(schema_definitions).
 
 /*
  * database_module(+Database:database, -Module:atom) is det.

library/sdk.pl

@@ -27,10 +27,10 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(utils)).
-:- use_module(library(database)).
-:- use_module(library(woql_compile)).
-:- use_module(library(woql_term)).
+:- use_module(utils).
+:- use_module(database).
+:- use_module(woql_compile).
+:- use_module(woql_term).
 
 :- reexport(woql_term).
 

library/skolemise.pl

@@ -30,7 +30,7 @@
 :- use_module(library(apply)).
 :- use_module(library(yall)).
 :- use_module(library(apply_macros)).
-:- use_module(library(triplestore)).
+:- use_module(triplestore).
 
 /*
  * blank_node(+URI) is det.

library/triplestore.pl

@@ -17,14 +17,14 @@
             except([create_named_graph/3,
                     open_named_graph/3])).
 
-:- use_module(library(file_utils)).
-:- use_module(library(utils)).
-:- use_module(library(schema), [cleanup_schema_module/1]).
-:- use_module(library(prefixes)).
-:- use_module(library(types)).
+:- use_module(file_utils).
+:- use_module(utils).
+:- use_module(schema, [cleanup_schema_module/1]).
+:- use_module(prefixes).
+:- use_module(types).
 % feeling very circular :(
-:- use_module(library(database)).
-:- use_module(library(literals)).
+:- use_module(database).
+:- use_module(literals).
 
 :- use_module(library(apply)).
 :- use_module(library(yall)).

library/turtle_utils.pl

@@ -25,8 +25,8 @@
  *                                                                       *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-:- use_module(library(prefixes)).
-:- use_module(library(triplestore)).
+:- use_module(prefixes).
+:- use_module(triplestore).
 :- use_module(library(semweb/turtle)).
 
 /**