Changeset e5a8b44

Timestamp:

Aug 1, 2008 2:58:53 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

4a6f04b

Parents:

7aec37d

Message:

split out internal interfaces

File:

• fedd/fedd_proj.py (modified) (3 diffs)

fedd/fedd_proj.py

@@ -303 +303 @@
         project = None
         user = None
+        rp = fedd_proj.access_project()
+        ru = None
+
 
         principal_type = self.fedid_category.get(fid, self.fedid_default)
@@ -347 +350 @@
         if found[0].name == "<same>":
             if project != None:
-                found[0].name = project
+                rp.name = project
             else : 
                 raise service_error(\
@@ -353 +356 @@
                         "Project matched <same> when no project given")
         elif found[0].name == "<dynamic>":
-            found[0].name = None
+            rp.name = None
             dyn_proj = True
+        else:
+            rp.name = found[0].name
+        rp.node_types = found[0].node_types;
 
         if found[1] == "<same>":
             if user_match == "<any>":
-                if user != None: found = (found[0], user[0])
+                if user != None: ru = user[0]
                 else: raise service_error(\
                         service_error.server_config,
                         "Matched <same> on anonymous request")
             else:
-                found = (found[0], user_match)
+                ru = user_match
         elif found[1] == "<dynamic>":
-            found = (found[0], None)
+            ru = None
             dyn_user = True
         
-        return found, (dyn_user, dyn_proj)
+        return (rp, ru), (dyn_user, dyn_proj)
 
     def build_response(self, alloc_id, ap):