Merge branch 'mb/newdesign' into develop

2 files changed, 6 insertions, 6 deletions

diff --git a/tagit/parsing/filter/from_string.py b/tagit/parsing/filter/from_string.py
index ed24f63..60e5c47 100644
--- a/tagit/parsing/filter/from_string.py
+++ b/tagit/parsing/filter/from_string.py
@@ -69,7 +69,7 @@ class FromString():
         > Require: searchable as specified in backend AND user-searchable as specified in frontend
         """
         # all relevant predicates
-        predicates = {pred for pred in self.schema.predicates() if pred.domain <= self.schema.node(ns.bsfs.Entity)}
+        predicates = {pred for pred in self.schema.predicates() if pred.domain <= self.schema.node(ns.bsn.Entity)}
         # filter through accept/reject lists
         ... # FIXME
         # shortcuts
@@ -78,9 +78,9 @@ class FromString():
         # all predicates
         _PREDICATES = {self._uri2abb[pred.uri] for pred in predicates} | {'id', 'group'} # FIXME: properly document additions
         # numeric predicates
-        _PREDICATES_NUMERIC = {self._uri2abb[pred.uri] for pred in predicates if pred.range <= self.schema.literal(ns.bsfs.Number)}
+        _PREDICATES_NUMERIC = {self._uri2abb[pred.uri] for pred in predicates if pred.range <= self.schema.literal(ns.bsl.Number)}
         # datetime predicates
-        self._DATETIME_PREDICATES = {pred.uri for pred in predicates if pred.range <= self.schema.literal(ns.bsfs.Time)}
+        self._DATETIME_PREDICATES = {pred.uri for pred in predicates if pred.range <= self.schema.literal(ns.bsl.Time)}
         _PREDICATES_DATETIME = {self._uri2abb[pred] for pred in self._DATETIME_PREDICATES}
 
 
diff --git a/tagit/parsing/filter/to_string.py b/tagit/parsing/filter/to_string.py
index 0b1a3e1..6a1b035 100644
--- a/tagit/parsing/filter/to_string.py
+++ b/tagit/parsing/filter/to_string.py
@@ -20,7 +20,7 @@ class ToString():
         self.matches = matcher.Filter()
 
         self.schema = schema
-        predicates = {pred for pred in self.schema.predicates() if pred.domain <= self.schema.node(ns.bsfs.Entity)}
+        predicates = {pred for pred in self.schema.predicates() if pred.domain <= self.schema.node(ns.bsn.Entity)}
         # shortcuts
         self._abb2uri = {pred.uri.fragment: pred.uri for pred in predicates} # FIXME: tie-breaking for duplicates
         self._uri2abb = {uri: fragment for fragment, uri in self._abb2uri.items()}
@@ -206,10 +206,10 @@ class ToString():
             guids = {guid for sub in query for guid in get_guids(sub.value) }
         elif self.matches(query, ast.filter.Not(matcher.Partial(ast.filter.Is))):
             negated = True
-            guids = get_guids(query.value)
+            guids = get_guids(query.expr.value)
         elif self.matches(query, ast.filter.Not(ast.filter.Or(matcher.Rest(matcher.Partial(ast.filter.Is))))):
             negated = True
-            guids = {guid for sub in query for guid in get_guids(sub.value) }
+            guids = {guid for sub in query.expr for guid in get_guids(sub.value) }
 
         if len(guids) == 0:
             # no matches