From fb68d918cb88649a7fa84f2b8f8e3cd151838021 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 4 May 2014 16:37:25 -0400
Subject: [PATCH] deal with 'pi' vs 'reg-pis'

---
 sfa/client/sfaadmin.py           | 2 +-
 sfa/client/sfi.py                | 2 +-
 sfa/managers/registry_manager.py | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
index cf88a3a3..1ba5f222 100755
--- a/sfa/client/sfaadmin.py
+++ b/sfa/client/sfaadmin.py
@@ -110,7 +110,7 @@ class RegistryCommands(Commands):
         if email:
             record_dict['email'] = email
         if pis:
-            record_dict['pi'] = pis
+            record_dict['reg-pis'] = pis
         if extras:
             record_dict.update(extras)
         return record_dict
diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 3a61bffa..e21a6189 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -209,7 +209,7 @@ def load_record_from_opts(options):
     if hasattr(options, 'email') and options.email:
         record_dict['email'] = options.email
     if hasattr(options, 'pis') and options.pis:
-        record_dict['pi'] = options.pis
+        record_dict['reg-pis'] = options.pis
 
     # handle extra settings
     record_dict.update(options.extras)
diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py
index 79438096..7306380d 100644
--- a/sfa/managers/registry_manager.py
+++ b/sfa/managers/registry_manager.py
@@ -57,6 +57,7 @@ def _normalize_input (record, reg_key, driver_key):
 
 def normalize_input_record (record):
     _normalize_input (record, 'reg-researchers','researcher')
+    _normalize_input (record, 'reg-pis','pi')
     return record
 
 class RegistryManager:
@@ -378,7 +379,7 @@ class RegistryManager:
             record.gid=gid.save_to_string(save_parents=True)
 
             # locate objects for relationships
-            pi_hrns = getattr(record,'pi',None)
+            pi_hrns = getattr(record,'reg-pis',None)
             if pi_hrns is not None: record.update_pis (pi_hrns, dbsession)
 
         elif isinstance (record, RegSlice):
@@ -451,7 +452,7 @@ class RegistryManager:
             if researcher_hrns is not None: record.update_researchers (researcher_hrns, dbsession)
 
         elif isinstance (record, RegAuthority):
-            pi_hrns = getattr(new_record,'pi',None)
+            pi_hrns = getattr(new_record,'reg-pis',None)
             if pi_hrns is not None: record.update_pis (pi_hrns, dbsession)
         
         # update the PLC information that was specified with the record
-- 
2.43.0