Merge pull request #39 from IT-CEREBRUM/CRB-3739_extra

Finish CRB-3739 find_sko()
unioslo · Feb 13, 2023 · 2dc4d78 · 2dc4d78
2 parents 384ae9d + dfa0822
commit 2dc4d78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Cerebrum/modules/bofhd/utils.py b/Cerebrum/modules/bofhd/utils.py
@@ -257,19 +257,12 @@ def get_target_disk(path):
         def get_target_ou_by_stedkode(stedkode):
             ou = Factory.get("OU")(self.db)
 
-            if len(stedkode) != 6 or not stedkode.isdigit():
-                raise CerebrumError("Expected a six-digit stedkode.")
-
             try:
-                ou.find_stedkode(
-                    stedkode[0:2],
-                    stedkode[2:4],
-                    stedkode[4:6],
-                    cereconf.DEFAULT_INSTITUSJONSNR
-                )
+                ou.find_sko(stedkode)
+            except ValueError:
+                raise CerebrumError("Expected a six-digit stedkode")
             except Errors.NotFoundError:
-                raise CerebrumError("Stedkode %s was not found." % stedkode)
-
+                raise CerebrumError("Could not find Organizational Unit with stedkode=%s" % stedkode)
             return ou
 
         #

diff --git a/Cerebrum/modules/no/orgera/ou_utils.py b/Cerebrum/modules/no/orgera/ou_utils.py
@@ -179,8 +179,6 @@ def get_ou_by_sko(db, sko):
     """
     Fetch an OU object by stedkode
     """
-    if len(sko) != 6 or not sko.isdigit():
-        raise ValueError('Invalid stedkode: %s' % repr(sko))
 
     ou = Factory.get('OU')(db)
     ou.find_sko(sko)