perfsonar development work

Author: trzaszcz
Date: 2009-10-22 06:03:14 -0400 (Thu, 22 Oct 2009)
New Revision: 5321

Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAO.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryExistDAOImpl.java
Log:
refactoring

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAO.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAO.java
 2009-10-22 09:51:49 UTC (rev 5320)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAO.java
 2009-10-22 10:03:14 UTC (rev 5321)
@@ -137,7 +137,4 @@
      */
     public boolean isDBConnectivity() throws PerfSONARException;
     
-    
-    public int getControlParameterCount(long timeBefore) throws 
NumberFormatException, PerfSONARException ;
-    
 } //LookupServiceDAO

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
  2009-10-22 09:51:49 UTC (rev 5320)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
  2009-10-22 10:03:14 UTC (rev 5321)
@@ -243,11 +243,4 @@
                
        }
 
-
-       @Override
-       public int getControlParameterCount(long timeBefore) {
-               throw new RuntimeException("Not implemented");
-       }
-
-    
 } //MultipleFilesExistDAOImpl

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryExistDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryExistDAOImpl.java
 2009-10-22 09:51:49 UTC (rev 5320)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryExistDAOImpl.java
 2009-10-22 10:03:14 UTC (rev 5321)
@@ -29,10 +29,11 @@
 
        protected static final String UPDATE_LSSTORE = " 
/nmwg:store[@type='"
                        + LS_STORE_COLLECTION_TYPE + "'] ";
-       
-//     protected static final String UPDATE_LSSTORE_SUMMARY = 
"/nmwg:store[@type='"
-//             + LS_STORE_SUMMARY_COLLECTION_TYPE + "']";
 
+       // protected static final String UPDATE_LSSTORE_SUMMARY =
+       // 
"/nmwg:store[@type='"
+       // + LS_STORE_SUMMARY_COLLECTION_TYPE + "']";
+
        // ------------------------------------------------------instance 
variables
 
        public XQueryExistDAOImpl() {
@@ -73,7 +74,7 @@
                xmls.append(XQUERY_DECLARE_NAMESPACES);
                xmls.append(UPDATE_INSERT);
                xmls.append(" (\n"); // IMPORTANT - begin Xquery collection 
(m, d, d,
-                                                               // ...)
+               // ...)
 
                try {
 
@@ -83,7 +84,7 @@
                        // convert data to Strings
                        for (int i = 0; i < d.length; i++) {
                                xmls.append(", \n"); // IMPORTANT - separator 
for next element
-                                                                             
  // of Xquery collection (m, d, d, ...)
+                               // of Xquery collection (m, d, d, ...)
                                ser.write(os, d[i]);
 
                        }
@@ -94,7 +95,7 @@
                }
                // send XQuery
                xmls.append(" )\n"); // IMPORTANT - end of Xquery collection 
(m, d, d,
-                                                               // ...)
+               // ...)
                xmls.append(UPDATE_INTO);
                xmls.append(UPDATE_LSSTORE);
 
@@ -267,26 +268,4 @@
                                
"/nmwg:store[@type='"
 + LS_STORE_COLLECTION_TYPE
                                + 
"']/nmwg:data[@metadataIdRef='"
 + metadataId + "']" + ")";
        }
-
-       @Override
-       public int getControlParameterCount(long timeBefore) throws 
NumberFormatException, PerfSONARException {
-               StringBuffer sb=new StringBuffer();
-               
-               sb.append(DECLARE_NMWG_NAMESPACE);
-               sb.append(" count (");
-               sb.append("         for $i in 
/nmwg:store[@type='LSStore-control']/nmwg:metadata/nmwg:parameters/nmwg:parameter[@name='timestamp']");
-               sb.append("           let $timestamp:=data($i/@value) cast as 
xs:integer");
-               sb.append("           where ($timestamp > ");
-               sb.append(timeBefore);
-               sb.append(" )return 1");
-               sb.append("        )");
-               String [] 
results=getDataStorage().performXQuery(sb.toString(), 
getDataCollection(),getDataCredential()).getTextResults();
-               if(results.length==1){
-                       return Integer.parseInt(results[0]);
-               }else{
-                       return 0;
-               }
-               
-       }
-
 }