namespace refactoring and cleanup

2 files changed, 5 insertions, 5 deletions

diff --git a/bsie/lib/naming_policy.py b/bsie/lib/naming_policy.py
index c99f8c8..9b9a45d 100644
--- a/bsie/lib/naming_policy.py
+++ b/bsie/lib/naming_policy.py
@@ -80,9 +80,9 @@ class DefaultNamingPolicy(NamingPolicy):
     def handle_node(self, node: Node) -> Node:
         if node.uri is not None:
             return node
-        if node.node_type == ns.bsfs.File:
+        if node.node_type == ns.bsn.Entity :
             return self.name_file(node)
-        if node.node_type == ns.bsfs.Preview:
+        if node.node_type == ns.bsn.Preview:
             return self.name_preview(node)
         raise errors.ProgrammingError('no naming policy available for {node.node_type}')
 
@@ -92,7 +92,7 @@ class DefaultNamingPolicy(NamingPolicy):
             fragment = node.hints['ucid']
         else: # random name
             fragment = self._uuid()
-        node.uri = (self._prefix + 'file')[fragment]
+        node.uri = getattr(self._prefix.file(), fragment)
         return node
 
     def name_preview(self, node: Node) -> Node:
@@ -109,7 +109,7 @@ class DefaultNamingPolicy(NamingPolicy):
             fragment = self._uuid()
         if 'size' in node.hints: # append size
             fragment += '_s' + str(node.hints['size'])
-        node.uri = (self._prefix + 'preview')[fragment]
+        node.uri = getattr(self._prefix.preview(), fragment)
         return node
 
 ## EOF ##
diff --git a/bsie/lib/pipeline.py b/bsie/lib/pipeline.py
index 128eecc..30fd6fd 100644
--- a/bsie/lib/pipeline.py
+++ b/bsie/lib/pipeline.py
@@ -104,7 +104,7 @@ class Pipeline():
             rdr2ext[rdr].add(ext)
 
         # create subject for file
-        subject = node.Node(ns.bsfs.File,
+        subject = node.Node(ns.bsn.Entity,
             ucid=bsfs.uuid.UCID.from_path(path),
             )