diff --git a/Cargo.lock b/Cargo.lock index c40cae3..5337dc0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1982,7 +1982,7 @@ dependencies = [ [[package]] name = "ontodev_valve" version = "0.2.2" -source = "git+https://github.com/ontodev/valve.rs?rev=ece707684f7a836837ce7d079c103a27df6a85d7#ece707684f7a836837ce7d079c103a27df6a85d7" +source = "git+https://github.com/ontodev/valve.rs?rev=824fbd79cd5ff787d8863186ccda09d0a0b56eb2#824fbd79cd5ff787d8863186ccda09d0a0b56eb2" dependencies = [ "anyhow", "async-recursion", diff --git a/Cargo.toml b/Cargo.toml index c198da8..fa585d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ rev = "f46fbd5450505644ed9970cef1ae14164699981f" [dependencies.ontodev_valve] # path = "../ontodev_demo/valve.rs" git = "https://github.com/ontodev/valve.rs" -rev = "ece707684f7a836837ce7d079c103a27df6a85d7" +rev = "824fbd79cd5ff787d8863186ccda09d0a0b56eb2" [dependencies.ontodev_sqlrest] git = "https://github.com/ontodev/sqlrest.rs" diff --git a/src/resources/column.tsv b/src/resources/column.tsv index 77b3436..1c2bf0c 100644 --- a/src/resources/column.tsv +++ b/src/resources/column.tsv @@ -13,8 +13,6 @@ column description empty text a description of this column datatype datatype word primary the name of this datatype datatype parent empty word tree(datatype) the parent datatype datatype condition empty line the method for testing the datatype -datatype description empty text a description of this datatype -datatype transform empty word -datatype structure empty trimmed_line datatype sql_type empty sql_type the SQLite type for representing this data datatype html_type empty html_type the HTML type for viewing and editing this data +datatype description empty text a description of this datatype diff --git a/src/resources/datatype.tsv b/src/resources/datatype.tsv index 48ed6ef..01f07d7 100644 --- a/src/resources/datatype.tsv +++ b/src/resources/datatype.tsv @@ -1,10 +1,11 @@ -datatype parent condition structure transform description sql_type html_type -text any text TEXT textarea -empty text equals('') the empty string NULL -line text exclude(/\\\\\\\n/) one line of text text -label line match(/[^\s]+.+[^\s]/) text that does not begin or end with whitespace -word label exclude(/\W/) a single word: letters, numbers, underscore -table_type word in('table', 'column', 'datatype') a VALVE table type search -sql_type word in('NULL', 'TEXT', 'INT') a SQL type search -html_type word in('text', 'textarea', 'search', 'radio', 'number', 'select') an HTML form type search -trimmed_line line match(/\S([^\n]*\S)*/) a line of text that does not begin or end with whitespace +datatype parent condition sql_type html_type description +text TEXT textarea any text +empty text equals('') NULL the empty string +line text exclude(/\\\\\\\n/) text one line of text +trimmed_line line match(/\S([^\n]*\S)*/) a line of text that does not begin or end with whitespace +label trimmed_line match(/\S.+\S/) text that does not begin or end with whitespace +nonspace label match(/\S+/) non-space characters +word nonspace match(/\w+/) a single word: letters, numbers, underscore +table_type word in('table', 'column', 'datatype') search a VALVE table type +sql_type word in('NULL', 'TEXT', 'INT') search a SQL type +html_type word in('text', 'textarea', 'search', 'radio', 'number', 'select') search an HTML form type