perfsonar development work

Author: mac
Date: 2006-10-31 05:33:00 -0500 (Tue, 31 Oct 2006)
New Revision: 1726

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSAction.java
   
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
Log:
LS update bug fixes:
1. 'date exist' condition fixed
2. keys and accessPoints are trimmed now, but it should be done in NMWG 
parsing level


Modified: 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSAction.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSAction.java 
      2006-10-30 16:41:07 UTC (rev 1725)
+++ 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSAction.java 
      2006-10-31 10:33:00 UTC (rev 1726)
@@ -185,7 +185,8 @@
                         "parameters from Key");            
         }
         
-        return keyValue;
+        //TODO: trim is temporary -- should be checked in NMWG classes!
+        return keyValue.trim();
         
     }
     

Modified: 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
       2006-10-30 16:41:07 UTC (rev 1725)
+++ 
trunk/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
       2006-10-31 10:33:00 UTC (rev 1726)
@@ -85,13 +85,16 @@
             accessPoint = ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
                     requestMetadata.getSubject()).getService().
                             getAccessPoint().getAccessPoint();
+            
+            accessPoint = accessPoint.trim();
+            
         } catch (RuntimeException e) {
             logger.debug("LSRegisterAction: no accessPoint");
         }
                 
         //Try to get Key from Metadata
         
-        String keyValue = getKeyFromMetadata(requestMetadata, LS_KEY);
+        String keyValue = getKeyFromMetadata(requestMetadata, 
LS_KEY).trim(); //TODO: trim is temporary
         logger.debug("LSRegisterAction: LS key=["+keyValue+"]");
         
         
@@ -99,7 +102,6 @@
         //========check metadata========
         
         
-        
         //check keyValue
         
         if (keyValue == null) { //REGISTER
@@ -116,7 +118,7 @@
             allowReplaceIfAlreadyRegistered = true; 
             
             //but check the key if it's already been in the DB
-            if (checkIfKeyIsRegistered(keyValue, xmlStorageManager)) {
+            if (!checkIfKeyIsRegistered(keyValue, xmlStorageManager)) {
                 
                 String m = "LSRegisterAction: key from request [" + keyValue 
+
                 "] not found in the storage. " +
@@ -126,6 +128,9 @@
                 
             }
             
+            //remove key element from metadata
+            requestMetadata.setKey(null);
+            
         }
                 
         // check keyValue again, it may be accessPoint now